From eebe6d74322a15bf16506dd98170766920fb6f32 Mon Sep 17 00:00:00 2001 From: 0xDaedalus <0xDaedalus@users.noreply.github.com> Date: Thu, 3 Mar 2022 13:44:48 -0700 Subject: [PATCH 1/9] Rename "NewSeed" accounts to "Internal" --- background/redux-slices/accounts.ts | 2 +- background/redux-slices/keyrings.ts | 4 ++-- background/redux-slices/selectors/accountsSelectors.ts | 4 ++-- background/redux-slices/selectors/keyringsSelectors.ts | 2 +- background/services/keyring/index.ts | 4 ++-- .../AccountsNotificationPanelAccounts.tsx | 6 +++--- ui/pages/Onboarding/OnboardingVerifySeed.tsx | 5 ++++- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/background/redux-slices/accounts.ts b/background/redux-slices/accounts.ts index 21ae6552cb..4b70aef961 100644 --- a/background/redux-slices/accounts.ts +++ b/background/redux-slices/accounts.ts @@ -17,7 +17,7 @@ export const enum AccountType { ReadOnly = "read-only", Imported = "imported", Ledger = "ledger", - NewSeed = "newSeed", + Internal = "internal", } const availableDefaultNames = [ diff --git a/background/redux-slices/keyrings.ts b/background/redux-slices/keyrings.ts index 65c5ae40a6..7e2195a0f4 100644 --- a/background/redux-slices/keyrings.ts +++ b/background/redux-slices/keyrings.ts @@ -7,7 +7,7 @@ import { Keyring, KeyringMetadata } from "../services/keyring/index" type KeyringsState = { keyrings: Keyring[] - keyringMetadata: { [keyringId: string]: { source: "import" | "newSeed" } } + keyringMetadata: { [keyringId: string]: { source: "import" | "internal" } } importing: false | "pending" | "done" status: "locked" | "unlocked" | "uninitialized" keyringToVerify: { @@ -36,7 +36,7 @@ export const emitter = new Emittery() interface ImportKeyring { mnemonic: string - source: "newSeed" | "import" + source: "internal" | "import" path?: string } diff --git a/background/redux-slices/selectors/accountsSelectors.ts b/background/redux-slices/selectors/accountsSelectors.ts index 2a6f86893a..639803fdca 100644 --- a/background/redux-slices/selectors/accountsSelectors.ts +++ b/background/redux-slices/selectors/accountsSelectors.ts @@ -196,7 +196,7 @@ const getAccountType = ( address: string, signingMethod: SigningMethod, addressSources: { - [address: string]: "import" | "newSeed" + [address: string]: "import" | "internal" } ): AccountType => { if (signingMethod == null) { @@ -208,7 +208,7 @@ const getAccountType = ( if (addressSources[address] === "import") { return AccountType.Imported } - return AccountType.NewSeed + return AccountType.Internal } export const selectAccountTotalsByCategory = createSelector( diff --git a/background/redux-slices/selectors/keyringsSelectors.ts b/background/redux-slices/selectors/keyringsSelectors.ts index fb7f218c40..20112e07f5 100644 --- a/background/redux-slices/selectors/keyringsSelectors.ts +++ b/background/redux-slices/selectors/keyringsSelectors.ts @@ -33,7 +33,7 @@ export const selectSourcesByAddress = createSelector( keyrings, keyringMetadata ): { - [keyringId: string]: "import" | "newSeed" + [keyringId: string]: "import" | "internal" } => Object.fromEntries( keyrings diff --git a/background/services/keyring/index.ts b/background/services/keyring/index.ts index 6414d08861..1f54aa2c89 100644 --- a/background/services/keyring/index.ts +++ b/background/services/keyring/index.ts @@ -35,7 +35,7 @@ export type Keyring = { } export interface KeyringMetadata { - source: "import" | "newSeed" + source: "import" | "internal" } interface SerializedKeyringData { @@ -311,7 +311,7 @@ export default class KeyringService extends BaseService { */ async importKeyring( mnemonic: string, - source: "import" | "newSeed", + source: "import" | "internal", path?: string ): Promise { this.requireUnlocked() diff --git a/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx b/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx index 7a7111ab9a..5cd6e95634 100644 --- a/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx +++ b/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx @@ -32,7 +32,7 @@ const walletTypeDetails: { [key in AccountType]: WalletTypeInfo } = { title: "Import", icon: "./images/imported@2x.png", }, - [AccountType.NewSeed]: { + [AccountType.Internal]: { title: "Tally", icon: "./images/tally_reward@2x.png", // FIXME: Icon is cut off - we should get a better one }, @@ -171,7 +171,7 @@ export default function AccountsNotificationPanelAccounts({ }, [onCurrentAddressChange, pendingSelectedAddress, selectedAccountAddress]) const accountTypes = [ - AccountType.NewSeed, + AccountType.Internal, AccountType.Imported, AccountType.ReadOnly, ] @@ -211,7 +211,7 @@ export default function AccountsNotificationPanelAccounts({ accountType={accountType} walletNumber={idx + 1} onClickAddAddress={ - accountType === "imported" || accountType === "newSeed" + accountType === "imported" || accountType === "internal" ? () => { if (accountTotalsByKeyringId[0].keyringId) { dispatch( diff --git a/ui/pages/Onboarding/OnboardingVerifySeed.tsx b/ui/pages/Onboarding/OnboardingVerifySeed.tsx index c2b4caeaba..a1ae80834a 100644 --- a/ui/pages/Onboarding/OnboardingVerifySeed.tsx +++ b/ui/pages/Onboarding/OnboardingVerifySeed.tsx @@ -20,7 +20,10 @@ function SuccessMessage({ mnemonic }: { mnemonic: string[] }) { type="primary" onClick={async () => { await dispatch( - importKeyring({ mnemonic: mnemonic.join(" "), source: "newSeed" }) + importKeyring({ + mnemonic: mnemonic.join(" "), + source: "internal", + }) ) history.push("/") }} From 2030c29aec4f9340bf84c2fb7b388efacbf36e72 Mon Sep 17 00:00:00 2001 From: Massimo Cairo Date: Fri, 4 Mar 2022 16:23:32 +0200 Subject: [PATCH 2/9] Fix flash of unsized popup Flash was caused by dynamic loading of CSS. This commit restores the popup sizing as part the static, global CSS, but uses a popup-specific class applied to , to avoid poisoning the style of full-page UIs. --- ui/pages/Popup.tsx | 6 ------ ui/public/index.css | 7 ++++++- ui/public/popup.html | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ui/pages/Popup.tsx b/ui/pages/Popup.tsx index 5d5b61e79e..79f49fd398 100644 --- a/ui/pages/Popup.tsx +++ b/ui/pages/Popup.tsx @@ -187,12 +187,6 @@ export function Main(): ReactElement { <> From 9a584ba790a31059b77111495b8a467595a91400 Mon Sep 17 00:00:00 2001 From: jagodarybacka Date: Mon, 7 Mar 2022 14:26:28 +0100 Subject: [PATCH 4/9] Remove bottom margin of swap assets searchbox Remove divider's bottom margin as this whitespace was not needed. --- ui/components/Shared/SharedAssetInput.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/components/Shared/SharedAssetInput.tsx b/ui/components/Shared/SharedAssetInput.tsx index c092db6805..1b3acaceed 100644 --- a/ui/components/Shared/SharedAssetInput.tsx +++ b/ui/components/Shared/SharedAssetInput.tsx @@ -180,12 +180,11 @@ function SelectAssetMenuContent( width: 384px; border-bottom: 1px solid var(--hunter-green); margin-top: 15px; - margin-bottom: 8.5px; } .assets_list { display: block; overflow: scroll; - height: calc(100% - 106px); + height: calc(100% - 98px); width: 100%; } `} From a7260277e37f1020efd72d08a5af0c5b82ba1a19 Mon Sep 17 00:00:00 2001 From: Balint Ferencz Date: Mon, 7 Mar 2022 19:08:25 +0100 Subject: [PATCH 5/9] Make non-end incremented Ledger derivation path imports possible Other wallets may increment different parts of the original path. I chose character 'x' to signal the _only_ place where the root path should be incremented. If 'x' is not present, we do the original stuff - add another incrementing part at the end. --- .../Onboarding/OnboardingDerivationPathSelect.tsx | 9 ++++++++- ui/pages/Ledger/LedgerImportAccounts.tsx | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx b/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx index 28eb0d6bbf..aa3f7ceb50 100644 --- a/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx +++ b/ui/components/Onboarding/OnboardingDerivationPathSelect.tsx @@ -11,7 +11,14 @@ import SharedModal from "../Shared/SharedModal" import SharedSelect from "../Shared/SharedSelect" // TODO make this network specific -const initialDerivationPaths: { value: string; label: string }[] = [ +const initialDerivationPaths: { + value: string + label: string +}[] = [ + { + value: "m/44'/60'/x'/0/0", + label: "Ledger Live", + }, { value: "m/44'/60'/0'/0", label: "Ethereum", diff --git a/ui/pages/Ledger/LedgerImportAccounts.tsx b/ui/pages/Ledger/LedgerImportAccounts.tsx index efcb31f6e4..e74c54d1d8 100644 --- a/ui/pages/Ledger/LedgerImportAccounts.tsx +++ b/ui/pages/Ledger/LedgerImportAccounts.tsx @@ -35,7 +35,12 @@ function usePageData({ const firstIndex = pageIndex * addressesPerPage const lastIndex = (pageIndex + 1) * addressesPerPage - 1 for (let i = firstIndex; i <= lastIndex; i += 1) { - paths.push(`${parentPath}/${i}`) + if (parentPath.includes("x")) { + const formattedString = parentPath.slice().replace("x", `${i}`) + paths.push(formattedString) + } else { + paths.push(`${parentPath}/${i}`) + } } const items = paths.map((path) => { From 50d585fca8c4145e9038e34b13b25539f336a586 Mon Sep 17 00:00:00 2001 From: 0xDaedalus <0xDaedalus@users.noreply.github.com> Date: Mon, 7 Mar 2022 12:35:51 -0700 Subject: [PATCH 6/9] Allow '_' as a variable name --- .eslintrc.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.eslintrc.js b/.eslintrc.js index c3cee906f1..bc6d919a60 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,6 +28,25 @@ module.exports = { // The rule is also mostly irrelevant to this codebase due to TypeScript // usage (where .tsx is required). "react/jsx-filename-extension": [0], + "@typescript-eslint/naming-convention": [ + "error", + // Allow camelCase variables (23.2), PascalCase variables (23.8), and UPPER_CASE variables (23.10) + { + selector: "variable", + leadingUnderscore: "allow", + format: ["camelCase", "PascalCase", "UPPER_CASE"], + }, + // Allow camelCase functions (23.2), and PascalCase functions (23.8) + { + selector: "function", + format: ["camelCase", "PascalCase"], + }, + // Airbnb recommends PascalCase for classes (23.3), and although Airbnb does not make TypeScript recommendations, we are assuming this rule would similarly apply to anything "type like", including interfaces, type aliases, and enums + { + selector: "typeLike", + format: ["PascalCase"], + }, + ], // TypeScript allows us to declare props that are non-optional internally // but are interpreted as optional externally if they have defaultProps // defined; the following two adjustments disable eslint-plugin-react From b6377d67451de5e85620a39164b752056f9660ce Mon Sep 17 00:00:00 2001 From: 0xDaedalus <0xDaedalus@users.noreply.github.com> Date: Mon, 7 Mar 2022 14:30:05 -0700 Subject: [PATCH 7/9] Disallow leading underscores vars while allowing single underscores --- .eslintrc.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index bc6d919a60..1283a5d955 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,12 @@ // This is a non-ESM JS file, so this rule can't be followed. /* eslint-disable @typescript-eslint/no-var-requires */ +const { + rules: { + "@typescript-eslint/naming-convention": + airbnbTypeScriptNamingConventionRules, + }, +} = require("eslint-config-airbnb-typescript/lib/shared") + const { rules: { "no-param-reassign": airbnbNoParamReassignRules }, } = require("eslint-config-airbnb-base/rules/best-practices") @@ -29,22 +36,15 @@ module.exports = { // usage (where .tsx is required). "react/jsx-filename-extension": [0], "@typescript-eslint/naming-convention": [ - "error", - // Allow camelCase variables (23.2), PascalCase variables (23.8), and UPPER_CASE variables (23.10) + ...airbnbTypeScriptNamingConventionRules, + // Allow underscore-only identifiers to indicate ignored positional variables. { selector: "variable", - leadingUnderscore: "allow", - format: ["camelCase", "PascalCase", "UPPER_CASE"], - }, - // Allow camelCase functions (23.2), and PascalCase functions (23.8) - { - selector: "function", - format: ["camelCase", "PascalCase"], - }, - // Airbnb recommends PascalCase for classes (23.3), and although Airbnb does not make TypeScript recommendations, we are assuming this rule would similarly apply to anything "type like", including interfaces, type aliases, and enums - { - selector: "typeLike", - format: ["PascalCase"], + format: null, + custom: { + regex: "^_+$", + match: true, + }, }, ], // TypeScript allows us to declare props that are non-optional internally From aeb7edfeabfb89a4b3578285a53a792eed6c342c Mon Sep 17 00:00:00 2001 From: 0xDaedalus <0xDaedalus@users.noreply.github.com> Date: Mon, 7 Mar 2022 15:18:31 -0700 Subject: [PATCH 8/9] Add `filter` property to naming-convention rule. --- .eslintrc.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.eslintrc.js b/.eslintrc.js index 1283a5d955..e2ffc7f445 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -41,6 +41,10 @@ module.exports = { { selector: "variable", format: null, + filter: { + regex: "^_+$", + match: true, + }, custom: { regex: "^_+$", match: true, From 092dc700bc5bb533057d8a67b4d9bbe539d92643 Mon Sep 17 00:00:00 2001 From: Henry Boldizsar Date: Mon, 7 Mar 2022 22:32:40 -0600 Subject: [PATCH 9/9] Standardize route links to kebab-case --- provider-bridge-shared/runtime-typechecks.ts | 8 +++---- .../AccountsNotificationPanelAccounts.tsx | 2 +- .../HiddenDevPanel/HiddenDevPanel.tsx | 2 +- ui/components/Swap/SwapQuote.tsx | 2 +- ui/pages/EarnDeposit.tsx | 2 +- ui/pages/Onboarding/OnboardingAddWallet.tsx | 6 ++--- ui/pages/Onboarding/OnboardingInfoIntro.tsx | 2 +- .../OnboardingInterstitialCreatePhrase.tsx | 2 +- ui/pages/Onboarding/OnboardingSaveSeed.tsx | 2 +- ui/pages/Popup.tsx | 2 +- ui/pages/Send.tsx | 2 +- ui/pages/Swap.tsx | 2 +- ui/pages/Wallet.tsx | 2 +- ui/routes/routes.tsx | 22 +++++++++---------- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/provider-bridge-shared/runtime-typechecks.ts b/provider-bridge-shared/runtime-typechecks.ts index 1d5237041c..38bbc16de3 100644 --- a/provider-bridge-shared/runtime-typechecks.ts +++ b/provider-bridge-shared/runtime-typechecks.ts @@ -62,10 +62,10 @@ export function isPortResponseEvent(arg: unknown): arg is PortResponseEvent { } export const AllowedQueryParamPage = { - signTransaction: "/signTransaction", - dappPermission: "/dappPermission", - signData: "/signData", - personalSignData: "/personalSign", + signTransaction: "/sign-transaction", + dappPermission: "/dapp-permission", + signData: "/sign-data", + personalSignData: "/personal-sign", } as const export type AllowedQueryParamPageType = diff --git a/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx b/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx index 5cd6e95634..78dbe88fc1 100644 --- a/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx +++ b/ui/components/AccountsNotificationPanel/AccountsNotificationPanelAccounts.tsx @@ -261,7 +261,7 @@ export default function AccountsNotificationPanelAccounts({ icon="plus" iconSize="medium" iconPosition="left" - linkTo="/onboarding/addWallet" + linkTo="/onboarding/add-wallet" > Add Wallet diff --git a/ui/components/HiddenDevPanel/HiddenDevPanel.tsx b/ui/components/HiddenDevPanel/HiddenDevPanel.tsx index 3664250eb1..7b8a1afcf4 100644 --- a/ui/components/HiddenDevPanel/HiddenDevPanel.tsx +++ b/ui/components/HiddenDevPanel/HiddenDevPanel.tsx @@ -15,7 +15,7 @@ export default function HiddenDevPanel(): ReactElement { icon="arrow_right" iconSize="large" onClick={() => { - history.push("/onboarding/infoIntro") + history.push("/onboarding/info-intro") }} > Enter Onboarding diff --git a/ui/components/Swap/SwapQuote.tsx b/ui/components/Swap/SwapQuote.tsx index cc25ad39c0..e184c7e828 100644 --- a/ui/components/Swap/SwapQuote.tsx +++ b/ui/components/Swap/SwapQuote.tsx @@ -63,7 +63,7 @@ export default function SwapQuote({ gasPrice, }) ) - history.push("/signTransaction") + history.push("/sign-transaction") }, [ finalQuote, dispatch, diff --git a/ui/pages/EarnDeposit.tsx b/ui/pages/EarnDeposit.tsx index 411cfeb5c1..eeaa6c867a 100644 --- a/ui/pages/EarnDeposit.tsx +++ b/ui/pages/EarnDeposit.tsx @@ -178,7 +178,7 @@ export default function EarnDeposit(): ReactElement { type="primary" size="large" isDisabled={hasError} - linkTo={!isApproved ? "/signTransaction" : "/signData"} + linkTo={!isApproved ? "/sign-transaction" : "/sign-data"} onClick={!isApproved ? approve : enable} > {!isApproved ? "Approve" : "Enable"} diff --git a/ui/pages/Onboarding/OnboardingAddWallet.tsx b/ui/pages/Onboarding/OnboardingAddWallet.tsx index 89943c8074..a281b6a9ed 100644 --- a/ui/pages/Onboarding/OnboardingAddWallet.tsx +++ b/ui/pages/Onboarding/OnboardingAddWallet.tsx @@ -26,7 +26,7 @@ export default function OnboardingStartTheHunt(): ReactElement { Preview an address @@ -39,7 +39,7 @@ export default function OnboardingStartTheHunt(): ReactElement { Import recovery phrase @@ -70,7 +70,7 @@ export default function OnboardingStartTheHunt(): ReactElement { Create new wallet diff --git a/ui/pages/Onboarding/OnboardingInfoIntro.tsx b/ui/pages/Onboarding/OnboardingInfoIntro.tsx index 3ea3e24332..da99ebac9b 100644 --- a/ui/pages/Onboarding/OnboardingInfoIntro.tsx +++ b/ui/pages/Onboarding/OnboardingInfoIntro.tsx @@ -55,7 +55,7 @@ export default function OnboardingInfoIntro(): ReactElement { const [redirectToAddWallet, setRedirectToAddWallet] = useState(false) if (redirectToAddWallet) { - return + return } return ( diff --git a/ui/pages/Onboarding/OnboardingInterstitialCreatePhrase.tsx b/ui/pages/Onboarding/OnboardingInterstitialCreatePhrase.tsx index 1629357227..5f9ad2be58 100644 --- a/ui/pages/Onboarding/OnboardingInterstitialCreatePhrase.tsx +++ b/ui/pages/Onboarding/OnboardingInterstitialCreatePhrase.tsx @@ -13,7 +13,7 @@ export default function OnboardingInterstitialCreatePhrase(): ReactElement { async function generateThenContinue() { if (areKeyringsUnlocked) { await dispatch(generateNewKeyring()) - history.push("/onboarding/saveSeed") + history.push("/onboarding/save-seed") } }, [areKeyringsUnlocked, dispatch, history] diff --git a/ui/pages/Onboarding/OnboardingSaveSeed.tsx b/ui/pages/Onboarding/OnboardingSaveSeed.tsx index df8894ceaf..8d9bc51eb9 100644 --- a/ui/pages/Onboarding/OnboardingSaveSeed.tsx +++ b/ui/pages/Onboarding/OnboardingSaveSeed.tsx @@ -60,7 +60,7 @@ export default function OnboardingSaveSeed(): ReactElement { size="medium" icon="arrow_right" iconSize="large" - linkTo="/onboarding/verifySeed" + linkTo="/onboarding/verify-seed" > I wrote it down diff --git a/ui/pages/Popup.tsx b/ui/pages/Popup.tsx index 79f49fd398..4d1e0c9f02 100644 --- a/ui/pages/Popup.tsx +++ b/ui/pages/Popup.tsx @@ -73,7 +73,7 @@ export function Main(): ReactElement { function saveHistoryEntries(routeHistoryEntities: Location[]) { const isNotOnKeyringRelatedPage = routeHistoryEntities[routeHistoryEntities.length - 1].pathname !== - "/signTransaction" && + "/sign-transaction" && !routeHistoryEntities[routeHistoryEntities.length - 1].pathname.includes( "/keyring/" ) diff --git a/ui/pages/Send.tsx b/ui/pages/Send.tsx index c23f84c776..27255e9211 100644 --- a/ui/pages/Send.tsx +++ b/ui/pages/Send.tsx @@ -174,7 +174,7 @@ export default function Send(): ReactElement { hasError } linkTo={{ - pathname: "/signTransaction", + pathname: "/sign-transaction", state: { redirectTo: { path: "/singleAsset", diff --git a/ui/pages/Swap.tsx b/ui/pages/Swap.tsx index c433e9c5f3..3766f505af 100644 --- a/ui/pages/Swap.tsx +++ b/ui/pages/Swap.tsx @@ -239,7 +239,7 @@ export default function Swap(): ReactElement { }) ) - history.push("/signTransaction") + history.push("/sign-transaction") } const updateSwapData = useCallback( diff --git a/ui/pages/Wallet.tsx b/ui/pages/Wallet.tsx index e7e987cb3e..012985b7c0 100644 --- a/ui/pages/Wallet.tsx +++ b/ui/pages/Wallet.tsx @@ -35,7 +35,7 @@ export default function Wallet(): ReactElement { // If an account doesn't exist, display onboarding if (!hasAccounts) { - return + return } return ( diff --git a/ui/routes/routes.tsx b/ui/routes/routes.tsx index 90553df63a..22f487f0f7 100644 --- a/ui/routes/routes.tsx +++ b/ui/routes/routes.tsx @@ -55,49 +55,49 @@ const pageList: PageList[] = [ persistOnClose: true, }, { - path: "/onboarding/importMetamask", + path: "/onboarding/import-metamask", Component: (): ReactElement => , hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/onboarding/viewOnlyWallet", + path: "/onboarding/view-only-wallet", Component: OnboardingViewOnlyWallet, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/onboarding/infoIntro", + path: "/onboarding/info-intro", Component: OnboardingInfoIntro, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/onboarding/addWallet", + path: "/onboarding/add-wallet", Component: OnboardingAddWallet, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/signTransaction", + path: "/sign-transaction", Component: SignTransaction, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/signData", + path: "/sign-data", Component: SignData, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/personalSign", + path: "/personal-sign", Component: PersonalSign, hasTabBar: false, hasTopBar: false, @@ -146,28 +146,28 @@ const pageList: PageList[] = [ persistOnClose: true, }, { - path: "/dappPermission", + path: "/dapp-permission", Component: DAppPermissionRequest, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/onboarding/saveSeed", + path: "/onboarding/save-seed", Component: OnboardingSaveSeed, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/onboarding/verifySeed", + path: "/onboarding/verify-seed", Component: OnboardingVerifySeed, hasTabBar: false, hasTopBar: false, persistOnClose: false, }, { - path: "/onboarding/onboardingInterstitialCreatePhrase", + path: "/onboarding/onboarding-interstitial-create-phrase", Component: OnboardingInterstitialCreatePhrase, hasTabBar: false, hasTopBar: false,