From b99b872349d7078040ac749bd5f62c41e3be21fd Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 16 Jun 2022 20:31:20 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- app/src/main/res/drawable/ic_scan_card_24.xml | 10 ---------- app/src/main/res/drawable/ic_wallet_24.xml | 10 ++++++++++ app/src/main/res/layout/fragment_wallet.xml | 5 +++-- app/src/main/res/menu/wallet.xml | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_scan_card_24.xml create mode 100644 app/src/main/res/drawable/ic_wallet_24.xml diff --git a/app/src/main/res/drawable/ic_scan_card_24.xml b/app/src/main/res/drawable/ic_scan_card_24.xml deleted file mode 100644 index b77d547233..0000000000 --- a/app/src/main/res/drawable/ic_scan_card_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_wallet_24.xml b/app/src/main/res/drawable/ic_wallet_24.xml new file mode 100644 index 0000000000..b1c1514913 --- /dev/null +++ b/app/src/main/res/drawable/ic_wallet_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 3b962facaf..faf0d33f9f 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -22,8 +22,9 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:menu="@menu/wallet" - app:navigationIcon="@drawable/ic_scan_card_24" - app:navigationIconTint="@color/iconGray" + app:navigationIcon="@drawable/ic_wallet_24" + app:navigationIconTint="@color/darkGray6" + app:titleCentered="true" app:title="@string/wallet_title" /> diff --git a/app/src/main/res/menu/wallet.xml b/app/src/main/res/menu/wallet.xml index 7f6107b331..edd88afb93 100644 --- a/app/src/main/res/menu/wallet.xml +++ b/app/src/main/res/menu/wallet.xml @@ -5,6 +5,6 @@ android:id="@+id/details_menu" android:title="@string/details_title" android:icon="@drawable/ic_more_vertical_24" - app:iconTint="@color/iconGray" + app:iconTint="@color/darkGray6" app:showAsAction="ifRoom" /> From d758ea8e26dcacbfe5641ae19c40529d159d1902 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 20 Jun 2022 01:49:13 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- .../com/tangem/tap/features/send/redux/reducers/FeeReducer.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt index 65a909ce1c..edb435953f 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt @@ -106,7 +106,7 @@ class FeeReducer : SendInternalReducer { private fun getFeePrecision(sendState: SendState): FeePrecision { val blockchain = sendState.walletManager?.wallet?.blockchain - return if (blockchain?.fullNameWithoutTestnet == Blockchain.Tron.fullName && + return if ((blockchain?.fullNameWithoutTestnet == Blockchain.Arbitrum.fullName || blockchain?.fullNameWithoutTestnet == Blockchain.Tron.fullName) && sendState.amountState.typeOfAmount is AmountType.Token) { FeePrecision.CAN_BE_LOWER } else {