From 9fa370a528baeb75f3b5ad472537ce3418949b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20Ja=CC=88ckel?= Date: Thu, 31 Aug 2023 19:20:02 +0200 Subject: [PATCH] Added pending step --- .../transactions/details/view/TxConfirmationsView.kt | 11 ++++++++++- app/src/main/res/values/strings.xml | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) 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 index 6b2fb14a4..78d19d5fc 100644 --- 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 index 2406394f4..324f405c2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -466,6 +466,7 @@ Execute (%1$d more confirmation needed) Executed On-chain rejection created + Pending Add owner key Import existing owner key