fix: reset register remote tokens mutations and tx state on confirmed

axelarnetwork · Jan 16, 2024 · 5743dbf · 5743dbf
1 parent 66a292d
commit 5743dbf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/apps/maestro/src/features/RegisterRemoteTokens/RegisterRemoteTokens.tsx b/apps/maestro/src/features/RegisterRemoteTokens/RegisterRemoteTokens.tsx
@@ -27,14 +27,6 @@ export const RegisterRemoteTokens: FC<RegisterRemoteTokensProps> = (props) => {
   const { address: deployerAddress } = useAccount();
   const [txState, setTxState] = useTransactionState();
 
-  useEffect(
-    () => {
-      props.onTxStateChange?.(txState);
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [txState.status]
-  );
-
   const { mutateAsync: recordRemoteTokenDeployment } =
     trpc.interchainToken.recordRemoteTokensDeployment.useMutation();
 
@@ -72,21 +64,36 @@ export const RegisterRemoteTokens: FC<RegisterRemoteTokensProps> = (props) => {
     },
   });
 
-  const { writeAsync: registerCanonicalTokensAsync } =
+  const { writeAsync: registerCanonicalTokensAsync, reset: resetCanonical } =
     useRegisterRemoteCanonicalTokens({
       chainIds: props.chainIds,
       deployerAddress: deployerAddress as `0x${string}`,
       tokenAddress: props.tokenAddress,
       originChainId: props.originChainId ?? -1,
     });
 
-  const { writeAsync: registerInterchainTokensAsync } =
+  const { writeAsync: registerInterchainTokensAsync, reset: resetInterchain } =
     useRegisterRemoteInterchainTokens({
       chainIds: props.chainIds,
       tokenAddress: props.tokenAddress,
       originChainId: props.originChainId ?? -1,
     });
 
+  useEffect(
+    () => {
+      props.onTxStateChange?.(txState);
+
+      if (txState.status === "confirmed") {
+        // reset muations & tx state
+        resetCanonical();
+        resetInterchain();
+        setTxState({ status: "idle" });
+      }
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [txState.status]
+  );
+
   const registerTokensAsync = useMemo(() => {
     switch (props.deploymentKind) {
       case "canonical":

diff --git a/apps/maestro/src/ui/pages/InterchainTokenDetailsPage/ConnectedInterchainTokensPage.tsx b/apps/maestro/src/ui/pages/InterchainTokenDetailsPage/ConnectedInterchainTokensPage.tsx
@@ -355,10 +355,7 @@ const ConnectedInterchainTokensPage: FC<ConnectedInterchainTokensPageProps> = (
                     break;
                   case "confirmed":
                     setSessionState((draft) => {
-                      draft.selectedChainIds = without(
-                        [txState.chainId],
-                        draft.selectedChainIds
-                      ) as number[];
+                      draft.selectedChainIds = [];
                     });
                     break;
                   default: