Hide the Block Explorer feature behind the new isBlockExplorerEnabled…

… flag
tari-project · Feb 26, 2024 · e761808 · e761808
1 parent 4cd0f8c
commit e761808
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/app/src/main/java/com/tari/android/wallet/ui/common/recyclerView/CommonAdapter.kt b/app/src/main/java/com/tari/android/wallet/ui/common/recyclerView/CommonAdapter.kt
@@ -11,7 +11,7 @@ abstract class CommonAdapter<T : CommonViewHolderItem> : ListAdapter<T, CommonVi
 
     abstract var viewHolderBuilders: List<ViewHolderBuilder>
 
-    fun update(newItems: MutableList<T>) {
+    fun update(newItems: List<T>) {
         submitList(newItems.toList())
     }
 

diff --git a/...ain/java/com/tari/android/wallet/ui/fragment/settings/allSettings/AllSettingsViewModel.kt b/...ain/java/com/tari/android/wallet/ui/fragment/settings/allSettings/AllSettingsViewModel.kt
@@ -20,6 +20,7 @@ import com.tari.android.wallet.R.drawable.vector_all_settings_screen_recording_i
 import com.tari.android.wallet.R.drawable.vector_all_settings_select_base_node_icon
 import com.tari.android.wallet.R.drawable.vector_all_settings_select_network_icon
 import com.tari.android.wallet.R.drawable.vector_all_settings_select_theme_icon
+import com.tari.android.wallet.R.drawable.vector_all_settings_block_explorer_icon
 import com.tari.android.wallet.R.drawable.vector_all_settings_user_agreement_icon
 import com.tari.android.wallet.R.drawable.vector_all_settings_visit_tari_icon
 import com.tari.android.wallet.R.drawable.vector_all_settings_yat_icon
@@ -30,6 +31,7 @@ import com.tari.android.wallet.R.string.all_settings_biometrics
 import com.tari.android.wallet.R.string.all_settings_bluetooth_settings
 import com.tari.android.wallet.R.string.all_settings_bridge_configuration
 import com.tari.android.wallet.R.string.all_settings_connect_yats
+import com.tari.android.wallet.R.string.explorer_url
 import com.tari.android.wallet.R.string.all_settings_contribute
 import com.tari.android.wallet.R.string.all_settings_create_pin_code
 import com.tari.android.wallet.R.string.all_settings_data_collection
@@ -41,6 +43,7 @@ import com.tari.android.wallet.R.string.all_settings_report_a_bug
 import com.tari.android.wallet.R.string.all_settings_secondary_settings_label
 import com.tari.android.wallet.R.string.all_settings_security_label
 import com.tari.android.wallet.R.string.all_settings_select_base_node
+import com.tari.android.wallet.R.string.all_settings_explorer
 import com.tari.android.wallet.R.string.all_settings_select_network
 import com.tari.android.wallet.R.string.all_settings_select_theme
 import com.tari.android.wallet.R.string.all_settings_store
@@ -86,6 +89,7 @@ import com.tari.android.wallet.ui.fragment.settings.allSettings.title.SettingsTi
 import com.tari.android.wallet.ui.fragment.settings.allSettings.version.SettingsVersionViewHolderItem
 import com.tari.android.wallet.ui.fragment.settings.backup.data.BackupSettingsRepository
 import com.tari.android.wallet.ui.fragment.settings.userAutorization.BiometricAuthenticationViewModel
+import com.tari.android.wallet.util.DebugConfig
 import com.tari.android.wallet.yat.YatAdapter
 import com.tari.android.wallet.yat.YatSharedRepository
 import javax.inject.Inject
@@ -116,8 +120,8 @@ class AllSettingsViewModel : CommonViewModel() {
     private val _openYatOnboarding = SingleLiveEvent<Unit>()
     val openYatOnboarding: LiveData<Unit> = _openYatOnboarding
 
-    private val _allSettingsOptions = MutableLiveData<MutableList<CommonViewHolderItem>>()
-    val allSettingsOptions: LiveData<MutableList<CommonViewHolderItem>> = _allSettingsOptions
+    private val _allSettingsOptions = MutableLiveData<List<CommonViewHolderItem>>()
+    val allSettingsOptions: LiveData<List<CommonViewHolderItem>> = _allSettingsOptions
 
     init {
         component.inject(this)
@@ -141,7 +145,7 @@ class AllSettingsViewModel : CommonViewModel() {
         val alias = settingsRepository.name.orEmpty() + " " + settingsRepository.surname.orEmpty()
         val pinCode = securityPrefRepository.pinCode
 
-        val allOptions = mutableListOf(
+        _allSettingsOptions.postValue(listOfNotNull(
             MyProfileViewHolderItem(settingsRepository.emojiId.orEmpty(), yatSharedPrefsRepository.connectedYat.orEmpty(), alias) {
                 navigation.postValue(AllSettingsNavigation.ToMyProfile)
             },
@@ -208,9 +212,9 @@ class AllSettingsViewModel : CommonViewModel() {
                 _openLink.postValue(resourceManager.getString(disclaimer_url))
             },
             DividerViewHolderItem(),
-//            ButtonViewDto(resourceManager.getString(all_settings_explorer), vector_all_settings_block_explorer_icon) {
-//                _openLink.postValue(resourceManager.getString(explorer_url))
-//            },
+            SettingsRowViewDto(resourceManager.getString(all_settings_explorer), vector_all_settings_block_explorer_icon) {
+                _openLink.postValue(resourceManager.getString(explorer_url))
+            }.takeIf { DebugConfig.isBlockExplorerEnabled },
             SettingsTitleViewHolderItem(resourceManager.getString(all_settings_advanced_settings_label)),
             SettingsRowViewDto(resourceManager.getString(all_settings_select_theme), vector_all_settings_select_theme_icon) {
                 navigation.postValue(AllSettingsNavigation.ToThemeSelection)
@@ -251,9 +255,8 @@ class AllSettingsViewModel : CommonViewModel() {
                 style = SettingsRowStyle.Warning,
             ) { navigation.postValue(AllSettingsNavigation.ToDeleteWallet) },
             DividerViewHolderItem(),
-            SettingsVersionViewHolderItem(versionText) { _copyToClipboard.postValue(versionArgs) }
+            SettingsVersionViewHolderItem(versionText) { _copyToClipboard.postValue(versionArgs) })
         )
-        _allSettingsOptions.postValue(allOptions)
     }
 
     private fun onBackupStateChanged(backupState: BackupsState?) {

diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/details/TxDetailsFragment.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/details/TxDetailsFragment.kt
@@ -107,6 +107,7 @@ import com.tari.android.wallet.ui.fragment.contact_book.data.contacts.ContactDto
 import com.tari.android.wallet.ui.fragment.tx.details.gif.GIFView
 import com.tari.android.wallet.ui.fragment.tx.details.gif.GIFViewModel
 import com.tari.android.wallet.ui.fragment.tx.details.gif.TxState
+import com.tari.android.wallet.util.DebugConfig
 import com.tari.android.wallet.util.WalletUtil
 import java.util.Date
 
@@ -161,7 +162,11 @@ class TxDetailsFragment : CommonFragment<FragmentTxDetailsBinding, TxDetailsView
 
         observe(cancellationReason) { setCancellationReason(it) }
 
-        observe(explorerLink) { showExplorerLink(it) }
+        observe(explorerLink) { link ->
+            if (DebugConfig.isBlockExplorerEnabled) {
+                showExplorerLink(link)
+            }
+        }
     }
 
     private fun updateContactInfo(contact: ContactDto) {

diff --git a/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt b/app/src/main/java/com/tari/android/wallet/util/DebugConfig.kt
@@ -49,6 +49,8 @@ object DebugConfig {
     private const val _useYatSandbox = false
     val yatEnvironment = if (_useYatSandbox && isDebug()) YatEnvironment.SANDBOX else YatEnvironment.PRODUCTION
 
+    val isBlockExplorerEnabled = false
+
     private fun isDebug() = BuildConfig.BUILD_TYPE == "debug"
 }
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -11,8 +11,8 @@
     <string name="user_agreement_url">https://www.tari.com/user_agreement/</string>
     <string name="privacy_policy_url">https://www.tari.com/privacy_policy/</string>
     <string name="disclaimer_url">https://www.tari.com/disclaimer/</string>
-    <string name="explorer_url">https://explore-esme.tari.com/</string>
-    <string name="explorer_kernel_url">https://explore-esme.tari.com/kernel/</string>
+    <string name="explorer_url">https://explore.tari.com/</string>
+    <string name="explorer_kernel_url">https://explore.tari.com/kernel/</string>
     <string name="tor_bridges_url">https://bridges.torproject.org/bridges</string>
     <string name="tari_lab_university_url" translatable="false">https://tlu.tarilabs.com/</string>