handle multiple skip conditions

index.d.ts

@@ -1,58 +1,58 @@
 interface TransactionItem {
-    canisterId: string;
-    methodName: string;
-    args: any;
-    idl: any;
-    onSuccess: any;
-    onFail: any;
-    updateNextStep: any;
-    skipCondition:string
+  canisterId: string;
+  methodName: string;
+  args: any;
+  idl: any;
+  onSuccess: any;
+  onFail: any;
+  updateNextStep: any;
+  skipCondition: string | string[];
 }
 type BatchTransactType = {
-    [key: string]: TransactionItem[];
+  [key: string]: TransactionItem[];
 };
 
-type ConnectObjType = { host: string; whitelist: string[] }
+type ConnectObjType = {host: string; whitelist: string[]};
 
 const Artemis = class Artemis {
-    constructor(connectObj?: ConnectObjType);
-    accountId: string;
-    principalId: string;
-    walletActive: string;
-    provider: any;
-    balance: number;
-    wallets: [];
-    canisterActors: {};
-    connectedWalletInfo: { id: string, icon: string, name: string };
-    connect(wallet: string, connectObj?: ConnectObjType):Promise<string> ;
-    autoConnect(connectObj?: ConnectObjType): Promise<string>;
-    disconnect(): Promise<any>;
-    isLoaded(): Promise<any>;
-    getWalletBalance(returnType: string): Promise<number>;
-    requestICPTransfer(transferRequest: any): Promise<any>;
-    getCanisterActor(canisterId: string, idl: any, isAnon: boolean , isForced?:boolean): Promise<any>;
-    batchTransact(transactions: BatchTransactType): Promise<any>;
-    trxArray:[TransactionItem[]]
-}
+  constructor(connectObj?: ConnectObjType);
+  accountId: string;
+  principalId: string;
+  walletActive: string;
+  provider: any;
+  balance: number;
+  wallets: [];
+  canisterActors: {};
+  connectedWalletInfo: {id: string; icon: string; name: string};
+  connect(wallet: string, connectObj?: ConnectObjType): Promise<string>;
+  autoConnect(connectObj?: ConnectObjType): Promise<string>;
+  disconnect(): Promise<any>;
+  isLoaded(): Promise<any>;
+  getWalletBalance(returnType: string): Promise<number>;
+  requestICPTransfer(transferRequest: any): Promise<any>;
+  getCanisterActor(canisterId: string, idl: any, isAnon: boolean, isForced?: boolean): Promise<any>;
+  batchTransact(transactions: BatchTransactType): Promise<any>;
+  trxArray: [TransactionItem[]];
+};
 
 const BatchTransact = class BatchTransact {
-    state: 'idle' | 'running' | 'error' | 'done';
-    transactionLlist: BatchTransactType;
-    stepsList: string[];
-    pending: string[];
-    completed: string[];
-    previousStep: string;
-    activeStep: string;
-    nextStep: ()=>void;
-    failedSteps: string[];
-    transactionResults: {};
-    trxArray:[];
-    execute(): any;
-    retryExecute(): any;
-    constructor(transactionList: any, artemis: Artemis)
-}
+  state: "idle" | "running" | "error" | "done";
+  transactionLlist: BatchTransactType;
+  stepsList: string[];
+  pending: string[];
+  completed: string[];
+  previousStep: string;
+  activeStep: string;
+  nextStep: () => void;
+  failedSteps: string[];
+  transactionResults: {};
+  trxArray: [];
+  execute(): any;
+  retryExecute(): any;
+  constructor(transactionList: any, artemis: Artemis);
+};
 
-const principalIdFromHex:(params:string)=> {};
-declare module 'artemis-web3-adapter' {
-    export { Artemis , BatchTransact , principalIdFromHex , ArtemisAdapter , TransactionItem , BatchTransactType}
-}
+const principalIdFromHex: (params: string) => {};
+declare module "artemis-web3-adapter" {
+  export {Artemis, BatchTransact, principalIdFromHex, ArtemisAdapter, TransactionItem, BatchTransactType};
+}

src/libs/batchTransact.js

@@ -40,7 +40,7 @@ export const BatchTransaction = class BatchTransaction {
                     const onSucessCall = el.onSuccess;
                     const onFailCall = el.onError;
                     const ErrorStat = data.err ? data.err : data.Err ? data.Err : data.ERR;
-                    if (ErrorStat && (JSON.stringify(ErrorStat) != el?.skipCondition)) {
+                    if (ErrorStat && !el?.skipCondition.includes((JSON.stringify(ErrorStat)))) {
                         self.failedSteps.push(self.stepsList[stepIndex]);
                         self.transactionResults[self.stepsList[stepIndex]] = ErrorStat;
                         self.state = 'error';
@@ -67,6 +67,7 @@ export const BatchTransaction = class BatchTransaction {
                     self.activeStep = self.stepsList[stepIndex];
                     self.state = 'error';
                     _this.state = 'error';
+                    self._info = err;
                     if (onFailCall) await onFailCall(err)
                     return false;
                 }