Merge branch 'release' into GH-1996/update-up-to-date-version

safe-global · Aug 31, 2023 · 9577216 · 9577216
2 parents 2c94b80 + 616ea14
commit 9577216
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 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/app/src/main/java/io/gnosis/safe/ui/transactions/details/view/TxConfirmationsView.kt b/app/src/main/java/io/gnosis/safe/ui/transactions/details/view/TxConfirmationsView.kt
@@ -121,6 +121,9 @@ class TxConfirmationsView @JvmOverloads constructor(
             TransactionStatus.FAILED -> {
                 addExecutionStep(TxExecutionStep.Type.FAILED)
             }
+            TransactionStatus.PENDING -> {
+                addExecutionStep(TxExecutionStep.Type.PENDING)
+            }
         }
     }
 
@@ -241,7 +244,8 @@ class TxConfirmationsView @JvmOverloads constructor(
             EXECUTE_WAITING,
             EXECUTE_READY,
             EXECUTE_DONE,
-            REJECTION_CREATED
+            REJECTION_CREATED,
+            PENDING
         }
 
         private val binding by lazy { ViewTxConfirmationsExecutionStepBinding.inflate(LayoutInflater.from(context), this) }
@@ -297,6 +301,11 @@ class TxConfirmationsView @JvmOverloads constructor(
                         stepTitle.text = resources.getString(R.string.tx_confirmations_rejection_created)
                         stepTitle.setTextColor(ContextCompat.getColor(context, R.color.error))
                     }
+                    Type.PENDING -> {
+                        stepIcon.setImageResource(R.drawable.ic_tx_confirmations_execute_ready_16dp)
+                        stepTitle.text = resources.getString(R.string.tx_confirmations_pending)
+                        stepTitle.setTextColor(ContextCompat.getColor(context, R.color.primary))
+                    }
                 }
             }
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -466,6 +466,7 @@
     <string name="tx_confirmations_execute_waiting">Execute (%1$d more confirmation needed)</string>
     <string name="tx_confirmations_executed">Executed</string>
     <string name="tx_confirmations_rejection_created">On-chain rejection created</string>
+    <string name="tx_confirmations_pending">Pending</string>
 
     <string name="signing_owner_add_key">Add owner key</string>
     <string name="signing_owner_import_existing_title">Import existing owner key</string>

diff --git a/data/build.gradle b/data/build.gradle
@@ -38,7 +38,7 @@ android {
     buildTypes {
 
         debug {
-            buildConfigField ("String", "CLIENT_GATEWAY_URL", '"https://safe-client-nest.staging.5afe.dev/"')
+            buildConfigField ("String", "CLIENT_GATEWAY_URL", '"https://safe-client.staging.5afe.dev/"')
             buildConfigField (javaTypes.INT, "CHAIN_ID", "5")
             buildConfigField (javaTypes.STRING, "CHAIN_TEXT_COLOR", asString("#ffffff"))
             buildConfigField (javaTypes.STRING, "CHAIN_BACKGROUND_COLOR", asString("#4D99EB"))
@@ -49,7 +49,7 @@ android {
         }
 
         profile {
-            buildConfigField javaTypes.STRING, "CLIENT_GATEWAY_URL", asString(getKey("CLIENT_GATEWAY_URL", "https://safe-client-nest.staging.5afe.dev/"))
+            buildConfigField javaTypes.STRING, "CLIENT_GATEWAY_URL", asString(getKey("CLIENT_GATEWAY_URL", "https://safe-client.staging.5afe.dev/"))
             buildConfigField (javaTypes.INT, "CHAIN_ID", "5")
             buildConfigField (javaTypes.STRING, "CHAIN_TEXT_COLOR", asString("#ffffff"))
             buildConfigField (javaTypes.STRING, "CHAIN_BACKGROUND_COLOR", asString("#4D99EB"))
@@ -71,7 +71,7 @@ android {
         }
 
         internal {
-            buildConfigField javaTypes.STRING, "CLIENT_GATEWAY_URL", asString(getKey("CLIENT_GATEWAY_URL", "https://safe-client-nest.staging.5afe.dev/"))
+            buildConfigField javaTypes.STRING, "CLIENT_GATEWAY_URL", asString(getKey("CLIENT_GATEWAY_URL", "https://safe-client.staging.5afe.dev/"))
             buildConfigField (javaTypes.INT, "CHAIN_ID", "5")
             buildConfigField (javaTypes.STRING, "CHAIN_TEXT_COLOR", asString("#ffffff"))
             buildConfigField (javaTypes.STRING, "CHAIN_BACKGROUND_COLOR", asString("#4D99EB"))

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")