TypeError fix on signing

IndigoProtocol · Jul 13, 2023 · 75ec57a · 75ec57a
1 parent e127497
commit 75ec57a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 34 deletions.
diff --git a/src/dex/models/dex-transaction.ts b/src/dex/models/dex-transaction.ts
@@ -48,16 +48,6 @@ export class DexTransaction {
     public payToAddresses(payToAddresses: PayToAddress[]): Promise<DexTransaction> {
         return this._walletProvider.paymentsForTransaction(this, payToAddresses)
             .then(() => {
-                return this as DexTransaction;
-            })
-            .catch((error) => {
-                this.status = TransactionStatus.Errored;
-                this.error = {
-                    step: TransactionStatus.Building,
-                    reason: 'Failed to build transaction.',
-                    reasonRaw: error,
-                };
-
                 return this as DexTransaction;
             });
     }
@@ -71,16 +61,6 @@ export class DexTransaction {
             .then(() => {
                 this._isSigned = true;
 
-                return this as DexTransaction;
-            })
-            .catch((error) => {
-                this.status = TransactionStatus.Errored;
-                this.error = {
-                    step: TransactionStatus.Signing,
-                    reason: 'Failed to sign transaction.',
-                    reasonRaw: error,
-                };
-
                 return this as DexTransaction;
             });
     }
@@ -97,16 +77,6 @@ export class DexTransaction {
             .then((txHash: string) => {
                 this._hash = txHash;
 
-                return this as DexTransaction;
-            })
-            .catch((error) => {
-                this.status = TransactionStatus.Errored;
-                this.error = {
-                    step: TransactionStatus.Submitting,
-                    reason: 'Failed to submit transaction.',
-                    reasonRaw: error,
-                };
-
                 return this as DexTransaction;
             });
     }

diff --git a/src/requests/fetch-request.ts b/src/requests/fetch-request.ts
@@ -78,6 +78,10 @@ export class FetchRequest {
      * Fetch latest state for a liquidity pool.
      */
     public getLiquidityPoolState(liquidityPool: LiquidityPool): Promise<LiquidityPool> {
+        if (! liquidityPool) {
+            return Promise.reject('Invalid liquidity pool provided.');
+        }
+
         const dexInstance: BaseDex | undefined = this._dexter.dexByName(liquidityPool.dex);
 
         if (! dexInstance) {
@@ -193,9 +197,7 @@ export class FetchRequest {
 
         return await Promise.all(liquidityPoolPromises)
             .then((liquidityPools: (LiquidityPool | undefined)[]) => {
-                return liquidityPools.filter((pool?: LiquidityPool) => {
-                    return pool !== undefined;
-                }) as LiquidityPool[];
+                return liquidityPools.filter((pool?: LiquidityPool) => pool !== undefined) as LiquidityPool[];
             });
     }
 
@@ -266,7 +268,11 @@ export class FetchRequest {
 
         return Promise.all(
             filterTokenPromises.concat(filterPairPromises).flat(),
-        ).then((allLiquidityPools: Awaited<LiquidityPool[]>[]) => allLiquidityPools.flat());
+        ).then((allLiquidityPools: Awaited<LiquidityPool[]>[]) => {
+            return allLiquidityPools
+                .flat()
+                .filter((pool?: LiquidityPool) => pool !== undefined) as LiquidityPool[];
+        });
     }
 
 }