Merge branch 'subwallet-dev' into koni/dev/issue-3050

Koniverse · May 24, 2024 · 3d6041b · 3d6041b
2 parents 37e6dc3 + 95cb3c2
commit 3d6041b
Show file tree

Hide file tree

Showing 66 changed files with 616 additions and 177 deletions.
diff --git a/.123trigger b/.123trigger
@@ -133,4 +133,5 @@
 1.1.63
 1.1.64
 1.1.65
-1.1.66
+1.1.66
+1.1.67
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 1.1.67
+Build date: May 22, 2024.
+
+Features & Update:
+- Update chain-list:
+  - Update price-id for DED
+  - Update ED for Vara
+
+Bugs fixed:
+- Fix bug integrating chain online (#3084)
+
 ## 1.1.66
 Build date: May 21, 2024.
 

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -1,14 +1,14 @@
-    2522	AnhMTV                        	Release version 1.1.66
-    2352	Nam Phạm                      	[Issue 2754] fix: fix eslint
-    2036	S2kael                        	[Issue-3055] Update stable version for chain-list
+    2530	AnhMTV                        	Release version 1.1.67
+    2353	Nam Phạm                      	[Issue 3081] fix: change initiation order of chain service
+    2045	S2kael                        	[Issue-3081] Update stable version for chain-list
      815	lw-cdm                        	Fix eslint issues
      465	Jaco                          	0.42.5 (#969)
      416	nguyentiendung                	[Issue-2914] Update yarn.lock
      185	quangdo                       	
      148	bluezdot                      	[Issue-3055] Update chainlist
+     106	Automation Bot                	[CI Skip] Auto increase webapp build number
      106	dominhquang                   	[Issue-2649] Add send crash log feature
      104	khainh                        	predefine metadata for Polkadot & Kusama chains
-     102	Automation Bot                	[CI Skip] Auto increase webapp build number
      101	lw-cdm                        	
       83	Hieu Dao                      	Update README.md
       82	Thibaut Sardan                	Add account filtering feature (#832)

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.1.66",
+  "version": "1.1.67",
   "workspaces": [
     "packages/*"
   ],

diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json
@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.1.66-0",
+  "version": "1.1.67-1",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
@@ -52,10 +52,10 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.63",
-    "@subwallet/extension-base": "^1.1.66-0",
-    "@subwallet/extension-chains": "^1.1.66-0",
-    "@subwallet/extension-dapp": "^1.1.66-0",
-    "@subwallet/extension-inject": "^1.1.66-0",
+    "@subwallet/extension-base": "^1.1.67-1",
+    "@subwallet/extension-chains": "^1.1.67-1",
+    "@subwallet/extension-dapp": "^1.1.67-1",
+    "@subwallet/extension-inject": "^1.1.67-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",
@@ -94,7 +94,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.1.66-0",
+    "@subwallet/extension-mocks": "^1.1.67-1",
     "@types/uuid": "^9.0.1"
   }
 }
diff --git a/packages/extension-base/src/constants/storage.ts b/packages/extension-base/src/constants/storage.ts
@@ -6,3 +6,5 @@ export const LANGUAGE = 'current-language';
 export const CURRENCY = 'current-currency';
 
 export const REMIND_EXPORT_ACCOUNT = 'remind_export_account';
+
+export const LATEST_SESSION = 'general.latest-session';
diff --git a/packages/extension-base/src/koni/background/handlers/Extension.ts b/packages/extension-base/src/koni/background/handlers/Extension.ts
@@ -11,7 +11,7 @@ import { createSubscription } from '@subwallet/extension-base/background/handler
 import { AccountExternalError, AccountExternalErrorCode, AccountsWithCurrentAddress, AddressBookInfo, AmountData, AmountDataWithId, AssetSetting, AssetSettingUpdateReq, BasicTxErrorType, BasicTxWarningCode, BondingOptionParams, BrowserConfirmationType, CampaignBanner, CampaignData, CampaignDataType, ChainType, CreateDeriveAccountInfo, CronReloadRequest, CrowdloanJson, CurrentAccountInfo, DeriveAccountInfo, ExternalRequestPromiseStatus, ExtrinsicType, KeyringState, MantaPayEnableMessage, MantaPayEnableParams, MantaPayEnableResponse, MantaPaySyncState, NftCollection, NftJson, NftTransactionRequest, NftTransactionResponse, OptionInputAddress, PriceJson, RequestAccountBatchExportV2, RequestAccountCreateExternalV2, RequestAccountCreateHardwareMultiple, RequestAccountCreateHardwareV2, RequestAccountCreateSuriV2, RequestAccountCreateWithSecretKey, RequestAccountExportPrivateKey, RequestAccountMeta, RequestAddInjectedAccounts, RequestApproveConnectWalletSession, RequestApproveWalletConnectNotSupport, RequestAuthorization, RequestAuthorizationBlock, RequestAuthorizationPerAccount, RequestAuthorizationPerSite, RequestAuthorizeApproveV2, RequestBatchRestoreV2, RequestBondingSubmit, RequestCameraSettings, RequestCampaignBannerComplete, RequestChangeEnableChainPatrol, RequestChangeLanguage, RequestChangeMasterPassword, RequestChangePriceCurrency, RequestChangeShowBalance, RequestChangeShowZeroBalance, RequestChangeTimeAutoLock, RequestCheckPublicAndSecretKey, RequestConfirmationComplete, RequestConnectWalletConnect, RequestCrossChainTransfer, RequestCrowdloanContributions, RequestDeleteContactAccount, RequestDeriveCreateMultiple, RequestDeriveCreateV2, RequestDeriveCreateV3, RequestDeriveValidateV2, RequestDisconnectWalletConnectSession, RequestEditContactAccount, RequestFindRawMetadata, RequestForgetSite, RequestFreeBalance, RequestGetDeriveAccounts, RequestGetTransaction, RequestJsonRestoreV2, RequestKeyringExportMnemonic, RequestMaxTransferable, RequestMigratePassword, RequestParseEvmContractInput, RequestParseTransactionSubstrate, RequestPassPhishingPage, RequestQrParseRLP, RequestQrSignEvm, RequestQrSignSubstrate, RequestRejectConnectWalletSession, RequestRejectExternalRequest, RequestRejectWalletConnectNotSupport, RequestRemoveInjectedAccounts, RequestResetWallet, RequestResolveExternalRequest, RequestSaveRecentAccount, RequestSeedCreateV2, RequestSeedValidateV2, RequestSettingsType, RequestSigningApprovePasswordV2, RequestStakePoolingBonding, RequestStakePoolingUnbonding, RequestSubscribeHistory, RequestSubstrateNftSubmitTransaction, RequestTransfer, RequestTransferCheckReferenceCount, RequestTransferCheckSupporting, RequestTransferExistentialDeposit, RequestTuringCancelStakeCompound, RequestTuringStakeCompound, RequestUnbondingSubmit, RequestUnlockKeyring, RequestUnlockType, ResolveAddressToDomainRequest, ResolveDomainRequest, ResponseAccountBatchExportV2, ResponseAccountCreateSuriV2, ResponseAccountCreateWithSecretKey, ResponseAccountExportPrivateKey, ResponseAccountMeta, ResponseChangeMasterPassword, ResponseCheckPublicAndSecretKey, ResponseDeriveValidateV2, ResponseFindRawMetadata, ResponseGetDeriveAccounts, ResponseKeyringExportMnemonic, ResponseMigratePassword, ResponseParseEvmContractInput, ResponseParseTransactionSubstrate, ResponsePrivateKeyValidateV2, ResponseQrParseRLP, ResponseQrSignEvm, ResponseQrSignSubstrate, ResponseRejectExternalRequest, ResponseResetWallet, ResponseResolveExternalRequest, ResponseSeedCreateV2, ResponseSeedValidateV2, ResponseSubscribeHistory, ResponseUnlockKeyring, StakingJson, StakingRewardJson, StakingTxErrorType, StakingType, SupportTransferResponse, ThemeNames, TransactionHistoryItem, TransactionResponse, TransferTxErrorType, ValidateNetworkRequest, ValidateNetworkResponse, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountAuthType, AccountJson, AuthorizeRequest, MessageTypes, MetadataRequest, RequestAccountChangePassword, RequestAccountCreateExternal, RequestAccountCreateHardware, RequestAccountCreateSuri, RequestAccountEdit, RequestAccountExport, RequestAccountForget, RequestAccountShow, RequestAccountTie, RequestAccountValidate, RequestAuthorizeCancel, RequestAuthorizeReject, RequestBatchRestore, RequestCurrentAccountAddress, RequestDeriveCreate, RequestDeriveValidate, RequestJsonRestore, RequestMetadataApprove, RequestMetadataReject, RequestSeedCreate, RequestSeedValidate, RequestSigningApproveSignature, RequestSigningCancel, RequestTypes, ResponseAccountExport, ResponseAuthorizeList, ResponseDeriveValidate, ResponseJsonGetAccountInfo, ResponseSeedCreate, ResponseSeedValidate, ResponseType, SigningRequest, WindowOpenParams } from '@subwallet/extension-base/background/types';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, XCM_FEE_RATIO, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, LATEST_SESSION, XCM_FEE_RATIO, XCM_MIN_AMOUNT_RATIO } from '@subwallet/extension-base/constants';
 import { ALLOWED_PATH } from '@subwallet/extension-base/defaults';
 import { resolveAzeroAddressToDomain, resolveAzeroDomainToAddress } from '@subwallet/extension-base/koni/api/dotsama/domain';
 import { parseSubstrateTransaction } from '@subwallet/extension-base/koni/api/dotsama/parseTransaction';
@@ -36,6 +36,7 @@ import { SWTransaction, SWTransactionResponse, SWTransactionResult, TransactionE
 import { WALLET_CONNECT_EIP155_NAMESPACE } from '@subwallet/extension-base/services/wallet-connect-service/constants';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { ResultApproveWalletConnectSession, WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
+import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { BalanceJson, BuyServiceInfo, BuyTokenInfo, EarningRewardJson, NominationPoolInfo, OptimalYieldPathParams, RequestEarlyValidateYield, RequestGetYieldPoolTargets, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseGetYieldPoolTargets, ValidateYieldProcessParams, YieldPoolType } from '@subwallet/extension-base/types';
 import { SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
@@ -104,11 +105,13 @@ export default class KoniExtension {
           this.#lockTimeOut = setTimeout(() => {
             if (!this.#skipAutoLock) {
               this.keyringLock();
+              updateLatestSession(Date.now());
             }
           }, this.#timeAutoLock * 60 * 1000);
         } else if (this.#alwaysLock) {
           if (!this.#firstTime) {
             this.keyringLock();
+            updateLatestSession(Date.now());
           }
         }
       }
@@ -118,6 +121,10 @@ export default class KoniExtension {
       }
     };
 
+    const updateLatestSession = (time: number) => {
+      SWStorage.instance.setItem(LATEST_SESSION, JSON.stringify({ remind: true, timeCalculate: time }));
+    };
+
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
       next: updateTimeAutoLock

diff --git a/packages/extension-base/src/koni/background/handlers/State.ts b/packages/extension-base/src/koni/background/handlers/State.ts
@@ -336,6 +336,8 @@ export default class KoniState {
     await this.dbService.stores.crowdloan.removeEndedCrowdloans();
 
     await this.startSubscription();
+
+    this.chainService.checkLatestData();
   }
 
   public async initMantaPay (password: string) {
@@ -1912,6 +1914,8 @@ export default class KoniState {
 
     await this.chainService.init();
     this.afterChainServiceInit();
+
+    this.chainService.checkLatestData();
   }
 
   public async enableMantaPay (updateStore: boolean, address: string, password: string, seedPhrase?: string) {

diff --git a/packages/extension-base/src/packageInfo.ts b/packages/extension-base/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.1.66-0' };
+export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.1.67-1' };
diff --git a/packages/extension-base/src/services/chain-service/index.ts b/packages/extension-base/src/services/chain-service/index.ts
@@ -604,8 +604,6 @@ export class ChainService {
     await this.initAssetSettings();
     this.initAssetRefMap();
     await this.autoEnableTokens();
-
-    this.checkLatestData();
   }
 
   initAssetRefMap () {
@@ -687,7 +685,7 @@ export class ChainService {
         const latestAssetPatch = JSON.stringify(latestAssetInfo);
 
         if (this.assetMapPatch !== latestAssetPatch) {
-          const assetRegistry = filterAssetInfoMap(this.getChainInfoMap(), { ...ChainAssetMap, ...latestAssetInfo });
+          const assetRegistry = filterAssetInfoMap(this.getChainInfoMap(), Object.assign({}, this.dataMap.assetRegistry, latestAssetInfo));
 
           this.assetMapPatch = latestAssetPatch;
           this.dataMap.assetRegistry = assetRegistry;

diff --git a/packages/extension-chains/package.json b/packages/extension-chains/package.json
@@ -17,14 +17,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.1.66-0",
+  "version": "1.1.67-1",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.6",
     "@polkadot/networks": "^12.6.2",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/extension-inject": "^1.1.66-0"
+    "@subwallet/extension-inject": "^1.1.67-1"
   },
   "peerDependencies": {
     "@polkadot/api": "*",

diff --git a/packages/extension-chains/src/packageInfo.ts b/packages/extension-chains/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-chains', path: 'auto', type: 'auto', version: '1.1.66-0' };
+export const packageInfo = { name: '@subwallet/extension-chains', path: 'auto', type: 'auto', version: '1.1.67-1' };
diff --git a/packages/extension-compat-metamask/package.json b/packages/extension-compat-metamask/package.json
@@ -17,14 +17,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.1.66-0",
+  "version": "1.1.67-1",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.6",
     "@metamask/detect-provider": "^1.2.0",
     "@polkadot/types": "^11.0.3",
     "@polkadot/util": "^12.6.2",
-    "@subwallet/extension-inject": "^1.1.66-0",
+    "@subwallet/extension-inject": "^1.1.67-1",
     "web3": "^1.10.0"
   },
   "peerDependencies": {

diff --git a/packages/extension-compat-metamask/src/packageInfo.ts b/packages/extension-compat-metamask/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-compat-metamask', path: 'auto', type: 'auto', version: '1.1.66-0' };
+export const packageInfo = { name: '@subwallet/extension-compat-metamask', path: 'auto', type: 'auto', version: '1.1.67-1' };
diff --git a/packages/extension-dapp/package.json b/packages/extension-dapp/package.json
@@ -17,13 +17,13 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.1.66-0",
+  "version": "1.1.67-1",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.6",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/extension-inject": "^1.1.66-0"
+    "@subwallet/extension-inject": "^1.1.67-1"
   },
   "peerDependencies": {
     "@polkadot/api": "*",

diff --git a/packages/extension-dapp/src/packageInfo.ts b/packages/extension-dapp/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-dapp', path: 'auto', type: 'auto', version: '1.1.66-0' };
+export const packageInfo = { name: '@subwallet/extension-dapp', path: 'auto', type: 'auto', version: '1.1.67-1' };
diff --git a/packages/extension-inject/package.json b/packages/extension-inject/package.json
@@ -14,7 +14,7 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "1.1.66-0",
+  "version": "1.1.67-1",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.20.6",

diff --git a/packages/extension-inject/src/packageInfo.ts b/packages/extension-inject/src/packageInfo.ts
@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-inject', path: 'auto', type: 'auto', version: '1.1.66-0' };
+export const packageInfo = { name: '@subwallet/extension-inject', path: 'auto', type: 'auto', version: '1.1.67-1' };
diff --git a/packages/extension-koni-ui/package.json b/packages/extension-koni-ui/package.json
@@ -14,7 +14,7 @@
   },
   "sideEffects": true,
   "type": "module",
-  "version": "1.1.66-0",
+  "version": "1.1.67-1",
   "dependencies": {
     "@babel/runtime": "^7.20.6",
     "@coinbase/cbpay-js": "^1.7.0",
@@ -35,10 +35,10 @@
     "@ramonak/react-progress-bar": "^5.0.3",
     "@reduxjs/toolkit": "^1.9.1",
     "@subwallet/chain-list": "0.2.63",
-    "@subwallet/extension-base": "^1.1.66-0",
-    "@subwallet/extension-chains": "^1.1.66-0",
-    "@subwallet/extension-dapp": "^1.1.66-0",
-    "@subwallet/extension-inject": "^1.1.66-0",
+    "@subwallet/extension-base": "^1.1.67-1",
+    "@subwallet/extension-chains": "^1.1.67-1",
+    "@subwallet/extension-dapp": "^1.1.67-1",
+    "@subwallet/extension-inject": "^1.1.67-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/react-ui": "5.1.2-b77",
     "@subwallet/ui-keyring": "^0.1.5",
@@ -83,7 +83,7 @@
     "usehooks-ts": "^2.9.1"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.1.66-0",
+    "@subwallet/extension-mocks": "^1.1.67-1",
     "@types/bn.js": "^5.1.1",
     "@types/enzyme": "^3.10.12",
     "@types/enzyme-adapter-react-16": "^1.0.6",

diff --git a/packages/extension-koni-ui/src/Popup/Account/AccountExport.tsx b/packages/extension-koni-ui/src/Popup/Account/AccountExport.tsx
@@ -5,13 +5,13 @@ import { Layout, PageWrapper } from '@subwallet/extension-koni-ui/components';
 import AlertBox from '@subwallet/extension-koni-ui/components/Alert';
 import CloseIcon from '@subwallet/extension-koni-ui/components/Icon/CloseIcon';
 import WordPhrase from '@subwallet/extension-koni-ui/components/WordPhrase';
-import { DEFAULT_ROUTER_PATH } from '@subwallet/extension-koni-ui/constants/router';
+import { DEFAULT_ROUTER_PATH } from '@subwallet/extension-koni-ui/constants';
 import useGetAccountByAddress from '@subwallet/extension-koni-ui/hooks/account/useGetAccountByAddress';
 import useCopy from '@subwallet/extension-koni-ui/hooks/common/useCopy';
 import useFocusFormItem from '@subwallet/extension-koni-ui/hooks/form/useFocusFormItem';
 import useDefaultNavigate from '@subwallet/extension-koni-ui/hooks/router/useDefaultNavigate';
 import { exportAccount, exportAccountPrivateKey, keyringExportMnemonic } from '@subwallet/extension-koni-ui/messaging';
-import { PhosphorIcon, ThemeProps } from '@subwallet/extension-koni-ui/types';
+import { PhosphorIcon, RemindBackUpSeedPhraseParamState, ThemeProps } from '@subwallet/extension-koni-ui/types';
 import { FormCallbacks, FormFieldData } from '@subwallet/extension-koni-ui/types/form';
 import { KeyringPair$Json } from '@subwallet/keyring/types';
 import { BackgroundIcon, Button, Field, Form, Icon, Input, PageIcon, SettingItem, SwQRCode } from '@subwallet/react-ui';
@@ -20,7 +20,7 @@ import { saveAs } from 'file-saver';
 import { CheckCircle, CopySimple, DownloadSimple, FileJs, Leaf, QrCode, Wallet } from 'phosphor-react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useLocation, useNavigate, useParams } from 'react-router-dom';
 import styled from 'styled-components';
 
 import { isEthereumAddress } from '@polkadot/util-crypto';
@@ -76,8 +76,9 @@ const Component: React.FC<Props> = (props: Props) => {
 
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const { goHome } = useDefaultNavigate();
+  const { goBack } = useDefaultNavigate();
   const { accountAddress } = useParams();
+  const isBackToHome = useLocation().state as RemindBackUpSeedPhraseParamState;
 
   const account = useGetAccountByAddress(accountAddress);
 
@@ -275,18 +276,22 @@ const Component: React.FC<Props> = (props: Props) => {
   }, [account, t]);
 
   const onBack = useCallback(() => {
-    if (accountAddress) {
+    if (accountAddress && !isBackToHome?.from) {
       navigate(`/accounts/detail/${accountAddress}`);
     } else {
-      navigate(DEFAULT_ROUTER_PATH);
+      navigate(isBackToHome.from, { state: { ...isBackToHome, from: 'ignoreBanner' } });
     }
-  }, [accountAddress, navigate]);
+  }, [accountAddress, isBackToHome, navigate]);
+
+  const goHomeWithState = useCallback(() => {
+    goBack(DEFAULT_ROUTER_PATH, { from: 'ignoreBanner' });
+  }, [goBack]);
 
   useEffect(() => {
     if (!account) {
-      goHome();
+      goBack(DEFAULT_ROUTER_PATH, { from: 'ignoreBanner' });
     }
-  }, [account, goHome, navigate]);
+  }, [account, goBack, navigate]);
 
   useEffect(() => {
     if (account?.address) {
@@ -310,12 +315,12 @@ const Component: React.FC<Props> = (props: Props) => {
           icon: firstStep ? undefined : FinishIcon,
           disabled: isDisabled || !exportTypes.length,
           loading: loading,
-          onClick: firstStep ? form.submit : goHome
+          onClick: firstStep ? form.submit : goHomeWithState
         }}
         subHeaderIcons={[
           {
             icon: <CloseIcon />,
-            onClick: goHome,
+            onClick: goHomeWithState,
             disabled: loading
           }
         ]}