From e2dde80af616aa1fe27d7255584467ece3c7d28d Mon Sep 17 00:00:00 2001 From: Ostap Piatkovskyi <44294945+ost-ptk@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:08:39 +0200 Subject: [PATCH] fix: fix wallet setup kick-off automatically in the Reset Wallet flow (#863) * fixed issue with auto launching onboarding after wallet reset * fixed prettier issues --------- Co-authored-by: ost-ptk --- src/apps/popup/pages/stakes/index.tsx | 4 ++-- src/apps/popup/pages/transfer/index.tsx | 4 ++-- src/background/close-window-by-reload-extension.ts | 7 ++++++- ...e-map-account-deploys-list-with-pending-transactions.ts | 4 ++-- src/libs/ui/components/avatar/avatar.tsx | 4 ++-- src/libs/ui/components/checkbox/checkbox.tsx | 4 ++-- .../connection-status-badge/connection-status-badge.tsx | 4 ++-- .../ui/components/secret-phrase-words-view/word-tag.tsx | 4 ++-- src/utils.ts | 1 + 9 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/apps/popup/pages/stakes/index.tsx b/src/apps/popup/pages/stakes/index.tsx index c1be096b7..006fc5e96 100644 --- a/src/apps/popup/pages/stakes/index.tsx +++ b/src/apps/popup/pages/stakes/index.tsx @@ -414,8 +414,8 @@ export const StakesPage = () => { {stakeStep === StakeSteps.Confirm ? getConfirmButtonText() : stakeStep === StakeSteps.Success - ? 'Done' - : 'Next'} + ? 'Done' + : 'Next'} diff --git a/src/apps/popup/pages/transfer/index.tsx b/src/apps/popup/pages/transfer/index.tsx index f29143c0f..82078a32c 100644 --- a/src/apps/popup/pages/transfer/index.tsx +++ b/src/apps/popup/pages/transfer/index.tsx @@ -437,8 +437,8 @@ export const TransferPage = () => { {transferStep === TransactionSteps.Confirm ? 'Send' : transferStep === TransactionSteps.Success - ? 'Done' - : 'Next'} + ? 'Done' + : 'Next'} diff --git a/src/background/close-window-by-reload-extension.ts b/src/background/close-window-by-reload-extension.ts index b6f785b2b..ef692510f 100644 --- a/src/background/close-window-by-reload-extension.ts +++ b/src/background/close-window-by-reload-extension.ts @@ -1,6 +1,6 @@ import browser from 'webextension-polyfill'; -import { isSafariBuild } from '@src/utils'; +import { isFirefoxBuild, isSafariBuild } from '@src/utils'; // It's hacky for Safari browser => browser.runtime.reload(); // window.close() method can only be called on windows that were opened by a script using the Window.open() method. @@ -9,6 +9,11 @@ import { isSafariBuild } from '@src/utils'; // WARNING: IT WILL RELOAD ENTIRE EXTENSION export function closeWindowByReloadExtension() { if (isSafariBuild) { + browser.tabs.create({ url: 'onboarding.html', active: true }); + browser.runtime.reload(); + return; + } + if (isFirefoxBuild) { browser.runtime.reload(); return; } diff --git a/src/hooks/use-map-account-deploys-list-with-pending-transactions/use-map-account-deploys-list-with-pending-transactions.ts b/src/hooks/use-map-account-deploys-list-with-pending-transactions/use-map-account-deploys-list-with-pending-transactions.ts index 4f63250b1..4bb3a02c1 100644 --- a/src/hooks/use-map-account-deploys-list-with-pending-transactions/use-map-account-deploys-list-with-pending-transactions.ts +++ b/src/hooks/use-map-account-deploys-list-with-pending-transactions/use-map-account-deploys-list-with-pending-transactions.ts @@ -44,8 +44,8 @@ export const useMapAccountDeploysListWithPendingTransactions = ( accountDeploys != null ? [...filteredTransactions, ...accountDeploys] : mappedPendingTransactions.length > 0 - ? mappedPendingTransactions - : null; + ? mappedPendingTransactions + : null; return { accountDeploysListWithPendingTransactions diff --git a/src/libs/ui/components/avatar/avatar.tsx b/src/libs/ui/components/avatar/avatar.tsx index 190307b26..0bc01bb72 100644 --- a/src/libs/ui/components/avatar/avatar.tsx +++ b/src/libs/ui/components/avatar/avatar.tsx @@ -72,8 +72,8 @@ export const Avatar = ({ ? 'assets/icons/connected-dark.svg' : 'assets/icons/connected-dark-big.svg' : displayContext === 'header' - ? 'assets/icons/connected-light.svg' - : 'assets/icons/connected-light-big.svg'; + ? 'assets/icons/connected-light.svg' + : 'assets/icons/connected-light-big.svg'; if (withConnectedStatus && isConnected !== undefined) { return ( diff --git a/src/libs/ui/components/checkbox/checkbox.tsx b/src/libs/ui/components/checkbox/checkbox.tsx index e0f27278c..460300ee2 100644 --- a/src/libs/ui/components/checkbox/checkbox.tsx +++ b/src/libs/ui/components/checkbox/checkbox.tsx @@ -55,8 +55,8 @@ export function Checkbox({ ? 'assets/icons/checkbox-square-checked.svg' : 'assets/icons/checkbox-square.svg' : checked - ? 'assets/icons/checkbox-checked.svg' - : 'assets/icons/checkbox.svg'; + ? 'assets/icons/checkbox-checked.svg' + : 'assets/icons/checkbox.svg'; return ( ` disabled ? theme.color.contentSecondary : selected - ? theme.color.contentOnFill - : 'inherit'}; + ? theme.color.contentOnFill + : 'inherit'}; border-radius: 6px; cursor: ${({ onClick, disabled }) => onClick && !disabled ? 'pointer' : 'auto'}; diff --git a/src/utils.ts b/src/utils.ts index e7e2648b1..66ce1b7e7 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -27,6 +27,7 @@ export const getUrlOrigin = (url: string | undefined) => { }; export const isSafariBuild = process.env.BROWSER === Browser.Safari; +export const isFirefoxBuild = process.env.BROWSER === Browser.Firefox; export const isValidU64 = (value?: string): boolean => { if (!value) {