From 4c31a97db8e829751fba9dde03cb283ff008dbee Mon Sep 17 00:00:00 2001
From: ace-smart <minmax17842@gmail.com>
Date: Thu, 25 Feb 2021 18:35:25 +0400
Subject: [PATCH] Fixed wrong color issue of the wallet layout. Fixes #1903

---
 ui/app/AppLayouts/Wallet/AssetsTab.qml                      | 4 ++--
 ui/app/AppLayouts/Wallet/HistoryTab.qml                     | 6 +++---
 ui/app/AppLayouts/Wallet/LeftTab.qml                        | 2 +-
 .../Wallet/components/SetCurrencyModalContent.qml           | 2 +-
 .../Wallet/components/TokenSettingsModalContent.qml         | 2 +-
 ui/shared/StatusTabButton.qml                               | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/app/AppLayouts/Wallet/AssetsTab.qml b/ui/app/AppLayouts/Wallet/AssetsTab.qml
index b118f70c0e..02f5ecbda2 100644
--- a/ui/app/AppLayouts/Wallet/AssetsTab.qml
+++ b/ui/app/AppLayouts/Wallet/AssetsTab.qml
@@ -45,7 +45,7 @@ Item {
                 anchors.bottomMargin: 0
                 anchors.left: assetInfoImage.right
                 anchors.leftMargin: Style.current.smallPadding
-                color: Style.current.darkGrey
+                color: Style.current.secondaryText
                 font.pixelSize: 15
             }
             StyledText {
@@ -58,7 +58,7 @@ Item {
             }
             StyledText {
                 id: assetFiatValue
-                color: Style.current.darkGrey
+                color: Style.current.secondaryText
                 text: Utils.toLocaleString(fiatBalance, appSettings.locale) + " " + walletModel.defaultCurrency.toUpperCase()
                 anchors.right: parent.right
                 anchors.rightMargin: 0
diff --git a/ui/app/AppLayouts/Wallet/HistoryTab.qml b/ui/app/AppLayouts/Wallet/HistoryTab.qml
index 93295208e2..28654a6c9c 100644
--- a/ui/app/AppLayouts/Wallet/HistoryTab.qml
+++ b/ui/app/AppLayouts/Wallet/HistoryTab.qml
@@ -162,7 +162,7 @@ Item {
                               //% "From "
                               qsTrId("from-")
                     anchors.right: addressValue.left
-                    color: Style.current.darkGrey
+                    color: Style.current.secondaryText
                     anchors.top: parent.top
                     font.pixelSize: 15
                     font.strikeout: false
@@ -191,7 +191,7 @@ Item {
                     text: "• "
                     font.weight: Font.Bold
                     anchors.right: timeIndicator.left
-                    color: Style.current.darkGrey
+                    color: Style.current.secondaryText
                     anchors.top: parent.top
                     font.pixelSize: 15
                 }
@@ -200,7 +200,7 @@ Item {
                     id: timeIndicator
                     text: "At "
                     anchors.right: timeValue.left
-                    color: Style.current.darkGrey
+                    color: Style.current.secondaryText
                     anchors.top: parent.top
                     font.pixelSize: 15
                     font.strikeout: false
diff --git a/ui/app/AppLayouts/Wallet/LeftTab.qml b/ui/app/AppLayouts/Wallet/LeftTab.qml
index b628249574..81dfa30414 100644
--- a/ui/app/AppLayouts/Wallet/LeftTab.qml
+++ b/ui/app/AppLayouts/Wallet/LeftTab.qml
@@ -55,7 +55,7 @@ Item {
 
         StyledText {
             id: totalValue
-            color: Style.current.darkGrey
+            color: Style.current.secondaryText
             //% "Total value"
             text: qsTrId("wallet-total-value")
             anchors.left: walletAmountValue.left
diff --git a/ui/app/AppLayouts/Wallet/components/SetCurrencyModalContent.qml b/ui/app/AppLayouts/Wallet/components/SetCurrencyModalContent.qml
index 25f0addf08..409a01b1d3 100644
--- a/ui/app/AppLayouts/Wallet/components/SetCurrencyModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/components/SetCurrencyModalContent.qml
@@ -35,7 +35,7 @@ Item {
                 id: wrapper
                 property bool hovered: false
                 radius: Style.current.radius
-                color: modalBody.currency === key ? Style.current.lightBlue : (hovered ? Style.current.backgroundHover: Style.current.transparent)
+                color: modalBody.currency === key ? Style.current.secondaryBackground : (hovered ? Style.current.backgroundHover: Style.current.transparent)
                 anchors.right: parent.right
                 anchors.rightMargin: 0
                 anchors.left: parent.left
diff --git a/ui/app/AppLayouts/Wallet/components/TokenSettingsModalContent.qml b/ui/app/AppLayouts/Wallet/components/TokenSettingsModalContent.qml
index 8fe4b5523e..8817a1dde3 100644
--- a/ui/app/AppLayouts/Wallet/components/TokenSettingsModalContent.qml
+++ b/ui/app/AppLayouts/Wallet/components/TokenSettingsModalContent.qml
@@ -57,7 +57,7 @@ Item {
                 anchors.topMargin: 0
                 anchors.left: assetInfoImage.right
                 anchors.leftMargin: Style.current.smallPadding
-                color: Style.current.darkGrey
+                color: Style.current.secondaryText
                 font.pixelSize: 15
             }
             StatusCheckBox  {
diff --git a/ui/shared/StatusTabButton.qml b/ui/shared/StatusTabButton.qml
index b26b5693a7..b33c425e92 100644
--- a/ui/shared/StatusTabButton.qml
+++ b/ui/shared/StatusTabButton.qml
@@ -21,7 +21,7 @@ TabButton {
         text: btnText
         font.weight: Font.Medium
         font.pixelSize: 15
-        color: parent.checked || parent.hovered ? Style.current.textColor : Style.current.darkGrey
+        color: parent.checked || parent.hovered ? Style.current.textColor : Style.current.secondaryText
     }
 
     Rectangle {