@subwallet/extension-base 1.1.67-1 → 1.1.68-1

package/cjs/constants/storage.js

@@ -3,11 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LANGUAGE = exports.CURRENCY = void 0;
+exports.REMIND_EXPORT_ACCOUNT = exports.LATEST_SESSION = exports.LANGUAGE = exports.CURRENCY = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const LANGUAGE = 'current-language';
 exports.LANGUAGE = LANGUAGE;
 const CURRENCY = 'current-currency';
-exports.CURRENCY = CURRENCY;
+exports.CURRENCY = CURRENCY;
+const REMIND_EXPORT_ACCOUNT = 'remind_export_account';
+exports.REMIND_EXPORT_ACCOUNT = REMIND_EXPORT_ACCOUNT;
+const LATEST_SESSION = 'general.latest-session';
+exports.LATEST_SESSION = LATEST_SESSION;

package/cjs/koni/background/handlers/Extension.js

@@ -35,6 +35,7 @@ var _constants3 = require("@subwallet/extension-base/services/request-service/co
 var _constants4 = require("@subwallet/extension-base/services/setting-service/constants");
 var _constants5 = require("@subwallet/extension-base/services/wallet-connect-service/constants");
 var _helpers2 = require("@subwallet/extension-base/services/wallet-connect-service/helpers");
+var _storage = require("@subwallet/extension-base/storage");
 var _stores = require("@subwallet/extension-base/stores");
 var _types3 = require("@subwallet/extension-base/types");
 var _utils4 = require("@subwallet/extension-base/utils");
@@ -94,11 +95,13 @@ 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());
           }
         }
       }
@@ -106,6 +109,12 @@ class KoniExtension {
         this.#firstTime = false;
       }
     };
+    const updateLatestSession = time => {
+      _storage.SWStorage.instance.setItem(_constants.LATEST_SESSION, JSON.stringify({
+        remind: true,
+        timeCalculate: time
+      }));
+    };
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
       next: updateTimeAutoLock

package/cjs/koni/background/handlers/State.js

@@ -28,6 +28,7 @@ var _mintCampaignService = _interopRequireDefault(require("@subwallet/extension-
 var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _priceService = require("@subwallet/extension-base/services/price-service");
 var _requestService = _interopRequireDefault(require("@subwallet/extension-base/services/request-service"));
+var _PopupHandler = require("@subwallet/extension-base/services/request-service/handler/PopupHandler");
 var _SettingService = _interopRequireDefault(require("@subwallet/extension-base/services/setting-service/SettingService"));
 var _DatabaseService = _interopRequireDefault(require("@subwallet/extension-base/services/storage-service/DatabaseService"));
 var _subscanService = require("@subwallet/extension-base/services/subscan-service");
@@ -35,6 +36,7 @@ var _subscanChainMap = require("@subwallet/extension-base/services/subscan-servi
 var _swapService = require("@subwallet/extension-base/services/swap-service");
 var _transactionService = _interopRequireDefault(require("@subwallet/extension-base/services/transaction-service"));
 var _walletConnectService = _interopRequireDefault(require("@subwallet/extension-base/services/wallet-connect-service"));
+var _storage = require("@subwallet/extension-base/storage");
 var _AccountRef = _interopRequireDefault(require("@subwallet/extension-base/stores/AccountRef"));
 var _utils3 = require("@subwallet/extension-base/utils");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
@@ -1364,6 +1366,27 @@ class KoniState {
   async completeConfirmation(request) {
     return await this.requestService.completeConfirmation(request);
   }
+  onHandleRemindExportAccount() {
+    const remindStatus = _storage.SWStorage.instance.getItem(_constants.REMIND_EXPORT_ACCOUNT);
+    if (!remindStatus || !remindStatus.includes('done')) {
+      const handleRemind = account => {
+        if (account.address !== '') {
+          // Open remind tab
+          const url = `${chrome.runtime.getURL('index.html')}#/remind-export-account`;
+          (0, _PopupHandler.openPopup)(url);
+          subscription.unsubscribe();
+        } else {
+          setTimeout(() => {
+            subscription.unsubscribe();
+          }, 3000);
+        }
+      };
+      const subscription = this.keyringService.currentAccountSubject.subscribe(handleRemind);
+    }
+  }
+  onCheckToRemindUser() {
+    this.onHandleRemindExportAccount();
+  }
   onInstall() {
     // const singleModes = Object.values(_PREDEFINED_SINGLE_MODES);
 

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.67-1'
+  version: '1.1.68-1'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/index.js

@@ -546,10 +546,7 @@ class ChainService {
       if (latestAssetInfo) {
         const latestAssetPatch = JSON.stringify(latestAssetInfo);
         if (this.assetMapPatch !== latestAssetPatch) {
-          const assetRegistry = filterAssetInfoMap(this.getChainInfoMap(), {
-            ..._chainList.ChainAssetMap,
-            ...latestAssetInfo
-          });
+          const assetRegistry = filterAssetInfoMap(this.getChainInfoMap(), Object.assign({}, this.dataMap.assetRegistry, latestAssetInfo));
           this.assetMapPatch = latestAssetPatch;
           this.dataMap.assetRegistry = assetRegistry;
           this.assetRegistrySubject.next(assetRegistry);

package/cjs/services/request-service/handler/PopupHandler.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+exports.openPopup = openPopup;
 var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
 var _constants = require("@subwallet/extension-base/services/setting-service/constants");
 var _utils = require("@subwallet/extension-base/utils");
@@ -25,6 +26,19 @@ const NORMAL_WINDOW_OPTS = {
   type: 'normal',
   url: NOTIFICATION_URL
 };
+function openPopup(url) {
+  chrome.windows.getCurrent(win => {
+    const popupOptions = {
+      ...POPUP_WINDOW_OPTS,
+      url
+    };
+    if (win) {
+      popupOptions.left = (win.left || 0) + (win.width || 0) - (popupOptions.width || 0) - 20;
+      popupOptions.top = (win.top || 0) + 110;
+    }
+    chrome.windows.create(popupOptions).catch(console.error);
+  });
+}
 class PopupHandler {
   #requestService;
   #notification = _constants.DEFAULT_NOTIFICATION_TYPE;

package/constants/storage.d.ts

@@ -1,2 +1,4 @@
 export declare const LANGUAGE = "current-language";
 export declare const CURRENCY = "current-currency";
+export declare const REMIND_EXPORT_ACCOUNT = "remind_export_account";
+export declare const LATEST_SESSION = "general.latest-session";

package/constants/storage.js

@@ -2,4 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export const LANGUAGE = 'current-language';
-export const CURRENCY = 'current-currency';
+export const CURRENCY = 'current-currency';
+export const REMIND_EXPORT_ACCOUNT = 'remind_export_account';
+export const LATEST_SESSION = 'general.latest-session';

package/koni/background/handlers/Extension.js

@@ -10,7 +10,7 @@ import { withErrorLog } from '@subwallet/extension-base/background/handlers/help
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { AccountExternalErrorCode, BasicTxErrorType, BasicTxWarningCode, CampaignDataType, ChainType, ExternalRequestPromiseStatus, ExtrinsicType, MantaPayEnableMessage, StakingTxErrorType, StakingType, TransferTxErrorType } from '@subwallet/extension-base/background/KoniTypes';
 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';
@@ -31,6 +31,7 @@ import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/reques
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 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 { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { YieldPoolType } from '@subwallet/extension-base/types';
 import { BN_ZERO, convertSubjectInfoToAddresses, createTransactionFromRLP, isSameAddress, reformatAddress, signatureToHex, uniqueStringArray } from '@subwallet/extension-base/utils';
@@ -84,11 +85,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());
           }
         }
       }
@@ -96,6 +99,12 @@ export default class KoniExtension {
         this.#firstTime = false;
       }
     };
+    const updateLatestSession = time => {
+      SWStorage.instance.setItem(LATEST_SESSION, JSON.stringify({
+        remind: true,
+        timeCalculate: time
+      }));
+    };
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
       next: updateTimeAutoLock

package/koni/background/handlers/State.d.ts

@@ -220,6 +220,8 @@ export default class KoniState {
     evmSendTransaction(id: string, url: string, networkKey: string, allowedAccounts: string[], transactionParams: EvmSendTransactionParams): Promise<string | undefined>;
     getConfirmationsQueueSubject(): BehaviorSubject<ConfirmationsQueue>;
     completeConfirmation(request: RequestConfirmationComplete): Promise<boolean>;
+    private onHandleRemindExportAccount;
+    onCheckToRemindUser(): void;
     onInstall(): void;
     get activeNetworks(): Record<string, _ChainInfo>;
     get activeChainSlugs(): string[];

package/koni/background/handlers/State.js

@@ -5,7 +5,7 @@ import { EvmProviderError } from '@subwallet/extension-base/background/errors/Ev
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
 import { APIItemState, BasicTxErrorType, ChainType, EvmProviderErrorType, ExternalRequestPromiseStatus, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL, REMIND_EXPORT_ACCOUNT } from '@subwallet/extension-base/constants';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
 import BuyService from '@subwallet/extension-base/services/buy-service';
@@ -24,6 +24,7 @@ import MintCampaignService from '@subwallet/extension-base/services/mint-campaig
 import NotificationService from '@subwallet/extension-base/services/notification-service/NotificationService';
 import { PriceService } from '@subwallet/extension-base/services/price-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
+import { openPopup } from '@subwallet/extension-base/services/request-service/handler/PopupHandler';
 import SettingService from '@subwallet/extension-base/services/setting-service/SettingService';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { SubscanService } from '@subwallet/extension-base/services/subscan-service';
@@ -31,6 +32,7 @@ import { SUBSCAN_API_CHAIN_MAP } from '@subwallet/extension-base/services/subsca
 import { SwapService } from '@subwallet/extension-base/services/swap-service';
 import TransactionService from '@subwallet/extension-base/services/transaction-service';
 import WalletConnectService from '@subwallet/extension-base/services/wallet-connect-service';
+import { SWStorage } from '@subwallet/extension-base/storage';
 import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
 import { isAccountAll, stripUrl, TARGET_ENV, wait } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
@@ -1341,6 +1343,27 @@ export default class KoniState {
   async completeConfirmation(request) {
     return await this.requestService.completeConfirmation(request);
   }
+  onHandleRemindExportAccount() {
+    const remindStatus = SWStorage.instance.getItem(REMIND_EXPORT_ACCOUNT);
+    if (!remindStatus || !remindStatus.includes('done')) {
+      const handleRemind = account => {
+        if (account.address !== '') {
+          // Open remind tab
+          const url = `${chrome.runtime.getURL('index.html')}#/remind-export-account`;
+          openPopup(url);
+          subscription.unsubscribe();
+        } else {
+          setTimeout(() => {
+            subscription.unsubscribe();
+          }, 3000);
+        }
+      };
+      const subscription = this.keyringService.currentAccountSubject.subscribe(handleRemind);
+    }
+  }
+  onCheckToRemindUser() {
+    this.onHandleRemindExportAccount();
+  }
   onInstall() {
     // const singleModes = Object.values(_PREDEFINED_SINGLE_MODES);
 

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.67-1",
+  "version": "1.1.68-1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1885,11 +1885,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.63",
-    "@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/chain-list": "0.2.64",
+    "@subwallet/extension-base": "^1.1.68-1",
+    "@subwallet/extension-chains": "^1.1.68-1",
+    "@subwallet/extension-dapp": "^1.1.68-1",
+    "@subwallet/extension-inject": "^1.1.68-1",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.67-1'
+  version: '1.1.68-1'
 };

package/services/chain-service/index.js

@@ -522,10 +522,7 @@ export class ChainService {
       if (latestAssetInfo) {
         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;
           this.assetRegistrySubject.next(assetRegistry);

package/services/request-service/handler/PopupHandler.d.ts

@@ -1,4 +1,5 @@
 import RequestService from '@subwallet/extension-base/services/request-service';
+export declare function openPopup(url: string): void;
 export default class PopupHandler {
     #private;
     constructor(requestService: RequestService);

package/services/request-service/handler/PopupHandler.js

@@ -19,6 +19,19 @@ const NORMAL_WINDOW_OPTS = {
   type: 'normal',
   url: NOTIFICATION_URL
 };
+export function openPopup(url) {
+  chrome.windows.getCurrent(win => {
+    const popupOptions = {
+      ...POPUP_WINDOW_OPTS,
+      url
+    };
+    if (win) {
+      popupOptions.left = (win.left || 0) + (win.width || 0) - (popupOptions.width || 0) - 20;
+      popupOptions.top = (win.top || 0) + 110;
+    }
+    chrome.windows.create(popupOptions).catch(console.error);
+  });
+}
 export default class PopupHandler {
   #requestService;
   #notification = DEFAULT_NOTIFICATION_TYPE;