From 87ba7498ec32d0c39cf6757202045779c41fee21 Mon Sep 17 00:00:00 2001
From: Rafael <rafaelekol@gmail.com>
Date: Wed, 7 Feb 2024 15:31:40 +0600
Subject: [PATCH] Remove some alerts from Receive page

---
 .../depositcex/DepositAddressViewModel.kt        | 15 +++++----------
 .../bankwallet/modules/receive/ReceiveModule.kt  |  2 +-
 .../modules/receive/ui/ReceiveAddressScreen.kt   |  4 +++-
 .../viewmodels/ReceiveAddressViewModel.kt        | 16 ++++++----------
 app/src/main/res/values-pt-rBR/strings.xml       |  1 -
 app/src/main/res/values/strings.xml              |  1 -
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/depositcex/DepositAddressViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/depositcex/DepositAddressViewModel.kt
index 8ffb08ad403..a4fda7a06d1 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/depositcex/DepositAddressViewModel.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/depositcex/DepositAddressViewModel.kt
@@ -113,16 +113,11 @@ class DepositAddressViewModel(
         return items
     }
 
-    private fun getAlertText(hasMemo: Boolean): ReceiveModule.AlertText {
-        return when {
-            hasMemo -> ReceiveModule.AlertText.Critical(
-                Translator.getString(R.string.Balance_Receive_AddressMemoAlert)
-            )
-
-            else -> ReceiveModule.AlertText.Normal(
-                Translator.getString(R.string.Balance_Receive_AddressAlert)
-            )
-        }
+    private fun getAlertText(hasMemo: Boolean): ReceiveModule.AlertText? {
+        return if (hasMemo) ReceiveModule.AlertText.Critical(
+            Translator.getString(R.string.Balance_Receive_AddressMemoAlert)
+        )
+        else null
     }
 
     fun onErrorClick() {
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt
index 77fab4f6d10..a8227253dd4 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ReceiveModule.kt
@@ -34,7 +34,7 @@ object ReceiveModule {
         val watchAccount: Boolean,
         val additionalItems: List<AdditionalData>,
         val amount: BigDecimal?,
-        val alertText: AlertText,
+        val alertText: AlertText?,
     )
 
     sealed class AlertText {
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ui/ReceiveAddressScreen.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ui/ReceiveAddressScreen.kt
index e69f61ccc4c..d3608c69411 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ui/ReceiveAddressScreen.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/ui/ReceiveAddressScreen.kt
@@ -168,7 +168,9 @@ fun ReceiveAddressScreen(
                                     horizontalAlignment = Alignment.CenterHorizontally,
                                 ) {
                                     VSpacer(12.dp)
-                                    WarningTextView(uiState.alertText)
+                                    uiState.alertText?.let {
+                                        WarningTextView(it)
+                                    }
                                     VSpacer(12.dp)
                                     Column(
                                         modifier = Modifier
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt
index 1912ddb9b72..9ffa8919fa9 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/receive/viewmodels/ReceiveAddressViewModel.kt
@@ -38,7 +38,7 @@ class ReceiveAddressViewModel(
     private var networkName = ""
     private var mainNet = true
     private var watchAccount = wallet.account.isWatchAccount
-    private var alertText: ReceiveModule.AlertText = getAlertText(watchAccount)
+    private var alertText: ReceiveModule.AlertText? = getAlertText(watchAccount)
 
     var uiState by mutableStateOf(
         ReceiveModule.UiState(
@@ -90,15 +90,11 @@ class ReceiveAddressViewModel(
         syncState()
     }
 
-    private fun getAlertText(watchAccount: Boolean): ReceiveModule.AlertText {
-        return when {
-            watchAccount -> ReceiveModule.AlertText.Normal(
-                Translator.getString(R.string.Balance_Receive_WatchAddressAlert)
-            )
-            else -> ReceiveModule.AlertText.Normal(
-                Translator.getString(R.string.Balance_Receive_AddressAlert)
-            )
-        }
+    private fun getAlertText(watchAccount: Boolean): ReceiveModule.AlertText? {
+        return if (watchAccount) ReceiveModule.AlertText.Normal(
+            Translator.getString(R.string.Balance_Receive_WatchAddressAlert)
+        )
+        else null
     }
 
     private fun setData() {
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index f1691b6d9e3..8a3db52515a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -317,7 +317,6 @@
     <string name="Balance_Receive_Memo">Memo (Tag)</string>
     <string name="Balance_Error_InvalidQrCode">Impossível Reconhecer</string>
     <string name="Balance_Receive_WatchAddressAlert">Esse endereço é o endereço da conta observada. Envie apenas tokens compatíveis com a rede.</string>
-    <string name="Balance_Receive_AddressAlert">Apenas tokens compatíveis com a rede. Outros serão perdidos.</string>
     <string name="Balance_Receive_AddressMemoAlert">Forneça o Memo necessário (Tag) e envie apenas tokens compatíveis com a rede. Outros serão perdidos.</string>
     <!--Send NFT-->
     <string name="SendNft_Title">Enviar</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be4b0e25946..1ad7a448b62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -385,7 +385,6 @@
     <string name="Balance_Receive_Memo">Memo (Tag)</string>
     <string name="Balance_Error_InvalidQrCode">Can\'t recognize</string>
     <string name="Balance_Receive_WatchAddressAlert">This address is the address of the watched account. Send only network-compatible tokens.</string>
-    <string name="Balance_Receive_AddressAlert">Network-compatible tokens only. Others will be lost.</string>
     <string name="Balance_Receive_AddressMemoAlert">Provide required Memo (Tag) and send only network-compatible tokens. Others will be lost.</string>
     <string name="Balance_Receive_UsedAddresses">Used Addresses</string>
     <string name="Balance_Receive_UsedAddressesDescriptoin">%s addresses change for privacy and security. Below a list of used addresses in this wallet.</string>