@subwallet/extension-base 1.1.3-0 → 1.1.5-0

package/koni/api/nft/rmrk_nft/index.js

@@ -5,7 +5,7 @@ import { RMRK_VER } from '@subwallet/extension-base/background/KoniTypes';
 import { BaseNftApi } from '@subwallet/extension-base/koni/api/nft/nft';
 import { isUrl, reformatAddress } from '@subwallet/extension-base/utils';
 import fetch from 'cross-fetch';
-import { getRandomIpfsGateway, SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from "../config.js";
+import { SINGULAR_V1_COLLECTION_ENDPOINT, SINGULAR_V2_COLLECTION_ENDPOINT, SINGULAR_V2_ENDPOINT } from "../config.js";
 var RMRK_SOURCE;
 (function (RMRK_SOURCE) {
   RMRK_SOURCE["BIRD_KANARIA"] = "bird_kanaria";
@@ -18,18 +18,23 @@ export class RmrkNftApi extends BaseNftApi {
   constructor(addresses, chain) {
     super(chain, null, addresses);
   }
-  parseUrl(input) {
-    if (!input || input.length === 0) {
-      return undefined;
-    }
-    if (isUrl(input) || input.includes('https://') || input.includes('http')) {
-      return input;
-    }
-    if (!input.includes('ipfs://ipfs/')) {
-      return getRandomIpfsGateway() + input;
-    }
-    return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1];
-  }
+
+  // override parseUrl (input: string): string | undefined {
+  //   if (!input || input.length === 0) {
+  //     return undefined;
+  //   }
+  //
+  //   if (isUrl(input) || input.includes('https://') || input.includes('http')) {
+  //     return input;
+  //   }
+  //
+  //   if (!input.includes('ipfs://ipfs/')) {
+  //     return getRandomIpfsGateway() + input;
+  //   }
+  //
+  //   return getRandomIpfsGateway() + input.split('ipfs://ipfs/')[1];
+  // }
+
   async getMetadata(metadataUrl) {
     let url = metadataUrl;
     if (!isUrl(metadataUrl)) {
@@ -69,53 +74,57 @@ export class RmrkNftApi extends BaseNftApi {
     }));
     const nfts = [];
     await Promise.all(data.map(async item => {
-      const primaryResource = item.primaryResource ? item.primaryResource : null;
-      const metadataUri = primaryResource && primaryResource.metadata ? primaryResource.metadata : item.metadata;
-      const nftMetadata = await this.getMetadata(metadataUri);
-      if (item.source === RMRK_SOURCE.BIRD_KANARIA) {
-        nfts.push({
-          ...item,
-          metadata: nftMetadata,
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.KANARIA) {
-        nfts.push({
-          ...item,
-          metadata: {
-            ...nftMetadata,
-            image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
-          },
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.SINGULAR_V1) {
-        nfts.push({
-          ...item,
-          metadata: {
-            description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
-            name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
-            attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
-            animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
-            image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
-          },
-          owner: account
-        });
-      } else if (item.source === RMRK_SOURCE.SINGULAR_V2) {
-        const id = item.id;
-        if (!id.toLowerCase().includes(KANBIRD_KEYWORD)) {
-          // excludes kanaria bird, already handled above
+      try {
+        const primaryResource = item.primaryResource ? item.primaryResource : null;
+        const metadataUri = primaryResource && primaryResource.metadata ? primaryResource.metadata : item.metadata;
+        const nftMetadata = await this.getMetadata(metadataUri);
+        if (item.source === RMRK_SOURCE.BIRD_KANARIA) {
+          nfts.push({
+            ...item,
+            metadata: nftMetadata,
+            owner: account
+          });
+        } else if (item.source === RMRK_SOURCE.KANARIA) {
+          nfts.push({
+            ...item,
+            metadata: {
+              ...nftMetadata,
+              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
+            },
+            owner: account
+          });
+        } else if (item.source === RMRK_SOURCE.SINGULAR_V1) {
           nfts.push({
             ...item,
             metadata: {
               description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
               name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
               attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
-              properties: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.properties,
               animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
-              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.mediaUri)
+              image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.image)
             },
             owner: account
           });
+        } else if (item.source === RMRK_SOURCE.SINGULAR_V2) {
+          const id = item.id;
+          if (!id.toLowerCase().includes(KANBIRD_KEYWORD)) {
+            // excludes kanaria bird, already handled above
+            nfts.push({
+              ...item,
+              metadata: {
+                description: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.description,
+                name: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.name,
+                attributes: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.attributes,
+                properties: nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.properties,
+                animation_url: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.animation_url),
+                image: this.parseUrl(nftMetadata === null || nftMetadata === void 0 ? void 0 : nftMetadata.mediaUri)
+              },
+              owner: account
+            });
+          }
         }
+      } catch (e) {
+        console.log('error fetching RMRK NFT', e);
       }
     }));
     return nfts;

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

@@ -53,7 +53,7 @@ export default class KoniExtension {
     private forgetSite;
     private _forgetAllSite;
     private forgetAllSite;
-    private getNonReadonlyAccounts;
+    private getAccounts;
     private isAddressValidWithAuthType;
     private filterAccountsByAccountAuthType;
     private _changeAuthorizationAll;
@@ -197,6 +197,9 @@ export default class KoniExtension {
     private rejectWalletConnectSession;
     private subscribeWalletConnectSessions;
     private disconnectWalletConnectSession;
+    private WCNotSupportSubscribe;
+    private approveWalletConnectNotSupport;
+    private rejectWalletConnectNotSupport;
     private enableMantaPay;
     private initSyncMantaPay;
     private disableMantaPay;

package/koni/background/handlers/Extension.js

@@ -660,10 +660,10 @@ export default class KoniExtension {
     });
     return true;
   }
-  getNonReadonlyAccounts() {
+  getAccounts() {
     const storedAccounts = this.#koniState.keyringService.accounts;
     const transformedAccounts = transformAccounts(storedAccounts);
-    return transformedAccounts.filter(a => !a.isReadOnly).map(a => a.address);
+    return transformedAccounts.map(a => a.address);
   }
   isAddressValidWithAuthType(address, accountAuthType) {
     if (accountAuthType === 'substrate') {
@@ -685,12 +685,12 @@ export default class KoniExtension {
   _changeAuthorizationAll(connectValue, callBack) {
     this.#koniState.getAuthorize(value => {
       assert(value, 'The source is not known');
-      const nonReadonlyAccounts = this.getNonReadonlyAccounts();
+      const accounts = this.getAccounts();
       Object.keys(value).forEach(url => {
         if (!value[url].isAllowed) {
           return;
         }
-        const targetAccounts = this.filterAccountsByAccountAuthType(nonReadonlyAccounts, value[url].accountAuthType);
+        const targetAccounts = this.filterAccountsByAccountAuthType(accounts, value[url].accountAuthType);
         targetAccounts.forEach(address => {
           value[url].isAllowedMap[address] = connectValue;
         });
@@ -713,8 +713,8 @@ export default class KoniExtension {
   _changeAuthorization(url, connectValue, callBack) {
     this.#koniState.getAuthorize(value => {
       assert(value[url], 'The source is not known');
-      const nonReadonlyAccounts = this.getNonReadonlyAccounts();
-      const targetAccounts = this.filterAccountsByAccountAuthType(nonReadonlyAccounts, value[url].accountAuthType);
+      const accounts = this.getAccounts();
+      const targetAccounts = this.filterAccountsByAccountAuthType(accounts, value[url].accountAuthType);
       targetAccounts.forEach(address => {
         value[url].isAllowedMap[address] = connectValue;
       });
@@ -3219,6 +3219,32 @@ export default class KoniExtension {
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
+  WCNotSupportSubscribe(id, port) {
+    const cb = createSubscription(id, port);
+    const subscription = this.#koniState.requestService.notSupportWCSubject.subscribe(requests => cb(requests));
+    port.onDisconnect.addListener(() => {
+      this.cancelSubscription(id);
+      subscription.unsubscribe();
+    });
+    return this.#koniState.requestService.allNotSupportWCRequests;
+  }
+  approveWalletConnectNotSupport({
+    id
+  }) {
+    const request = this.#koniState.requestService.getNotSupportWCRequest(id);
+    request.resolve();
+    return true;
+  }
+  rejectWalletConnectNotSupport({
+    id
+  }) {
+    const request = this.#koniState.requestService.getNotSupportWCRequest(id);
+    request.reject(new Error('USER_REJECTED'));
+    return true;
+  }
+
+  /// Manta
+
   async enableMantaPay({
     address,
     password
@@ -3743,7 +3769,7 @@ export default class KoniExtension {
       /// Wallet Connect
       case 'pri(walletConnect.connect)':
         return this.connectWalletConnect(request);
-      case 'pri(walletConnect.requests.subscribe)':
+      case 'pri(walletConnect.requests.connect.subscribe)':
         return this.connectWCSubscribe(id, port);
       case 'pri(walletConnect.session.approve)':
         return this.approveWalletConnectSession(request);
@@ -3753,6 +3779,16 @@ export default class KoniExtension {
         return this.subscribeWalletConnectSessions(id, port);
       case 'pri(walletConnect.session.disconnect)':
         return this.disconnectWalletConnectSession(request);
+
+      // Not support
+      case 'pri(walletConnect.requests.notSupport.subscribe)':
+        return this.WCNotSupportSubscribe(id, port);
+      case 'pri(walletConnect.notSupport.approve)':
+        return this.approveWalletConnectNotSupport(request);
+      case 'pri(walletConnect.notSupport.reject)':
+        return this.rejectWalletConnectNotSupport(request);
+
+      // Manta
       case 'pri(mantaPay.enable)':
         return await this.enableMantaPay(request);
       case 'pri(mantaPay.initSyncMantaPay)':

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

@@ -3,6 +3,7 @@ import { AuthUrlInfo } from '@subwallet/extension-base/background/handlers/State
 import { RequestAddPspToken } from '@subwallet/extension-base/background/KoniTypes';
 import { MessageTypes, RequestTypes, ResponseTypes } from '@subwallet/extension-base/background/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { RequestArguments } from 'web3-core';
 export declare const chainPatrolCheckUrl: (url: string) => Promise<boolean>;
 export default class KoniTabs {
@@ -26,9 +27,10 @@ export default class KoniTabs {
     protected redirectIfPhishing(url: string): Promise<boolean>;
     private cancelSubscription;
     private createUnsubscriptionHandle;
-    getAuthInfo(url: string): Promise<AuthUrlInfo | undefined>;
+    getAuthInfo(url: string, fromList?: AuthUrls): Promise<AuthUrlInfo | undefined>;
     private accountsListV2;
     private accountsSubscribeV2;
+    private accountsUnsubscribe;
     private authorizeV2;
     private getEvmCurrentAccount;
     private getEvmState;

package/koni/background/handlers/Tabs.js

@@ -77,6 +77,7 @@ export const chainPatrolCheckUrl = async url => {
   return data.status === 'BLOCKED';
 };
 export default class KoniTabs {
+  #accountSubs = {};
   #koniState;
   evmEventEmitterMap = {};
   #chainPatrolService = DEFAULT_CHAIN_PATROL_ENABLE;
@@ -105,17 +106,25 @@ export default class KoniTabs {
     assert(pair, 'Unable to find keypair');
     return pair;
   }
-  bytesSign(url, request) {
+  async bytesSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
+    const authInfo = await this.getAuthInfo(url);
+    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
+      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
+    }
     return this.#koniState.sign(url, new RequestBytesSign(request), {
       address,
       ...pair.meta
     });
   }
-  extrinsicSign(url, request) {
+  async extrinsicSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
+    const authInfo = await this.getAuthInfo(url);
+    if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[pair.address]) {
+      throw new Error('Account {{address}} not in allowed list'.replace('{{address}}', address));
+    }
     return this.#koniState.sign(url, new RequestExtrinsicSign(request), {
       address,
       ...pair.meta
@@ -217,8 +226,8 @@ export default class KoniTabs {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.#koniState.createUnsubscriptionHandle(id, unsubscribe);
   }
-  async getAuthInfo(url) {
-    const authList = await this.#koniState.getAuthList();
+  async getAuthInfo(url, fromList) {
+    const authList = fromList || (await this.#koniState.getAuthList());
     const shortenUrl = stripUrl(url);
     return authList[shortenUrl];
   }
@@ -233,15 +242,35 @@ export default class KoniTabs {
     accountAuthType
   }, id, port) {
     const cb = createSubscription(id, port);
-    const subscription = this.#koniState.keyringService.accountSubject.subscribe(accounts => {
-      this.getAuthInfo(url).then(authInfo => {
-        cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
-      }).catch(console.error);
-    });
-    this.createUnsubscriptionHandle(id, subscription.unsubscribe);
+    const authInfoSubject = this.#koniState.requestService.subscribeAuthorizeUrlSubject;
+
+    // Update unsubscribe from @polkadot/extension-base
+    this.#accountSubs[id] = {
+      subscription: authInfoSubject.subscribe(infos => {
+        this.getAuthInfo(url, infos).then(authInfo => {
+          const accounts = this.#koniState.keyringService.accounts;
+          return cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
+        }).catch(console.error);
+      }),
+      url
+    };
     port.onDisconnect.addListener(() => {
-      this.cancelSubscription(id);
+      this.accountsUnsubscribe(url, {
+        id
+      });
     });
+    return id;
+  }
+  accountsUnsubscribe(url, {
+    id
+  }) {
+    const sub = this.#accountSubs[id];
+    if (!sub || sub.url !== url) {
+      return false;
+    }
+    delete this.#accountSubs[id];
+    unsubscribe(id);
+    sub.subscription.unsubscribe();
     return true;
   }
   authorizeV2(url, request) {
@@ -897,6 +926,8 @@ export default class KoniTabs {
         return this.metadataList(url);
       case 'pub(metadata.provide)':
         return this.metadataProvide(url, request);
+      case 'pub(ping)':
+        return Promise.resolve(true);
       case 'pub(rpc.listProviders)':
         return this.rpcListProviders();
       case 'pub(rpc.send)':
@@ -919,6 +950,8 @@ export default class KoniTabs {
         return this.accountsListV2(url, request);
       case 'pub(accounts.subscribeV2)':
         return this.accountsSubscribeV2(url, request, id, port);
+      case 'pub(accounts.unsubscribe)':
+        return this.accountsUnsubscribe(url, request);
       case 'evm(events.subscribe)':
         return await this.evmSubscribeEvents(url, id, port);
       case 'evm(request)':

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.3-0",
+  "version": "1.1.5-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -720,11 +720,21 @@
       "require": "./cjs/services/request-service/constants.js",
       "default": "./services/request-service/constants.js"
     },
+    "./services/request-service/handler": {
+      "types": "./services/request-service/handler/index.d.ts",
+      "require": "./cjs/services/request-service/handler/index.js",
+      "default": "./services/request-service/handler/index.js"
+    },
     "./services/request-service/handler/AuthRequestHandler": {
       "types": "./services/request-service/handler/AuthRequestHandler.d.ts",
       "require": "./cjs/services/request-service/handler/AuthRequestHandler.js",
       "default": "./services/request-service/handler/AuthRequestHandler.js"
     },
+    "./services/request-service/handler/ConnectWCRequestHandler": {
+      "types": "./services/request-service/handler/ConnectWCRequestHandler.d.ts",
+      "require": "./cjs/services/request-service/handler/ConnectWCRequestHandler.js",
+      "default": "./services/request-service/handler/ConnectWCRequestHandler.js"
+    },
     "./services/request-service/handler/EvmRequestHandler": {
       "types": "./services/request-service/handler/EvmRequestHandler.d.ts",
       "require": "./cjs/services/request-service/handler/EvmRequestHandler.js",
@@ -735,6 +745,11 @@
       "require": "./cjs/services/request-service/handler/MetadataRequestHandler.js",
       "default": "./services/request-service/handler/MetadataRequestHandler.js"
     },
+    "./services/request-service/handler/NotSupportWCRequestHandler": {
+      "types": "./services/request-service/handler/NotSupportWCRequestHandler.d.ts",
+      "require": "./cjs/services/request-service/handler/NotSupportWCRequestHandler.js",
+      "default": "./services/request-service/handler/NotSupportWCRequestHandler.js"
+    },
     "./services/request-service/handler/PopupHandler": {
       "types": "./services/request-service/handler/PopupHandler.d.ts",
       "require": "./cjs/services/request-service/handler/PopupHandler.js",
@@ -745,11 +760,6 @@
       "require": "./cjs/services/request-service/handler/SubstrateRequestHandler.js",
       "default": "./services/request-service/handler/SubstrateRequestHandler.js"
     },
-    "./services/request-service/handler/WalletConnectRequestHandler": {
-      "types": "./services/request-service/handler/WalletConnectRequestHandler.d.ts",
-      "require": "./cjs/services/request-service/handler/WalletConnectRequestHandler.js",
-      "default": "./services/request-service/handler/WalletConnectRequestHandler.js"
-    },
     "./services/request-service/helper": {
       "types": "./services/request-service/helper/index.d.ts",
       "require": "./cjs/services/request-service/helper/index.js",
@@ -1173,11 +1183,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "^0.2.7",
-    "@subwallet/extension-base": "^1.1.3-0",
-    "@subwallet/extension-chains": "^1.1.3-0",
-    "@subwallet/extension-dapp": "^1.1.3-0",
-    "@subwallet/extension-inject": "^1.1.3-0",
+    "@subwallet/chain-list": "^0.2.8",
+    "@subwallet/extension-base": "^1.1.5-0",
+    "@subwallet/extension-chains": "^1.1.5-0",
+    "@subwallet/extension-dapp": "^1.1.5-0",
+    "@subwallet/extension-inject": "^1.1.5-0",
     "@subwallet/keyring": "^0.0.10",
     "@subwallet/ui-keyring": "^0.0.10",
     "@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.3-0'
+  version: '1.1.5-0'
 };

package/page/Accounts.js

@@ -14,11 +14,16 @@ export default class Accounts {
     });
   }
   subscribe(cb) {
+    let id = null;
     sendRequest('pub(accounts.subscribeV2)', {
       accountAuthType: 'substrate'
-    }, cb).catch(error => console.error(error));
+    }, cb).then(subId => {
+      id = subId;
+    }).catch(console.error);
     return () => {
-      // FIXME we need the ability to unsubscribe
+      id && sendRequest('pub(accounts.unsubscribe)', {
+        id
+      }).catch(console.error);
     };
   }
 }

package/page/Injected.js

@@ -11,5 +11,10 @@ export default class {
     this.metadata = new Metadata(sendRequest);
     this.provider = new PostMessageProvider(sendRequest);
     this.signer = new Signer(sendRequest);
+    setInterval(() => {
+      sendRequest('pub(ping)', null).catch(() => {
+        console.error('Extension unavailable, ping failed');
+      });
+    }, 5000 + Math.floor(Math.random() * 5000));
   }
 }

package/services/chain-service/index.js

@@ -697,6 +697,15 @@ export class ChainService {
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
     const latestAssetRegistry = await this.fetchLatestData(_CHAIN_ASSET_SRC, ChainAssetMap);
+
+    // Fill out zk assets from latestAssetRegistry if not supported
+    if (!MODULE_SUPPORT.MANTA_ZK) {
+      Object.keys(latestAssetRegistry).forEach(slug => {
+        if (_isMantaZkAsset(latestAssetRegistry[slug])) {
+          delete latestAssetRegistry[slug];
+        }
+      });
+    }
     if (storedAssetRegistry.length === 0) {
       this.dataMap.assetRegistry = latestAssetRegistry;
     } else {

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

@@ -5,7 +5,7 @@ import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { KeyringService } from '@subwallet/extension-base/services/keyring-service';
 import RequestService from '@subwallet/extension-base/services/request-service';
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 export default class AuthRequestHandler {
     #private;
     private keyringService;
@@ -31,8 +31,8 @@ export default class AuthRequestHandler {
     private authCompleteV2;
     authorizeUrlV2(url: string, request: RequestAuthorizeTab): Promise<boolean>;
     getAuthRequestV2(id: string): AuthRequestV2;
-    get subscribeEvmChainChange(): Subject<AuthUrls>;
-    get subscribeAuthorizeUrlSubject(): Subject<AuthUrls>;
+    get subscribeEvmChainChange(): BehaviorSubject<AuthUrls>;
+    get subscribeAuthorizeUrlSubject(): BehaviorSubject<AuthUrls>;
     ensureUrlAuthorizedV2(url: string): Promise<boolean>;
     resetWallet(): void;
 }

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

@@ -6,7 +6,7 @@ import { PREDEFINED_CHAIN_DAPP_CHAIN_MAP } from '@subwallet/extension-base/servi
 import AuthorizeStore from '@subwallet/extension-base/stores/Authorize';
 import { getDomainFromUrl, stripUrl } from '@subwallet/extension-base/utils';
 import { getId } from '@subwallet/extension-base/utils/getId';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
 import { assert } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 const AUTH_URLS_KEY = 'authUrls';
@@ -16,8 +16,8 @@ export default class AuthRequestHandler {
   authorizeStore = new AuthorizeStore();
   #authRequestsV2 = {};
   authorizeCached = undefined;
-  authorizeUrlSubject = new Subject();
-  evmChainSubject = new Subject();
+  authorizeUrlSubject = new BehaviorSubject({});
+  evmChainSubject = new BehaviorSubject({});
   authSubjectV2 = new BehaviorSubject([]);
   constructor(requestService, chainService, keyringService) {
     this.keyringService = keyringService;
@@ -64,6 +64,8 @@ export default class AuthRequestHandler {
     } else {
       this.authorizeStore.get('authUrls', data => {
         this.authorizeCached = data || {};
+        this.evmChainSubject.next(this.authorizeCached);
+        this.authorizeUrlSubject.next(this.authorizeCached);
         update(this.authorizeCached);
       });
     }

package/services/request-service/handler/{WalletConnectRequestHandler.d.ts → ConnectWCRequestHandler.d.ts}

@@ -1,7 +1,7 @@
 import RequestService from '@subwallet/extension-base/services/request-service';
 import { RequestWalletConnectSession, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
 import { BehaviorSubject } from 'rxjs';
-export default class WalletConnectRequestHandler {
+export default class ConnectWCRequestHandler {
     #private;
     readonly connectWCSubject: BehaviorSubject<WalletConnectSessionRequest[]>;
     constructor(requestService: RequestService);

package/services/request-service/handler/{WalletConnectRequestHandler.js → ConnectWCRequestHandler.js}

@@ -4,15 +4,15 @@
 import { BehaviorSubject } from 'rxjs';
 
 // WC = WalletConnect
-export default class WalletConnectRequestHandler {
+export default class ConnectWCRequestHandler {
   #requestService;
-  #walletConnectSessionRequests = {};
+  #connectWCRequests = {};
   connectWCSubject = new BehaviorSubject([]);
   constructor(requestService) {
     this.#requestService = requestService;
   }
   get allConnectWCRequests() {
-    return Object.values(this.#walletConnectSessionRequests)
+    return Object.values(this.#connectWCRequests)
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     .map(({
       reject,
@@ -21,10 +21,10 @@ export default class WalletConnectRequestHandler {
     }) => data);
   }
   get numConnectWCRequests() {
-    return Object.keys(this.#walletConnectSessionRequests).length;
+    return Object.keys(this.#connectWCRequests).length;
   }
   getConnectWCRequest(id) {
-    return this.#walletConnectSessionRequests[id];
+    return this.#connectWCRequests[id];
   }
   updateIconConnectWC(shouldClose) {
     this.connectWCSubject.next(this.allConnectWCRequests);
@@ -32,7 +32,7 @@ export default class WalletConnectRequestHandler {
   }
   connectWCComplete = id => {
     const complete = shouldClose => {
-      delete this.#walletConnectSessionRequests[id];
+      delete this.#connectWCRequests[id];
       this.updateIconConnectWC(shouldClose);
     };
     return {
@@ -46,7 +46,7 @@ export default class WalletConnectRequestHandler {
   };
   addConnectWCRequest(request) {
     const id = request.id;
-    this.#walletConnectSessionRequests[id] = {
+    this.#connectWCRequests[id] = {
       ...this.connectWCComplete(id),
       ...request
     };
@@ -54,7 +54,7 @@ export default class WalletConnectRequestHandler {
     this.#requestService.popupOpen();
   }
   resetWallet() {
-    for (const request of Object.values(this.#walletConnectSessionRequests)) {
+    for (const request of Object.values(this.#connectWCRequests)) {
       request.reject(new Error('Reset wallet'));
     }
     this.connectWCSubject.next([]);

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

@@ -0,0 +1,15 @@
+import RequestService from '@subwallet/extension-base/services/request-service';
+import { RequestWalletConnectNotSupport, WalletConnectNotSupportRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
+import { BehaviorSubject } from 'rxjs';
+export default class NotSupportWCRequestHandler {
+    #private;
+    readonly notSupportWCSubject: BehaviorSubject<WalletConnectNotSupportRequest[]>;
+    constructor(requestService: RequestService);
+    get allNotSupportWCRequests(): WalletConnectNotSupportRequest[];
+    get numNotSupportWCRequests(): number;
+    getNotSupportWCRequest(id: string): RequestWalletConnectNotSupport;
+    private updateIconNotSupportWC;
+    private notSupportWCComplete;
+    addNotSupportWCRequest(request: WalletConnectNotSupportRequest): void;
+    resetWallet(): void;
+}