Merge pull request #1408 from Conflux-Chain/fix/tx-polling

fix: remove if in tx send error handler
Conflux-Chain · Sep 12, 2024 · b5fd72e · b5fd72e
2 parents d054f29 + 7645981
commit b5fd72e
Showing 1 changed file with 39 additions and 42 deletions.
diff --git a/packages/rpcs/wallet_handleUnfinishedETHTx/index.js b/packages/rpcs/wallet_handleUnfinishedETHTx/index.js
@@ -221,48 +221,45 @@ export const main = ({
             const failed =
               !sameAsSuccess && (shouldDiscard || resendPriceTooLow)
 
-            if (errorType === 'unknownError')
-              defs({
-                failed: failed && {errorType, err},
-                sameAsSuccess,
-                resend: !shouldDiscard && !sameAsSuccess,
-              })
-                .transform(
-                  branchObj({
-                    failed: [
-                      sideEffect(
-                        ({err}) =>
-                          typeof failedCb === 'function' && failedCb(err),
-                      ),
-                      sideEffect(({errorType}) => {
-                        if (setTxFailed({hash, error: errorType})) {
-                          getExt().then(ext =>
-                            ext.notifications.create(hash, {
-                              title: 'Failed transaction',
-                              message: `Transaction ${parseInt(
-                                tx.txPayload.nonce,
-                                16,
-                              )} failed! ${err?.data || err?.message || ''}`,
-                            }),
-                          )
-                        }
-                      }),
-                      sideEffect(() => {
-                        updateBadge(getUnfinishedTxCount())
-                      }),
-                    ],
-                    resend: sideEffect(keepTrack),
-                    // retry in next run
-                    sameAsSuccess: [
-                      sideEffect(() => setTxPending({hash})),
-                      sideEffect(
-                        () => typeof okCb === 'function' && okCb(hash),
-                      ),
-                      sideEffect(keepTrack),
-                    ],
-                  }),
-                )
-                .done()
+            defs({
+              failed: failed && {errorType, err},
+              sameAsSuccess,
+              resend: !shouldDiscard && !sameAsSuccess,
+            })
+              .transform(
+                branchObj({
+                  failed: [
+                    sideEffect(
+                      ({err}) =>
+                        typeof failedCb === 'function' && failedCb(err),
+                    ),
+                    sideEffect(({errorType}) => {
+                      if (setTxFailed({hash, error: errorType})) {
+                        getExt().then(ext =>
+                          ext.notifications.create(hash, {
+                            title: 'Failed transaction',
+                            message: `Transaction ${parseInt(
+                              tx.txPayload.nonce,
+                              16,
+                            )} failed! ${err?.data || err?.message || ''}`,
+                          }),
+                        )
+                      }
+                    }),
+                    sideEffect(() => {
+                      updateBadge(getUnfinishedTxCount())
+                    }),
+                  ],
+                  resend: sideEffect(keepTrack),
+                  // retry in next run
+                  sameAsSuccess: [
+                    sideEffect(() => setTxPending({hash})),
+                    sideEffect(() => typeof okCb === 'function' && okCb(hash)),
+                    sideEffect(keepTrack),
+                  ],
+                }),
+              )
+              .done()
           },
         }),
       )