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

package/services/transaction-service/index.js

@@ -180,7 +180,6 @@ export default class TransactionService {
     this.transactionSubject.next({
       ...transactions
     });
-    console.log(transaction);
 
     // Send transaction
     return await this.sendTransaction(transaction);
@@ -585,6 +584,9 @@ export default class TransactionService {
       payload.isToContract = isToContract;
       payload.parseData = isToContract ? payload.data ? (await parseContractInput(payload.data || '', payload.to || '', chainInfo)).result : '' : payload.data || '';
     }
+    if ('data' in payload && payload.data === undefined) {
+      delete payload.data;
+    }
 
     // Set unique nonce to avoid transaction errors
     if (!payload.nonce) {

package/utils/address.d.ts

@@ -1,2 +1,5 @@
+import { AddressJson } from '@subwallet/extension-base/background/types';
+import { SubjectInfo } from '@subwallet/ui-keyring/observable/types';
 export declare const simpleAddress: (address: string) => string;
 export declare function quickFormatAddressToCompare(address?: string): string | undefined;
+export declare const convertSubjectInfoToAddresses: (subjectInfo: SubjectInfo) => AddressJson[];

package/utils/address.js

@@ -14,4 +14,11 @@ export function quickFormatAddressToCompare(address) {
     return address;
   }
   return reformatAddress(address, 42).toLowerCase();
-}
+}
+export const convertSubjectInfoToAddresses = subjectInfo => {
+  return Object.values(subjectInfo).map(info => ({
+    address: info.json.address,
+    type: info.type,
+    ...info.json.meta
+  }));
+};

package/utils/index.d.ts

@@ -8,7 +8,7 @@ export declare const isDef: (x: any) => boolean;
 export declare const nonEmptyArr: (x: any) => boolean;
 export declare const isEmptyArray: (x: any) => boolean;
 export declare function isAccountAll(address?: string): boolean;
-export declare function reformatAddress(address: string, networkPrefix: number, isEthereum?: boolean): string;
+export declare function reformatAddress(address: string, networkPrefix?: number, isEthereum?: boolean): string;
 export declare function filterAddressByNetworkKey(addresses: string[], networkKey: string, isEthereum?: boolean): string[];
 export declare function categoryAddresses(addresses: string[]): string[][];
 export declare function categoryNetworks(networks: NetworkJson[]): string[][];

package/utils/index.js

@@ -13,7 +13,7 @@ export const isEmptyArray = x => !Array.isArray(x) || Array.isArray(x) && x.leng
 export function isAccountAll(address) {
   return address === ALL_ACCOUNT_KEY;
 }
-export function reformatAddress(address, networkPrefix, isEthereum = false) {
+export function reformatAddress(address, networkPrefix = 42, isEthereum = false) {
   try {
     if (isEthereumAddress(address)) {
       return address;