- Navigate back on Loading screen when phone signer fails

- Hide keyboard when the scanner reads a qr - Add 1 sec delay before calling checkHasAdmin
stakwork · Sep 25, 2023 · 04ff760 · 04ff760
1 parent 186db84
commit 04ff760
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/...ity/features/signer-manager/src/main/java/chat/sphinx/signer_manager/SignerManagerImpl.kt b/...ity/features/signer-manager/src/main/java/chat/sphinx/signer_manager/SignerManagerImpl.kt
@@ -27,6 +27,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.eclipse.paho.client.mqttv3.*
@@ -702,6 +703,7 @@ class SignerManagerImpl(
                     when (loadResponse) {
                         is LoadResponse.Loading -> {}
                         is Response.Error -> {
+                            delay(1000L)
                             checkHasAdmin(checkAdminCallback)
                         }
 

diff --git a/...rd/onboard-connect/src/main/java/chat/sphinx/onboard_connect/ui/OnBoardConnectFragment.kt b/...rd/onboard-connect/src/main/java/chat/sphinx/onboard_connect/ui/OnBoardConnectFragment.kt
@@ -181,7 +181,9 @@ internal class OnBoardConnectFragment: SideEffectFragment<
 
     override suspend fun onSideEffectCollect(sideEffect: OnBoardConnectSideEffect) {
         if (sideEffect is OnBoardConnectSideEffect.FromScanner) {
-            binding.editTextCodeInput.setText(sideEffect.value.value)
+            val editTextCodeInput = binding.editTextCodeInput
+            editTextCodeInput.setText(sideEffect.value.value)
+            hideKeyboardFrom(editTextCodeInput.context, editTextCodeInput)
         } else {
             sideEffect.execute(binding.root.context)
         }

diff --git a/...d/onboard-connect/src/main/java/chat/sphinx/onboard_connect/ui/OnBoardConnectViewModel.kt b/...d/onboard-connect/src/main/java/chat/sphinx/onboard_connect/ui/OnBoardConnectViewModel.kt
@@ -394,6 +394,7 @@ internal class OnBoardConnectViewModel @Inject constructor(
                     app.getString(R.string.phone_signer_error)
                 )
             )
+            mnemonicDialogViewStateContainer.updateViewState(MnemonicDialogViewState.Idle)
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -394,6 +394,7 @@ internal class OnBoardConnectViewModel @Inject constructor( @@
                         app.getString(R.string.phone_signer_error)
                     )
                 )
+                mnemonicDialogViewStateContainer.updateViewState(MnemonicDialogViewState.Idle)
             }
         }
@@ Expand Down @@