Use txId returned by CGW instead of tx hash for up to date results

safe-global · Aug 31, 2023 · 8d2866e · 8d2866e
1 parent 914e159
commit 8d2866e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/java/io/gnosis/safe/ui/safe/send_funds/SendAssetReviewViewModel.kt b/app/src/main/java/io/gnosis/safe/ui/safe/send_funds/SendAssetReviewViewModel.kt
@@ -251,10 +251,10 @@ class SendAssetReviewViewModel
                     SendAssetReviewState(
                         ViewAction.NavigateTo(
                             SendAssetReviewFragmentDirections.actionSendAssetReviewFragmentToSendAssetSuccessFragment(
-                                activeSafe.chain,
-                                safeTxHash,
-                                amountString,
-                                selectedAsset.symbol
+                                chain = activeSafe.chain,
+                                txId = safeTxHash, // to get non cached updates later we need the txId not the hash
+                                amount = amountString,
+                                token = selectedAsset.symbol
                             )
                         )
                     )

diff --git a/app/src/main/java/io/gnosis/safe/ui/transactions/details/TransactionDetailsFragment.kt b/app/src/main/java/io/gnosis/safe/ui/transactions/details/TransactionDetailsFragment.kt
@@ -70,7 +70,7 @@ class TransactionDetailsFragment : BaseViewBindingFragment<FragmentTransactionDe
                 Navigation.findNavController(root).navigateUp()
             }
             refresh.setOnRefreshListener {
-                viewModel.loadDetails(txId)
+                viewModel.loadDetails(viewModel.txDetails?.txId ?: txId)
             }
         }
 
@@ -130,7 +130,7 @@ class TransactionDetailsFragment : BaseViewBindingFragment<FragmentTransactionDe
             viewModel.resumeFlow(ownerSelected()!!, ownerSigned())
             resetOwnerData()
         } else {
-            viewModel.loadDetails(txId)
+            viewModel.loadDetails(viewModel.txDetails?.txId ?: txId)
         }
     }
 

diff --git a/data/src/main/java/io/gnosis/data/models/transaction/TransactionDetails.kt b/data/src/main/java/io/gnosis/data/models/transaction/TransactionDetails.kt
@@ -14,6 +14,8 @@ import java.util.*
 
 @JsonClass(generateAdapter = true)
 data class TransactionDetails(
+    @Json(name = "txId")
+    val txId: String? = null,
     @Json(name = "txHash")
     val txHash: String? = null,
     @Json(name = "txStatus")