Merge pull request #1198 from radixdlt/fix/ABW-3788-dapp-details-cta

[ABW-3788] - Hide buttons on dapp details dialog when opened from tx review
radixdlt · Sep 16, 2024 · 4351a69 · 4351a69
2 parents c08c0a0 + 155b858
commit 4351a69
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 34 deletions.
diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/dialogs/dapp/DAppDetailsDialog.kt b/app/src/main/java/com/babylon/wallet/android/presentation/dialogs/dapp/DAppDetailsDialog.kt
@@ -99,6 +99,7 @@ private fun DAppDetailsDialogContent(
                 validatedWebsite = state.validatedWebsite,
                 personaList = state.authorizedPersonas,
                 isShowLockerDepositsChecked = state.isShowLockerDepositsChecked,
+                isReadOnly = state.isReadOnly,
                 onFungibleTokenClick = onFungibleClick,
                 onNonFungibleClick = onNonFungibleClick,
                 onDeleteDapp = {

diff --git a/...rc/main/java/com/babylon/wallet/android/presentation/dialogs/dapp/DAppDetailsDialogNav.kt b/...rc/main/java/com/babylon/wallet/android/presentation/dialogs/dapp/DAppDetailsDialogNav.kt
@@ -15,18 +15,22 @@ import rdx.works.core.domain.resources.Resource
 
 private const val ROUTE = "dApp_details_dialog"
 private const val ARG_DAPP_DEFINITION_ADDRESS = "dApp_definition_address"
+private const val ARG_READ_ONLY = "read_only"
 
 fun NavController.dAppDetailsDialog(
-    dAppDefinitionAddress: AccountAddress
+    dAppDefinitionAddress: AccountAddress,
+    isReadOnly: Boolean = false
 ) {
-    navigate(route = "$ROUTE/${dAppDefinitionAddress.string}")
+    navigate(route = "$ROUTE/${dAppDefinitionAddress.string}/$isReadOnly")
 }
 
 internal class DAppDetailsDialogArgs(
-    val dAppDefinitionAddress: AccountAddress
+    val dAppDefinitionAddress: AccountAddress,
+    val isReadOnly: Boolean
 ) {
     constructor(savedStateHandle: SavedStateHandle) : this(
-        dAppDefinitionAddress = AccountAddress.init(requireNotNull(savedStateHandle[ARG_DAPP_DEFINITION_ADDRESS]))
+        dAppDefinitionAddress = AccountAddress.init(requireNotNull(savedStateHandle[ARG_DAPP_DEFINITION_ADDRESS])),
+        isReadOnly = savedStateHandle[ARG_READ_ONLY] ?: false
     )
 }
 
@@ -36,10 +40,13 @@ fun NavGraphBuilder.dAppDetailsDialog(
     onDismiss: () -> Unit
 ) {
     dialog(
-        route = "$ROUTE/{$ARG_DAPP_DEFINITION_ADDRESS}",
+        route = "$ROUTE/{$ARG_DAPP_DEFINITION_ADDRESS}/{$ARG_READ_ONLY}",
         arguments = listOf(
             navArgument(ARG_DAPP_DEFINITION_ADDRESS) {
                 type = NavType.StringType
+            },
+            navArgument(ARG_READ_ONLY) {
+                type = NavType.BoolType
             }
         ),
         dialogProperties = DialogProperties(usePlatformDefaultWidth = false)

diff --git a/...n/java/com/babylon/wallet/android/presentation/dialogs/dapp/DAppDetailsDialogViewModel.kt b/...n/java/com/babylon/wallet/android/presentation/dialogs/dapp/DAppDetailsDialogViewModel.kt
@@ -43,7 +43,8 @@ class DAppDetailsDialogViewModel @Inject constructor(
     private lateinit var authorizedDapp: AuthorizedDapp
 
     override fun initialState(): State = State(
-        dAppDefinitionAddress = args.dAppDefinitionAddress
+        dAppDefinitionAddress = args.dAppDefinitionAddress,
+        isReadOnly = args.isReadOnly
     )
 
     init {
@@ -112,7 +113,8 @@ class DAppDetailsDialogViewModel @Inject constructor(
         val isWebsiteValidating: Boolean = false,
         val authorizedPersonas: ImmutableList<Persona> = persistentListOf(),
         val uiMessage: UiMessage? = null,
-        val isShowLockerDepositsChecked: Boolean = false
+        val isShowLockerDepositsChecked: Boolean = false,
+        val isReadOnly: Boolean = false
     ) : UiState
 
     sealed interface Event : OneOffEvent {

diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/navigation/NavigationHost.kt b/app/src/main/java/com/babylon/wallet/android/presentation/navigation/NavigationHost.kt
@@ -430,7 +430,10 @@ fun NavigationHost(
                 )
             },
             onDAppClick = { dApp ->
-                navController.dAppDetailsDialog(dAppDefinitionAddress = dApp.dAppAddress)
+                navController.dAppDetailsDialog(
+                    dAppDefinitionAddress = dApp.dAppAddress,
+                    isReadOnly = true
+                )
             },
             onInfoClick = { glossaryItem ->
                 navController.infoDialog(glossaryItem)

diff --git a/...babylon/wallet/android/presentation/settings/approveddapps/dappdetail/DappDetailScreen.kt b/...babylon/wallet/android/presentation/settings/approveddapps/dappdetail/DappDetailScreen.kt
@@ -213,6 +213,7 @@ private fun DappDetailContent(
                 validatedWebsite = state.validatedWebsite,
                 personaList = state.authorizedPersonas,
                 isShowLockerDepositsChecked = state.isShowLockerDepositsChecked,
+                isReadOnly = false,
                 onPersonaClick = { persona ->
                     onPersonaClick(persona)
                     scope.launch {

diff --git a/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/DappDetails.kt b/app/src/main/java/com/babylon/wallet/android/presentation/ui/composables/DappDetails.kt
@@ -42,6 +42,7 @@ fun DappDetails(
     validatedWebsite: String?,
     personaList: ImmutableList<Persona>,
     isShowLockerDepositsChecked: Boolean,
+    isReadOnly: Boolean,
     onPersonaClick: ((Persona) -> Unit)?,
     onFungibleTokenClick: (Resource.FungibleResource) -> Unit,
     onNonFungibleClick: (Resource.NonFungibleResource) -> Unit,
@@ -195,37 +196,39 @@ fun DappDetails(
                         Spacer(modifier = Modifier.height(spacerHeight))
                     }
                 }
-                item {
-                    Spacer(modifier = Modifier.height(dimensions.paddingLarge))
+                if (!isReadOnly) {
+                    item {
+                        Spacer(modifier = Modifier.height(dimensions.paddingLarge))
 
-                    SwitchSettingsItem(
-                        modifier = Modifier
-                            .background(RadixTheme.colors.defaultBackground)
-                            .fillMaxWidth()
-                            .padding(horizontal = dimensions.paddingDefault),
-                        titleRes = R.string.authorizedDapps_dAppDetails_depositsTitle,
-                        subtitleRes = R.string.authorizedDapps_dAppDetails_depositsHidden,
-                        icon = null,
-                        subtitleTextColor = RadixTheme.colors.gray2,
-                        checked = isShowLockerDepositsChecked,
-                        onCheckedChange = onShowLockerDepositsCheckedChange
-                    )
+                        SwitchSettingsItem(
+                            modifier = Modifier
+                                .background(RadixTheme.colors.defaultBackground)
+                                .fillMaxWidth()
+                                .padding(horizontal = dimensions.paddingDefault),
+                            titleRes = R.string.authorizedDapps_dAppDetails_depositsTitle,
+                            subtitleRes = R.string.authorizedDapps_dAppDetails_depositsHidden,
+                            icon = null,
+                            subtitleTextColor = RadixTheme.colors.gray2,
+                            checked = isShowLockerDepositsChecked,
+                            onCheckedChange = onShowLockerDepositsCheckedChange
+                        )
 
-                    Spacer(modifier = Modifier.height(dimensions.paddingLarge))
+                        Spacer(modifier = Modifier.height(dimensions.paddingLarge))
 
-                    HorizontalDivider(
-                        color = RadixTheme.colors.gray4,
-                        modifier = Modifier.padding(horizontal = dimensions.paddingDefault)
-                    )
+                        HorizontalDivider(
+                            color = RadixTheme.colors.gray4,
+                            modifier = Modifier.padding(horizontal = dimensions.paddingDefault)
+                        )
 
-                    Spacer(modifier = Modifier.height(dimensions.paddingLarge))
+                        Spacer(modifier = Modifier.height(dimensions.paddingLarge))
 
-                    WarningButton(
-                        modifier = Modifier
-                            .padding(horizontal = dimensions.paddingDefault),
-                        text = stringResource(R.string.authorizedDapps_dAppDetails_forgetDapp),
-                        onClick = onDeleteDapp
-                    )
+                        WarningButton(
+                            modifier = Modifier
+                                .padding(horizontal = dimensions.paddingDefault),
+                            text = stringResource(R.string.authorizedDapps_dAppDetails_forgetDapp),
+                            onClick = onDeleteDapp
+                        )
+                    }
                 }
             }
         }