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 <[email protected]>
make-software · Nov 27, 2023 · e2dde80 · e2dde80
1 parent 95e6899
commit e2dde80
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 15 deletions.
diff --git 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'}
             </Trans>
           </Button>
         </FooterButtonsContainer>

diff --git 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'}
             </Trans>
           </Button>
         </FooterButtonsContainer>

diff --git 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/...-list-with-pending-transactions/use-map-account-deploys-list-with-pending-transactions.ts b/...-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
@@ -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
@@ -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 (
     <StyledFlexRow

diff --git a/src/libs/ui/components/connection-status-badge/connection-status-badge.tsx b/src/libs/ui/components/connection-status-badge/connection-status-badge.tsx
@@ -25,8 +25,8 @@ const ConnectionStatusBadgeContainer = styled(
     displayContext === 'accountList'
       ? null
       : isConnected
-      ? hexToRGBA(theme.color.contentPositive, '.12')
-      : theme.color.backgroundSecondary};
+        ? hexToRGBA(theme.color.contentPositive, '.12')
+        : theme.color.backgroundSecondary};
 `;
 
 export function ConnectionStatusBadge({

diff --git a/src/libs/ui/components/secret-phrase-words-view/word-tag.tsx b/src/libs/ui/components/secret-phrase-words-view/word-tag.tsx
@@ -21,8 +21,8 @@ const WordContainer = styled(FlexRow)<DisabledOrSelected & IsEmptyWord>`
     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
@@ -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) {