From 78c37c58e11de5171b7e65c2e75c5bbe3b423b8f Mon Sep 17 00:00:00 2001
From: jinoosss <jwchoi@onbloc.xyz>
Date: Wed, 31 Jan 2024 17:04:36 +0900
Subject: [PATCH] fix: [ADN-410] Fix an error of Approve Transaction popup

---
 .../popup/wallet/approve-transaction-main/index.tsx    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/adena-extension/src/pages/popup/wallet/approve-transaction-main/index.tsx b/packages/adena-extension/src/pages/popup/wallet/approve-transaction-main/index.tsx
index 9a963257..9f10d9d9 100644
--- a/packages/adena-extension/src/pages/popup/wallet/approve-transaction-main/index.tsx
+++ b/packages/adena-extension/src/pages/popup/wallet/approve-transaction-main/index.tsx
@@ -186,13 +186,15 @@ const ApproveTransactionContainer: React.FC = () => {
 
     try {
       setProcessType('PROCESSING');
-      const { signed } = await transactionService.createTransaction(wallet, document);
+      const walletInstance = wallet.clone();
+      walletInstance.currentAccountId = currentAccount.id;
+      const { signed } = await transactionService.createTransaction(walletInstance, document);
       const hash = transactionService.createHash(signed);
       const response = await new Promise<
         BroadcastTxCommitResult | BroadcastTxSyncResult | TM2Error | null
       >((resolve) => {
         transactionService
-          .sendTransaction(wallet, currentAccount, signed, true)
+          .sendTransaction(walletInstance, currentAccount, signed, true)
           .then(resolve)
           .catch((error: TM2Error | Error) => {
             resolve(error);
@@ -261,7 +263,7 @@ const ApproveTransactionContainer: React.FC = () => {
       });
       return;
     }
-    sendTransaction().finally(() => setProcessType('DONE'));
+    sendTransaction().finally(() => { setProcessType('DONE') });
   };
 
   useEffect(() => {
@@ -297,7 +299,7 @@ const ApproveTransactionContainer: React.FC = () => {
 
   const onResponseSendTransaction = useCallback(() => {
     if (response) {
-      // chrome.runtime.sendMessage(response);
+      chrome.runtime.sendMessage(response);
     }
   }, [response]);