@subwallet/extension-base 1.0.2-1 → 1.0.2-1b

package/services/transaction-service/index.js

@@ -427,11 +427,11 @@ export default class TransactionService {
     }
     try {
       // Return one more history record if transaction send to account in the wallets
-      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && keyring.getAccount(historyItem.to);
+      const toAccount = (historyItem === null || historyItem === void 0 ? void 0 : historyItem.to) && keyring.getPair(historyItem.to);
       if (toAccount) {
         return [historyItem, {
           ...historyItem,
-          address: historyItem.to,
+          address: toAccount.address,
           direction: TransactionDirection.RECEIVED
         }];
       }
@@ -456,18 +456,27 @@ export default class TransactionService {
   handlePostProcessing(id) {
     // must be done after success/failure to make sure the transaction is finalized
     const transaction = this.getTransaction(id);
-    switch (transaction.extrinsicType) {
-      case ExtrinsicType.SEND_NFT:
-        {
-          const inputData = parseTransactionData(transaction.data);
-          const sender = keyring.getAccount(inputData.senderAddress);
-          const recipient = keyring.getAccount(inputData.recipientAddress);
-          sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).catch(console.error);
-          recipient && this.databaseService.addNft(recipient.address, {
-            ...inputData.nftItem,
-            owner: recipient.address
-          }).catch(console.error);
-        }
+    if (transaction.extrinsicType === ExtrinsicType.SEND_NFT) {
+      const inputData = parseTransactionData(transaction.data);
+      try {
+        const sender = keyring.getPair(inputData.senderAddress);
+        sender && this.databaseService.handleNftTransfer(transaction.chain, [sender.address, ALL_ACCOUNT_KEY], inputData.nftItem).then(() => {
+          this.eventService.emit('transaction.transferNft', undefined);
+        }).catch(console.error);
+      } catch (e) {
+        console.error(e);
+      }
+      try {
+        const recipient = keyring.getPair(inputData.recipientAddress);
+        recipient && this.databaseService.addNft(recipient.address, {
+          ...inputData.nftItem,
+          owner: recipient.address
+        }).catch(console.error);
+      } catch (e) {
+        console.error(e);
+      }
+    } else if ([ExtrinsicType.STAKING_BOND, ExtrinsicType.STAKING_UNBOND, ExtrinsicType.STAKING_WITHDRAW, ExtrinsicType.STAKING_CANCEL_UNSTAKE, ExtrinsicType.STAKING_CLAIM_REWARD, ExtrinsicType.STAKING_JOIN_POOL, ExtrinsicType.STAKING_POOL_WITHDRAW, ExtrinsicType.STAKING_LEAVE_POOL].includes(transaction.extrinsicType)) {
+      this.eventService.emit('transaction.submitStaking', transaction.chain);
     }
   }
   onSuccess({

package/utils/index.d.ts

@@ -34,6 +34,6 @@ export declare function mergeNetworkProviders(customNetwork: NetworkJson, predef
 };
 export declare const filterAndSortingAccountByAuthType: (accounts: AccountJson[], accountAuthType: AccountAuthType, sorting?: boolean) => AccountJson[];
 export declare function parseRawNumber(value: string): number;
-export declare function parseNumberToDisplay(amount: BN, decimals: number | undefined): string;
 export declare function isSameAddress(address1: string, address2: string): boolean;
 export declare function getDomainFromUrl(url: string): string;
+export declare function waitTimeout(ms: number): Promise<void>;

package/utils/index.js

@@ -3,7 +3,6 @@
 
 import { CrowdloanParaState } from '@subwallet/extension-base/background/KoniTypes';
 import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
-import BigNumber from 'bignumber.js';
 import { BN, hexToU8a, isHex } from '@polkadot/util';
 import { decodeAddress, encodeAddress, ethereumEncode, isEthereumAddress } from '@polkadot/util-crypto';
 export { canDerive } from "./canDerive.js";
@@ -264,21 +263,16 @@ export const filterAndSortingAccountByAuthType = (accounts, accountAuthType, sor
 export function parseRawNumber(value) {
   return parseFloat(value.replaceAll(',', ''));
 }
-export function parseNumberToDisplay(amount, decimals) {
-  if (!decimals) {
-    return '0';
-  }
-  const parsedAmount = parseRawNumber(amount.toString());
-  const bigN = new BigNumber(parsedAmount / 10 ** decimals);
-  const roundedString = bigN.toFixed(9);
-  const formattedString = parseFloat(roundedString); // remove excess zeros at the end
-
-  return formattedString.toString();
-}
 export function isSameAddress(address1, address2) {
+  if (isEthereumAddress(address1)) {
+    return address1.toLowerCase() === address2.toLowerCase();
+  }
   return reformatAddress(address1, 0) === reformatAddress(address2, 0); // TODO: maybe there's a better way
 }
 
 export function getDomainFromUrl(url) {
   return url.replace(/^(https?:\/\/)?(www\.)?/, '').split('/')[0];
+}
+export async function waitTimeout(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
 }