Merge pull request #450 from code-payments/chore/create-account-error-updates

Chore/create account error updates

Author: bmc08gt

api/src/main/java/com/getcode/network/repository/TransactionRepository.kt

@@ -381,7 +381,7 @@ class TransactionRepository @Inject constructor(
                         serverMessageStream?.onCompleted()
                         subject.onError(
                             ErrorSubmitIntentException(
-                                ErrorSubmitIntent.fromValue(value.error.codeValue),
+                                ErrorSubmitIntent.invoke(value.error),
                             )
                         )
                     }
@@ -729,11 +729,11 @@ class TransactionRepository @Inject constructor(
         data object DeviceTokenUnavailable: ErrorSubmitIntent(-2)
 
         companion object {
-            operator fun invoke(proto: SubmitIntentResponse.Error): ErrorSubmitIntent? {
+            operator fun invoke(proto: SubmitIntentResponse.Error): ErrorSubmitIntent {
                 return when (proto.code) {
                     SubmitIntentResponse.Error.Code.DENIED -> {
                         val reasons = proto.errorDetailsList.mapNotNull {
-                            if (!it.hasIntentDenied()) return null
+                            if (!it.hasIntentDenied()) return@mapNotNull null
                             DeniedReason.fromValue(it.intentDenied.reasonValue)
                         }
 
@@ -743,14 +743,9 @@ class TransactionRepository @Inject constructor(
                     SubmitIntentResponse.Error.Code.SIGNATURE_ERROR -> SignatureError
                     SubmitIntentResponse.Error.Code.STALE_STATE -> StaleState
                     SubmitIntentResponse.Error.Code.UNRECOGNIZED -> Unknown
-                    else -> return null
+                    else -> return Unknown
                 }
             }
-
-            fun fromValue(value: Int): ErrorSubmitIntent {
-                return listOf(Denied(), InvalidIntent, SignatureError, StaleState)
-                    .firstOrNull { it.value == value } ?: Unknown
-            }
         }
     }
 

app/src/main/java/com/getcode/manager/AuthManager.kt

@@ -236,14 +236,14 @@ class AuthManager @Inject constructor(
             }
             .doOnSuccess {
                 taggedTrace("account data fetched successfully")
-                launch { savePrefs(phone!!, user!!) }
-                launch { exchange.fetchRatesIfNeeded() }
-                launch { historyController.fetchChats() }
                 if (!BuildConfig.DEBUG) {
                     if (Bugsnag.isStarted()) {
                         Bugsnag.setUser(null, phone?.phoneNumber, null)
                     }
                 }
+                launch { savePrefs(phone!!, user!!) }
+                launch { exchange.fetchRatesIfNeeded() }
+                launch { historyController.fetchChats() }
             }
     }
 

app/src/main/java/com/getcode/ui/components/SettingsRow.kt

@@ -25,8 +25,7 @@ fun SettingsRow(
     Row(
         modifier = modifier
             .rememberedClickable { onClick() }
-            .padding(horizontal = CodeTheme.dimens.grid.x3)
-            .padding(end = CodeTheme.dimens.grid.x3),
+            .padding(horizontal = CodeTheme.dimens.grid.x3),
         verticalAlignment = Alignment.CenterVertically
     ) {
         if (icon != null) {

app/src/main/java/com/getcode/view/login/BaseAccessKeyViewModel.kt

@@ -16,6 +16,7 @@ import com.getcode.manager.MnemonicManager
 import com.getcode.manager.SessionManager
 import com.getcode.manager.TopBarManager
 import com.getcode.network.repository.TransactionRepository
+import com.getcode.network.repository.TransactionRepository.DeniedReason
 import com.getcode.network.repository.decodeBase64
 import com.getcode.theme.R as themeR
 import com.getcode.theme.Brand
@@ -286,19 +287,18 @@ abstract class BaseAccessKeyViewModel(
             is TransactionRepository.ErrorSubmitIntentException -> {
                 when (val intent = e.errorSubmitIntent) {
                     is TransactionRepository.ErrorSubmitIntent.Denied -> {
-                        if (intent.reasons.isEmpty()) {
+                        if (intent.reasons.isEmpty() || intent.reasons.first() == DeniedReason.Unspecified) {
                             getSomethingWentWrongError()
                         } else {
                             val reason = intent.reasons.first()
                             when (reason) {
-                                TransactionRepository.DeniedReason.Unspecified -> getSomethingWentWrongError()
-                                TransactionRepository.DeniedReason.TooManyFreeAccountsForPhoneNumber -> getTooManyAccountsPerPhoneError()
-                                TransactionRepository.DeniedReason.TooManyFreeAccountsForDevice -> getTooManyAccountsPerDeviceError()
-                                TransactionRepository.DeniedReason.UnsupportedCountry -> getUnsupportedCountryError()
-                                TransactionRepository.DeniedReason.UnsupportedDevice -> getUnsupportedDeviceError()
+                                DeniedReason.Unspecified -> getSomethingWentWrongError()
+                                DeniedReason.TooManyFreeAccountsForPhoneNumber -> getTooManyAccountsPerPhoneError()
+                                DeniedReason.TooManyFreeAccountsForDevice -> getTooManyAccountsPerDeviceError()
+                                DeniedReason.UnsupportedCountry -> getUnsupportedCountryError()
+                                DeniedReason.UnsupportedDevice -> getUnsupportedDeviceError()
                             }
                         }
-                        getSomethingWentWrongError()
                     }
                     else -> getSomethingWentWrongError()
                 }