PERA-1159 :: Handle account selection automatically in ARC-78 flow (#101

)
perawallet · Jan 10, 2025 · 8f3bfed · 8f3bfed
1 parent 59bac46
commit 8f3bfed
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 222 deletions.
diff --git a/app/src/main/java/com/algorand/android/MainActivity.kt b/app/src/main/java/com/algorand/android/MainActivity.kt
@@ -363,7 +363,11 @@ class MainActivity :
                     xnote = deepLink.xnote
                 )
 
-                nav(HomeNavigationDirections.actionGlobalConfirmKeyRegAccountSelectionFragment(txnDetail))
+                if (qrScannerViewModel.hasAccountAuthority(deepLink.senderAddress)) {
+                    nav(HomeNavigationDirections.actionGlobalKeyRegTransactionFragment(txnDetail))
+                } else {
+                    showGlobalError(getString(R.string.you_dont_have_any, deepLink.senderAddress), tag = activityTag)
+                }
             }
         }
     }

diff --git a/app/src/main/java/com/algorand/android/MainViewModel.kt b/app/src/main/java/com/algorand/android/MainViewModel.kt
@@ -25,6 +25,7 @@ import com.algorand.android.models.AssetOperationResult
 import com.algorand.android.models.Node
 import com.algorand.android.models.SignedTransactionDetail
 import com.algorand.android.models.TransactionData
+import com.algorand.android.modules.accountstatehelper.domain.usecase.AccountStateHelperUseCase
 import com.algorand.android.modules.appopencount.domain.usecase.IncreaseAppOpeningCountUseCase
 import com.algorand.android.modules.autolockmanager.ui.usecase.AutoLockManagerUseCase
 import com.algorand.android.modules.deeplink.ui.DeeplinkHandler
@@ -36,7 +37,6 @@ import com.algorand.android.network.IndexerInterceptor
 import com.algorand.android.network.MobileHeaderInterceptor
 import com.algorand.android.repository.NodeRepository
 import com.algorand.android.usecase.AccountCacheStatusUseCase
-import com.algorand.android.usecase.AccountDetailUseCase
 import com.algorand.android.usecase.SendSignedTransactionUseCase
 import com.algorand.android.utils.AccountCacheManager
 import com.algorand.android.utils.AssetName
@@ -75,11 +75,11 @@ class MainViewModel @Inject constructor(
     private val tutorialUseCase: TutorialUseCase,
     private val swapNavigationDestinationHelper: SwapNavigationDestinationHelper,
     private val sendSignedTransactionUseCase: SendSignedTransactionUseCase,
-    private val accountDetailUseCase: AccountDetailUseCase,
     private val accountDetailCacheManager: AccountDetailCacheManager,
     private val nodeRepository: NodeRepository,
     accountCacheStatusUseCase: AccountCacheStatusUseCase,
-    private val autoLockManagerUseCase: AutoLockManagerUseCase
+    private val autoLockManagerUseCase: AutoLockManagerUseCase,
+    private val accountStateHelperUseCase: AccountStateHelperUseCase
 ) : BaseViewModel() {
 
     // TODO: Replace this with Flow whenever have time
@@ -295,4 +295,8 @@ class MainViewModel @Inject constructor(
             }
         }
     }
+
+    fun hasAccountAuthority(accountAddress: String): Boolean {
+        return accountStateHelperUseCase.hasAccountAuthority(accountAddress)
+    }
 }
diff --git a/...om/algorand/android/modules/keyreg/domain/usecase/KeyRegAccountSelectionPreviewUseCase.kt b/...om/algorand/android/modules/keyreg/domain/usecase/KeyRegAccountSelectionPreviewUseCase.kt
diff --git a/app/src/main/java/com/algorand/android/modules/keyreg/ui/KeyRegAccountSelectionFragment.kt b/app/src/main/java/com/algorand/android/modules/keyreg/ui/KeyRegAccountSelectionFragment.kt
diff --git a/app/src/main/java/com/algorand/android/modules/keyreg/ui/KeyRegAccountSelectionViewModel.kt b/app/src/main/java/com/algorand/android/modules/keyreg/ui/KeyRegAccountSelectionViewModel.kt
diff --git a/app/src/main/java/com/algorand/android/modules/keyreg/ui/KeyRegTransactionViewModel.kt b/app/src/main/java/com/algorand/android/modules/keyreg/ui/KeyRegTransactionViewModel.kt
@@ -39,9 +39,6 @@ class KeyRegTransactionViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle
 ) : ViewModel() {
 
-    private var signingAccountAddress = savedStateHandle.getOrThrow<String>(
-        SIGNING_ACCOUNT_ADDRSS
-    )
     private var keyRegTransactionDetail = savedStateHandle.getOrThrow<KeyRegTransactionDetail>(
         KEY_REG_DETAIL
     )
@@ -55,7 +52,7 @@ class KeyRegTransactionViewModel @Inject constructor(
         get() = _previewState.asStateFlow()
 
     fun initUi() {
-        _previewState.value = previewMapper.createInitialPreview(keyRegTransactionDetail, signingAccountAddress)
+        _previewState.value = previewMapper.createInitialPreview(keyRegTransactionDetail)
     }
 
     fun confirmTransaction() {
@@ -97,7 +94,6 @@ class KeyRegTransactionViewModel @Inject constructor(
     }
 
     companion object {
-        const val SIGNING_ACCOUNT_ADDRSS = "signingAccountAddress"
         const val KEY_REG_DETAIL = "keyRegTransactionDetail"
         const val TAG = "KeyRegTransactionViewModel"
         const val TRANSACTION_ERROR = "transaction_error"

diff --git a/app/src/main/java/com/algorand/android/modules/keyreg/ui/components/KeyRegTable.kt b/app/src/main/java/com/algorand/android/modules/keyreg/ui/components/KeyRegTable.kt
@@ -63,7 +63,6 @@ fun keyRegTable(
             "Last Valid Round" to keyRegTransactionDetail.lastValid,
             "xNote" to keyRegTransactionDetail.xNote,
             "Note" to keyRegTransactionDetail.note,
-            "Signing Address" to keyRegTransactionDetail.signingAddress,
         )
 
         val fabHeight by remember {

diff --git a/...main/java/com/algorand/android/modules/keyreg/ui/mapper/KeyRegTransactionPreviewMapper.kt b/...main/java/com/algorand/android/modules/keyreg/ui/mapper/KeyRegTransactionPreviewMapper.kt
@@ -20,7 +20,6 @@ class KeyRegTransactionPreviewMapper @Inject constructor() {
 
     fun createInitialPreview(
         detail: KeyRegTransactionDetail,
-        signingAddress: String
     ): KeyRegTransactionPreview {
         return KeyRegTransactionPreview(
             isLoadingVisible = false,
@@ -35,7 +34,6 @@ class KeyRegTransactionPreviewMapper @Inject constructor() {
             lastValid = detail.voteLastRound.orEmpty(),
             xNote = detail.xnote,
             note = detail.note,
-            signingAddress = signingAddress,
             signTransactionEvent = null,
             showErrorEvent = null
         )

diff --git a/app/src/main/java/com/algorand/android/modules/keyreg/ui/model/KeyRegTransactionPreview.kt b/app/src/main/java/com/algorand/android/modules/keyreg/ui/model/KeyRegTransactionPreview.kt
@@ -29,7 +29,6 @@ data class KeyRegTransactionPreview(
     val lastValid: String,
     val xNote: String?,
     val note: String?,
-    val signingAddress: String,
     val signTransactionEvent: Event<KeyRegTransaction>?,
     val showErrorEvent: Event<Unit>?
 )
diff --git a/app/src/main/java/com/algorand/android/modules/qrscanning/BaseQrScannerFragment.kt b/app/src/main/java/com/algorand/android/modules/qrscanning/BaseQrScannerFragment.kt
@@ -205,8 +205,11 @@ abstract class BaseQrScannerFragment(
             xnote = deepLink.xnote
         )
 
-        nav(HomeNavigationDirections.actionGlobalConfirmKeyRegAccountSelectionFragment(txnDetail))
-
+        if (qrScannerViewModel.hasAccountAuthority(deepLink.senderAddress)) {
+            nav(HomeNavigationDirections.actionGlobalKeyRegTransactionFragment(txnDetail))
+        } else {
+            showGlobalError(getString(R.string.you_dont_have_any, deepLink.senderAddress))
+        }
         return true
     }
 

diff --git a/app/src/main/java/com/algorand/android/modules/qrscanning/QrScannerViewModel.kt b/app/src/main/java/com/algorand/android/modules/qrscanning/QrScannerViewModel.kt
@@ -14,6 +14,7 @@ package com.algorand.android.modules.qrscanning
 
 import androidx.lifecycle.viewModelScope
 import com.algorand.android.core.BaseViewModel
+import com.algorand.android.modules.accountstatehelper.domain.usecase.AccountStateHelperUseCase
 import com.algorand.android.modules.deeplink.ui.DeeplinkHandler
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -23,7 +24,8 @@ import kotlinx.coroutines.launch
 
 @HiltViewModel
 class QrScannerViewModel @Inject constructor(
-    private val deeplinkHandler: DeeplinkHandler
+    private val deeplinkHandler: DeeplinkHandler,
+    private val accountStateHelperUseCase: AccountStateHelperUseCase,
 ) : BaseViewModel() {
 
     private val _isQrCodeInProgressFlow = MutableSharedFlow<Boolean>()
@@ -46,4 +48,8 @@ class QrScannerViewModel @Inject constructor(
     fun removeDeeplinkHandlerListener() {
         deeplinkHandler.setListener(null)
     }
+
+    fun hasAccountAuthority(accountAddress: String): Boolean {
+        return accountStateHelperUseCase.hasAccountAuthority(accountAddress)
+    }
 }
diff --git a/app/src/main/java/com/algorand/android/usecase/GetLocalAccountsUseCase.kt b/app/src/main/java/com/algorand/android/usecase/GetLocalAccountsUseCase.kt
@@ -20,7 +20,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 
 class GetLocalAccountsUseCase @Inject constructor(
     private val accountManager: AccountManager,
-    private val accountDetailUseCase: AccountDetailUseCase,
     private val accountStateHelperUseCase: AccountStateHelperUseCase
 ) {
     fun getLocalAccountsFromAccountManagerCache(): List<Account> {

diff --git a/app/src/main/res/navigation/home_navigation.xml b/app/src/main/res/navigation/home_navigation.xml
@@ -323,12 +323,8 @@
     </action>
 
     <action
-        android:id="@+id/action_global_confirmKeyRegAccountSelectionFragment"
-        app:destination="@id/keyRegAccountSelectionFragment">
-        <argument
-            android:name="keyRegTransactionDetail"
-            app:argType="com.algorand.android.modules.keyreg.ui.model.KeyRegTransactionDetail" />
-    </action>
+        android:id="@+id/action_global_keyRegTransactionFragment"
+        app:destination="@id/keyRegTransactionFragment" />
 
     <action
         android:id="@+id/action_global_assetInboxOneAccountNavigation"
@@ -342,26 +338,6 @@
         android:id="@+id/action_global_accountDetailFragment"
         app:destination="@id/accountDetailFragment" />
 
-    <fragment
-        android:id="@+id/keyRegAccountSelectionFragment"
-        android:name="com.algorand.android.modules.keyreg.ui.KeyRegAccountSelectionFragment"
-        android:label="fragment_key_reg_account_selection"
-        tools:layout="@layout/fragment_base_account_selection">
-        <argument
-            android:name="keyRegTransactionDetail"
-            app:argType="com.algorand.android.modules.keyreg.ui.model.KeyRegTransactionDetail" />
-        <action
-            android:id="@+id/action_keyRegAccountSelectionFragment_to_keyRegTransactionFragment"
-            app:destination="@id/keyRegTransactionFragment">
-            <argument
-                android:name="keyRegTransactionDetail"
-                app:argType="com.algorand.android.modules.keyreg.ui.model.KeyRegTransactionDetail" />
-            <argument
-                android:name="signingAccountAddress"
-                app:argType="string" />
-        </action>
-    </fragment>
-
     <fragment
         android:id="@+id/keyRegTransactionFragment"
         android:name="com.algorand.android.modules.keyreg.ui.KeyRegTransactionFragment"
@@ -370,9 +346,6 @@
         <argument
             android:name="keyRegTransactionDetail"
             app:argType="com.algorand.android.modules.keyreg.ui.model.KeyRegTransactionDetail" />
-        <argument
-            android:name="signingAccountAddress"
-            app:argType="string" />
         <action
             android:id="@+id/action_KeyRegTransactionFragment_to_addNoteNavigation"
             app:destination="@id/addNoteNavigation">

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1434,4 +1434,6 @@
     <string name="pera_wallet_now_provides">Pera Wallet now provides an easy and fast way to stake with various dApps.</string>
     <string name="stake_in_pera">Stake in Pera</string>
 
+    <string name="you_dont_have_any">You don\'t have any authorized account matching with %1$s</string>
+
 </resources>