chore: cherry-pick #10088 (#10113)

This PR cherry-picks #10088 Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
MetaMask · Jun 25, 2024 · b92d42e · b92d42e
1 parent 8a84f15
commit b92d42e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/app/components/UI/Swaps/QuotesView.js b/app/components/UI/Swaps/QuotesView.js
@@ -914,7 +914,7 @@ function SwapsQuotesView({
 
       try {
         resetTransaction();
-        const { transactionMeta } = await addTransaction(
+        const { transactionMeta, result } = await addTransaction(
           {
             ...selectedQuote.trade,
             ...getTransactionPropertiesFromGasEstimates(
@@ -929,6 +929,8 @@ function SwapsQuotesView({
           },
         );
 
+        await result;
+
         updateSwapsTransactions(
           transactionMeta,
           approvalTransactionMetaId,
@@ -965,7 +967,7 @@ function SwapsQuotesView({
     ) => {
       try {
         resetTransaction();
-        const { transactionMeta } = await addTransaction(
+        const { transactionMeta, result } = await addTransaction(
           {
             ...approvalTransaction,
             ...getTransactionPropertiesFromGasEstimates(
@@ -979,6 +981,7 @@ function SwapsQuotesView({
           },
         );
 
+        await result;
         setRecipient(selectedAddress);
 
         approvalTransactionMetaId = transactionMeta.id;
@@ -1041,9 +1044,8 @@ function SwapsQuotesView({
     const newSwapsTransactions =
       TransactionController.state.swapsTransactions || {};
     let approvalTransactionMetaId;
-
     if (approvalTransaction) {
-      handleApprovaltransaction(
+      await handleApprovaltransaction(
         TransactionController,
         newSwapsTransactions,
         approvalTransactionMetaId,
@@ -1060,7 +1062,7 @@ function SwapsQuotesView({
       !shouldUseSmartTransaction ||
       (shouldUseSmartTransaction && !approvalTransaction)
     ) {
-      handleSwapTransaction(
+      await handleSwapTransaction(
         TransactionController,
         newSwapsTransactions,
         approvalTransactionMetaId,