Skip to content
Snippets Groups Projects
Commit 2110a77c authored by Kamal Bramwell's avatar Kamal Bramwell
Browse files

Added "retry" UI for sent & failed "reset" requests

Requests that are sent due to restoring an account didn't have a retry option
parent b95ffc93
No related branches found
No related tags found
2 merge requests!86FE-1053 Change retry behavior,!85Draft: FE-990: Added "retry" UI for sent & failed "reset" requests
...@@ -381,7 +381,7 @@ class RequestsViewModel @Inject constructor( ...@@ -381,7 +381,7 @@ class RequestsViewModel @Inject constructor(
when (request.request.requestStatus) { when (request.request.requestStatus) {
RECEIVED -> retryVerification(request).also { actionQueue.remove(request.id) } RECEIVED -> retryVerification(request).also { actionQueue.remove(request.id) }
VERIFYING -> showVerifyingInfo().also { actionQueue.remove(request.id) } VERIFYING -> showVerifyingInfo().also { actionQueue.remove(request.id) }
SEND_FAIL, SENT -> resendRequest(request) RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> resendRequest(request)
VERIFICATION_FAIL -> retryVerification(request) VERIFICATION_FAIL -> retryVerification(request)
} }
} }
......
...@@ -25,7 +25,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { ...@@ -25,7 +25,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail {
when (request.requestStatus) { when (request.requestStatus) {
VERIFYING -> appContext().getString(R.string.request_item_action_verifying) VERIFYING -> appContext().getString(R.string.request_item_action_verifying)
VERIFICATION_FAIL -> appContext().getString(R.string.request_item_action_failed_verification) VERIFICATION_FAIL -> appContext().getString(R.string.request_item_action_failed_verification)
SEND_FAIL, SENT -> appContext().getString(R.string.request_item_action_retry) RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> appContext().getString(R.string.request_item_action_retry)
RESENT -> appContext().getString(R.string.request_item_action_resent) RESENT -> appContext().getString(R.string.request_item_action_resent)
else -> null else -> null
} }
...@@ -33,7 +33,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { ...@@ -33,7 +33,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail {
open val actionIcon: Int? = open val actionIcon: Int? =
when (request.requestStatus) { when (request.requestStatus) {
VERIFICATION_FAIL -> R.drawable.ic_info_outline_24dp VERIFICATION_FAIL -> R.drawable.ic_info_outline_24dp
SEND_FAIL, SENT -> R.drawable.ic_retry RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> R.drawable.ic_retry
RESENT -> R.drawable.ic_check_green RESENT -> R.drawable.ic_check_green
else -> null else -> null
} }
...@@ -41,7 +41,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { ...@@ -41,7 +41,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail {
open val actionIconColor: Int? = open val actionIconColor: Int? =
when (request.requestStatus) { when (request.requestStatus) {
VERIFICATION_FAIL -> R.color.accent_danger VERIFICATION_FAIL -> R.color.accent_danger
SEND_FAIL, SENT-> R.color.brand_default RESET_FAIL, RESET_SENT, SEND_FAIL, SENT-> R.color.brand_default
RESENT -> R.color.accent_success RESENT -> R.color.accent_success
else -> null else -> null
} }
...@@ -51,7 +51,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail { ...@@ -51,7 +51,7 @@ sealed class RequestItem(val request: Request) : ItemThumbnail {
when (request.requestStatus) { when (request.requestStatus) {
VERIFYING -> R.style.request_item_verifying VERIFYING -> R.style.request_item_verifying
VERIFICATION_FAIL -> R.style.request_item_error VERIFICATION_FAIL -> R.style.request_item_error
SEND_FAIL, SENT -> R.style.request_item_retry RESET_FAIL, RESET_SENT, SEND_FAIL, SENT -> R.style.request_item_retry
RESENT -> R.style.request_item_resent RESENT -> R.style.request_item_resent
else -> null else -> null
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment