@subwallet/extension-base 1.1.34-0 → 1.1.35-beta.0

package/services/earning-service/utils/index.d.ts

@@ -0,0 +1,18 @@
+import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
+import { LendingYieldPoolInfo, LiquidYieldPoolInfo, NativeYieldPoolInfo, NominationYieldPoolInfo, YieldAssetExpectedEarning, YieldCompoundingPeriod, YieldPoolInfo, YieldPoolType } from '@subwallet/extension-base/types';
+export declare function calculateReward(apr: number, amount?: number, compoundingPeriod?: YieldCompoundingPeriod, isApy?: boolean): YieldAssetExpectedEarning;
+/**
+ * @returns
+ * <p>
+ * [0] - identity
+ * </p>
+ * <p>
+ * [1] - isReasonable (isVerified)
+ * </p>
+ *  */
+export declare function parseIdentity(substrateApi: _SubstrateApi, address: string, children?: string): Promise<[string | undefined, boolean]>;
+export declare function isActionFromValidator(stakingType: YieldPoolType, chain: string): boolean;
+export declare const isNominationPool: (pool: YieldPoolInfo) => pool is NominationYieldPoolInfo;
+export declare const isNativeStakingPool: (pool: YieldPoolInfo) => pool is NativeYieldPoolInfo;
+export declare const isLiquidPool: (pool: YieldPoolInfo) => pool is LiquidYieldPoolInfo;
+export declare const isLendingPool: (pool: YieldPoolInfo) => pool is LendingYieldPoolInfo;

package/services/earning-service/utils/index.js

@@ -0,0 +1,112 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/earning-service/constants';
+import { YieldCompoundingPeriod, YieldPoolType } from '@subwallet/extension-base/types';
+import { hexToString, isHex } from '@polkadot/util';
+export function calculateReward(apr, amount = 0, compoundingPeriod = YieldCompoundingPeriod.YEARLY, isApy = false) {
+  if (!apr) {
+    return {};
+  }
+  if (!isApy) {
+    const periodApr = apr / 365 * compoundingPeriod; // APR is always annually
+    const earningRatio = periodApr / 100 / compoundingPeriod;
+    const periodApy = (1 + earningRatio) ** compoundingPeriod - 1;
+    const reward = periodApy * amount;
+    return {
+      apy: periodApy * 100,
+      rewardInToken: reward
+    };
+  } else {
+    const reward = apr / 100 * amount;
+    return {
+      apy: apr,
+      rewardInToken: reward * (compoundingPeriod / YieldCompoundingPeriod.YEARLY)
+    };
+  }
+}
+
+/**
+ * @returns
+ * <p>
+ * [0] - identity
+ * </p>
+ * <p>
+ * [1] - isReasonable (isVerified)
+ * </p>
+ *  */
+export async function parseIdentity(substrateApi, address, children) {
+  const compactResult = rs => {
+    const result = [];
+    if (rs) {
+      result.push(rs);
+    }
+    if (children) {
+      result.push(children);
+    }
+    if (result.length > 0) {
+      return result.join('/');
+    } else {
+      return undefined;
+    }
+  };
+  if (substrateApi.api.query.identity) {
+    let identity;
+    const _parent = await substrateApi.api.query.identity.superOf(address);
+    const parentInfo = _parent.toHuman();
+    if (parentInfo) {
+      const [parentAddress, {
+        Raw: data
+      }] = parentInfo;
+      const child = isHex(data) ? hexToString(data) : data;
+
+      // TODO: Re-check
+      if (address !== parentAddress) {
+        const [rs, isReasonable] = await parseIdentity(substrateApi, parentAddress, child);
+        return [compactResult(rs), isReasonable];
+      }
+    }
+    const _identity = await substrateApi.api.query.identity.identityOf(address);
+    const identityInfo = _identity.toHuman();
+    if (identityInfo) {
+      var _identityInfo$info, _identityInfo$info$di, _identityInfo$info2, _identityInfo$info2$w, _identityInfo$info3, _identityInfo$info3$r, _identityInfo$info4, _identityInfo$info4$t;
+      const displayName = (_identityInfo$info = identityInfo.info) === null || _identityInfo$info === void 0 ? void 0 : (_identityInfo$info$di = _identityInfo$info.display) === null || _identityInfo$info$di === void 0 ? void 0 : _identityInfo$info$di.Raw;
+      const web = (_identityInfo$info2 = identityInfo.info) === null || _identityInfo$info2 === void 0 ? void 0 : (_identityInfo$info2$w = _identityInfo$info2.web) === null || _identityInfo$info2$w === void 0 ? void 0 : _identityInfo$info2$w.Raw;
+      const riot = (_identityInfo$info3 = identityInfo.info) === null || _identityInfo$info3 === void 0 ? void 0 : (_identityInfo$info3$r = _identityInfo$info3.riot) === null || _identityInfo$info3$r === void 0 ? void 0 : _identityInfo$info3$r.Raw;
+      const twitter = (_identityInfo$info4 = identityInfo.info) === null || _identityInfo$info4 === void 0 ? void 0 : (_identityInfo$info4$t = _identityInfo$info4.twitter) === null || _identityInfo$info4$t === void 0 ? void 0 : _identityInfo$info4$t.Raw;
+      const isReasonable = identityInfo.judgements.length > 0;
+      if (displayName) {
+        identity = isHex(displayName) ? hexToString(displayName) : displayName;
+      } else {
+        identity = twitter || web || riot;
+      }
+      return [compactResult(identity), isReasonable];
+    }
+  }
+  return [undefined, false];
+}
+export function isActionFromValidator(stakingType, chain) {
+  if (stakingType === YieldPoolType.NOMINATION_POOL || stakingType === YieldPoolType.LIQUID_STAKING || stakingType === YieldPoolType.LENDING) {
+    return false;
+  }
+  if (_STAKING_CHAIN_GROUP.astar.includes(chain)) {
+    return true;
+  } else if (_STAKING_CHAIN_GROUP.amplitude.includes(chain)) {
+    return true;
+  } else if (_STAKING_CHAIN_GROUP.para.includes(chain)) {
+    return true;
+  }
+  return false;
+}
+export const isNominationPool = pool => {
+  return pool.type === YieldPoolType.NOMINATION_POOL;
+};
+export const isNativeStakingPool = pool => {
+  return pool.type === YieldPoolType.NATIVE_STAKING;
+};
+export const isLiquidPool = pool => {
+  return pool.type === YieldPoolType.LIQUID_STAKING;
+};
+export const isLendingPool = pool => {
+  return pool.type === YieldPoolType.LENDING;
+};

package/services/event-service/index.d.ts

@@ -8,12 +8,14 @@ export declare class EventService extends EventEmitter<EventRegistry> {
     readonly waitDatabaseReady: Promise<boolean>;
     readonly waitKeyringReady: Promise<boolean>;
     readonly waitAccountReady: Promise<boolean>;
+    readonly waitInjectReady: Promise<boolean>;
     readonly waitChainReady: Promise<boolean>;
     readonly waitAssetReady: Promise<boolean>;
     readonly waitMigrateReady: Promise<boolean>;
     readonly waitCampaignReady: Promise<boolean>;
     readonly waitBuyTokenReady: Promise<boolean>;
     readonly waitBuyServiceReady: Promise<boolean>;
+    readonly waitEarningReady: Promise<boolean>;
     constructor();
     private generateWaitPromise;
     private setLazyTimeout;

package/services/event-service/index.js

@@ -3,6 +3,7 @@
 
 // Stateless service handle runtime event on background
 
+import { TARGET_ENV } from '@subwallet/extension-base/utils';
 import EventEmitter from 'eventemitter3';
 const DEFAULT_LAZY_TIME = 300;
 const LONG_LAZY_TIME = 900;
@@ -17,16 +18,20 @@ export class EventService extends EventEmitter {
     this.waitDatabaseReady = this.generateWaitPromise('database.ready');
     this.waitKeyringReady = this.generateWaitPromise('keyring.ready');
     this.waitAccountReady = this.generateWaitPromise('account.ready');
+    // TODO: Need to merge logic on web-runner file
+    this.waitInjectReady = TARGET_ENV === 'webapp' ? this.generateWaitPromise('inject.ready') : Promise.resolve(true);
     this.waitChainReady = this.generateWaitPromise('chain.ready');
     this.waitAssetReady = this.generateWaitPromise('asset.ready');
     this.waitMigrateReady = this.generateWaitPromise('migration.done');
     this.waitCampaignReady = this.generateWaitPromise('campaign.ready');
     this.waitBuyTokenReady = this.generateWaitPromise('buy.tokens.ready');
     this.waitBuyServiceReady = this.generateWaitPromise('buy.services.ready');
+    this.waitEarningReady = this.generateWaitPromise('earning.ready');
   }
   generateWaitPromise(eventType) {
     return new Promise(resolve => {
       this.once(eventType, isReady => {
+        console.log('===LOG generateWaitPromise eventType', eventType);
         resolve(isReady);
       });
     });

package/services/event-service/types.d.ts

@@ -5,12 +5,20 @@ export interface EventRegistry {
     'general.wakeup': [boolean];
     'crypto.ready': [boolean];
     'database.ready': [boolean];
+    /** Password state ready  */
     'keyring.ready': [boolean];
+    /** Update current account  */
     'account.updateCurrent': [CurrentAccountInfo];
+    /** Account list loaded  */
     'account.ready': [boolean];
+    /** Add a new account  */
     'account.add': [string];
+    /** Update account */
     'account.update': [string];
+    /** Remove a account  */
     'account.remove': [string];
+    /** Inject account done  */
+    'inject.ready': [boolean];
     'chain.ready': [boolean];
     'chain.add': [string];
     'chain.updateState': [string];
@@ -28,6 +36,7 @@ export interface EventRegistry {
     'campaign.ready': [boolean];
     'buy.tokens.ready': [boolean];
     'buy.services.ready': [boolean];
+    'earning.ready': [boolean];
 }
 export declare type EventType = keyof EventRegistry;
 export declare const COMMON_RELOAD_EVENTS: EventType[];

package/services/keyring-service/index.d.ts

@@ -10,6 +10,7 @@ export declare class KeyringService {
     readonly addressesSubject: BehaviorSubject<SubjectInfo>;
     readonly accountSubject: BehaviorSubject<SubjectInfo>;
     private beforeAccount;
+    private injected;
     readonly keyringStateSubject: BehaviorSubject<KeyringState>;
     constructor(eventService: EventService);
     private subscribeAccounts;
@@ -21,6 +22,6 @@ export declare class KeyringService {
     setCurrentAccount(currentAccountData: CurrentAccountInfo): void;
     lock(): void;
     addInjectAccounts(accounts: InjectedAccountWithMeta[]): void;
-    removeInjectAccounts(addresses: string[]): void;
+    removeInjectAccounts(_addresses: string[]): void;
     resetWallet(resetAll: boolean): Promise<void>;
 }

package/services/keyring-service/index.js

@@ -22,6 +22,7 @@ export class KeyringService {
   });
   constructor(eventService) {
     this.eventService = eventService;
+    this.injected = false;
     this.eventService.waitCryptoReady.then(() => {
       this.currentAccountStore.get('CurrentAccountInfo', rs => {
         rs && this.currentAccountSubject.next(rs);
@@ -133,8 +134,19 @@ export class KeyringService {
         currentGenesisHash: null
       });
     }
+    if (!this.injected) {
+      this.eventService.emit('inject.ready', true);
+      this.injected = true;
+    }
   }
-  removeInjectAccounts(addresses) {
+  removeInjectAccounts(_addresses) {
+    const addresses = _addresses.map(address => {
+      try {
+        return keyring.getPair(address).address;
+      } catch (error) {
+        return address;
+      }
+    });
     const currentAddress = this.currentAccountSubject.value.address;
     const afterAccounts = Object.keys(this.accounts).filter(address => addresses.indexOf(address) < 0);
     if (afterAccounts.length === 1) {
@@ -159,7 +171,7 @@ export class KeyringService {
     await new Promise(resolve => {
       setTimeout(() => {
         resolve();
-      }, 500);
+      }, 1500);
     });
     this.updateKeyringState();
     this.currentAccountSubject.next({

package/services/migration-service/scripts/DeleteEarningData.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class DeleteEarningData extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/DeleteEarningData.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class DeleteEarningData extends BaseMigrationJob {
+  async run() {
+    try {
+      await this.state.dbService.deleteYieldPoolInfo(['LcDOT___acala_euphrates_liquid_staking', 'xcDOT___moonwell_lending']);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/EnableEarningChains.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class EnableEarningChains extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/EnableEarningChains.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class EnableEarningChains extends BaseMigrationJob {
+  async run() {
+    try {
+      await this.state.chainService.enableChains(['moonbeam', 'acala', 'bifrost_dot', 'interlay', 'parallel']);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/MigrateLedgerAccount.js

@@ -11,7 +11,7 @@ export default class MigrateLedgerAccount extends BaseMigrationJob {
         const store = new AccountsStore();
         const update = (key, value) => {
           var _value$meta;
-          if (key.startsWith('account:') && value.meta && isString((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
+          if (key.startsWith('account:') && value !== null && value !== void 0 && value.meta && isString((_value$meta = value.meta) === null || _value$meta === void 0 ? void 0 : _value$meta.originGenesisHash)) {
             const newValue = {
               ...value
             };

package/services/migration-service/scripts/MigrateTransactionHistory.js

@@ -12,7 +12,7 @@ export default class MigrateTransactionHistory extends BaseMigrationJob {
     const chainInfoMap = state.getChainInfoMap();
     const assetList = Object.values(state.getAssetRegistry());
     try {
-      const db = new Dexie('SubWalletDB');
+      const db = new Dexie('SubWalletDB_v2');
       const dexieDB = await db.open();
       const transactionTable = dexieDB.table('transactions');
       const oldTransactionData = await transactionTable.toArray();

package/services/migration-service/scripts/databases/MigrateEarningHistory.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateEarningHistory extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/databases/MigrateEarningHistory.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateEarningHistory extends BaseMigrationJob {
+  async run() {
+    try {
+      await this.state.dbService.removeOldEarningData();
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/databases/MigrateEarningVersion.d.ts

@@ -0,0 +1,4 @@
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateEarningVersion extends BaseMigrationJob {
+    run(): Promise<void>;
+}

package/services/migration-service/scripts/databases/MigrateEarningVersion.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BaseMigrationJob from '@subwallet/extension-base/services/migration-service/Base';
+export default class MigrateEarningVersion extends BaseMigrationJob {
+  async run() {
+    try {
+      await this.state.dbService.removeOldEarningData();
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}

package/services/migration-service/scripts/index.js

@@ -1,6 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import DeleteEarningData from '@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData';
+import MigrateEarningVersion from "./databases/MigrateEarningVersion.js";
 import MigrateEthProvider from "./providers/MigrateEthProvider.js";
 import MigratePioneerProvider from "./providers/MigratePioneerProvider.js";
 import MigrateProvidersV1M1P24 from "./providers/MigrateProvidersV1M1P24.js";
@@ -33,9 +35,12 @@ export default {
   '1.1.6-01': MigrateWalletReference,
   '1.1.7': DeleteChain,
   '1.1.13-01': MigrateTokenDecimals,
+  // '1.1.13-02-2': EnableEarningChains,
+  '1.1.13-03': DeleteEarningData,
   '1.1.17-01': MigratePioneerProvider,
   '1.1.17-03': EnableVaraChain,
   '1.1.24-01': MigrateProvidersV1M1P24,
-  '1.1.26-01': MigratePolygonUSDCProvider
+  '1.1.26-01': MigratePolygonUSDCProvider,
+  '1.1.28-01': MigrateEarningVersion
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/mint-campaign-service/campaigns/UnlockDotCampaign.d.ts

@@ -0,0 +1,13 @@
+import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { UnlockDotSubmitMintData, UnlockDotTransactionNft } from '@subwallet/extension-base/types';
+export default class UnlockDotCampaign {
+    #private;
+    constructor(state: KoniState);
+    mintNft({ address, extrinsicHash, network, slug, transactionId }: UnlockDotSubmitMintData): Promise<void>;
+    private checkMint;
+    private submitNft;
+    private getMinted;
+    canMint(address: string, slug: string, network: string): Promise<boolean>;
+    subscribeMintedNft(transactionId: string, cb: (data: UnlockDotTransactionNft) => void): import("rxjs").Subscription;
+    getMintedNft(transactionId: string): UnlockDotTransactionNft;
+}

package/services/mint-campaign-service/campaigns/UnlockDotCampaign.js

@@ -0,0 +1,139 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { isSameAddress } from '@subwallet/extension-base/utils';
+import axios from 'axios';
+import { BehaviorSubject } from 'rxjs';
+import { MINT_HOST } from "../constants.js";
+export default class UnlockDotCampaign {
+  #host = MINT_HOST;
+  #campaignId = 4;
+  #state;
+  #transactionNftSubject = new BehaviorSubject({});
+  #transactionNftState = {};
+  constructor(state) {
+    this.#state = state;
+  }
+  async mintNft({
+    address,
+    extrinsicHash,
+    network,
+    slug,
+    transactionId
+  }) {
+    var _result;
+    this.#transactionNftState[transactionId] = undefined;
+    this.#transactionNftSubject.next(this.#transactionNftState);
+    const requestId = await this.checkMint({
+      address,
+      extrinsicHash,
+      network,
+      slug
+    });
+    let result;
+    if (requestId) {
+      result = await this.submitNft(address, requestId);
+      await this.#state.reloadNft();
+      // } else {
+      //   result = await this.getMinted(address, slug);
+    }
+
+    this.#transactionNftState[transactionId] = (_result = result) !== null && _result !== void 0 ? _result : {
+      nftImage: ''
+    };
+    this.#transactionNftSubject.next(this.#transactionNftState);
+  }
+  async checkMint({
+    address,
+    extrinsicHash,
+    network,
+    slug
+  }) {
+    const data = {
+      address,
+      campaignId: this.#campaignId,
+      category: slug,
+      additionalData: {
+        slug,
+        extrinsicHash,
+        network
+      }
+    };
+    const response = await axios.request({
+      baseURL: this.#host,
+      url: '/api/mint/check',
+      method: 'POST',
+      data
+    });
+    const respData = response.data;
+    if (respData.inMintingTime && respData.hasBalance && respData.validCampaign && respData.validCategory && respData.validUser && respData.notDuplicated && respData.requestId && respData.requestId > 1) {
+      return respData.requestId;
+    }
+    return null;
+  }
+  async submitNft(address, id) {
+    const data = {
+      requestId: id,
+      recipient: address
+    };
+    const response = await axios.request({
+      baseURL: this.#host,
+      url: '/api/mint/submit',
+      method: 'POST',
+      data
+    });
+    return response.data;
+  }
+
+  // @ts-ignore
+  async getMinted(address, slug) {
+    const params = {
+      address
+    };
+    const response = await axios.request({
+      baseURL: this.#host,
+      url: '/api/mint/fetch',
+      method: 'GET',
+      params: params
+    });
+    const data = response.data;
+    for (const item of data) {
+      if (isSameAddress(item.address, address) && slug === item.mintCategory && item.status === 'success' && item.campaignId === this.#campaignId) {
+        return item;
+      }
+    }
+    return undefined;
+  }
+  async canMint(address, slug, network) {
+    const data = {
+      address,
+      campaignId: this.#campaignId,
+      category: slug,
+      additionalData: {
+        slug,
+        network
+      }
+    };
+    const response = await axios.request({
+      baseURL: this.#host,
+      url: '/api/mint/check',
+      method: 'POST',
+      data
+    });
+    const respData = response.data;
+    if (respData.inMintingTime && respData.validCampaign && respData.validCategory && respData.validUser && respData.notDuplicated) {
+      return true;
+    }
+    return false;
+  }
+  subscribeMintedNft(transactionId, cb) {
+    return this.#transactionNftSubject.subscribe({
+      next: map => {
+        cb(map[transactionId]);
+      }
+    });
+  }
+  getMintedNft(transactionId) {
+    return this.#transactionNftSubject.value[transactionId];
+  }
+}

package/services/mint-campaign-service/campaigns/index.d.ts

@@ -0,0 +1 @@
+export { default as UnlockDotCampaign } from './UnlockDotCampaign';

package/services/mint-campaign-service/campaigns/index.js

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { default as UnlockDotCampaign } from "./UnlockDotCampaign.js";

package/services/mint-campaign-service/constants.d.ts

@@ -0,0 +1 @@
+export declare const MINT_HOST: string;

package/services/mint-campaign-service/constants.js

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export const MINT_HOST = process.env.NFT_MINTING_HOST || '';

package/services/mint-campaign-service/index.d.ts

@@ -0,0 +1,7 @@
+import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
+import { UnlockDotCampaign } from './campaigns';
+export default class MintCampaignService {
+    #private;
+    readonly unlockDotCampaign: UnlockDotCampaign;
+    constructor(state: KoniState);
+}

package/services/mint-campaign-service/index.js

@@ -0,0 +1,11 @@
+// Copyright 2019-2022 @polkadot/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { UnlockDotCampaign } from "./campaigns/index.js";
+export default class MintCampaignService {
+  #state;
+  constructor(state) {
+    this.#state = state;
+    this.unlockDotCampaign = new UnlockDotCampaign(this.#state);
+  }
+}

package/services/notification-service/NotificationService.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { isFirefox } from '@subwallet/extension-base/utils';
 import { BehaviorSubject } from 'rxjs';
 export default class NotificationService {
   notificationSubject = new BehaviorSubject([]);
@@ -33,10 +34,10 @@ export default class NotificationService {
       type: 'basic',
       title,
       message,
-      iconUrl: './images/icon-128.png',
+      iconUrl: '/images/icon-128.png',
       priority: 2,
       isClickable: !!link || !!onClick,
-      buttons
+      buttons: isFirefox ? undefined : buttons
     }, notificationId => {
       if (link || onClick) {
         chrome.notifications.onClicked.addListener(nId => {

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

@@ -3,11 +3,10 @@
 
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { DEFAULT_NOTIFICATION_TYPE } from '@subwallet/extension-base/services/setting-service/constants';
-import { getOS } from '@subwallet/extension-base/utils';
+import { osName } from '@subwallet/extension-base/utils';
 const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
-const OS = getOS();
-const extraHeight = OS === 'Linux' ? 0 : 28;
-const extraWidth = OS === 'Windows' ? 16 : 0;
+const extraHeight = osName === 'Linux' ? 0 : 28;
+const extraWidth = osName === 'Windows' ? 16 : 0;
 const POPUP_WINDOW_OPTS = {
   focused: true,
   height: 600 + extraHeight,