diff --git a/ui/app/AppLayouts/Wallet/LeftTab.qml b/ui/app/AppLayouts/Wallet/LeftTab.qml index 03585f2252..596280c8f1 100644 --- a/ui/app/AppLayouts/Wallet/LeftTab.qml +++ b/ui/app/AppLayouts/Wallet/LeftTab.qml @@ -79,7 +79,7 @@ Item { id: rectangle height: 64 - color: selected ? Style.current.blue : Style.current.transparent + color: selected ? iconColor : Style.current.transparent radius: Style.current.radius anchors.right: parent.right anchors.rightMargin: Style.current.padding diff --git a/ui/app/AppLayouts/Wallet/WalletHeader.qml b/ui/app/AppLayouts/Wallet/WalletHeader.qml index f3367925a5..ef90eea410 100644 --- a/ui/app/AppLayouts/Wallet/WalletHeader.qml +++ b/ui/app/AppLayouts/Wallet/WalletHeader.qml @@ -35,7 +35,7 @@ Item { id: separatorDot width: 8 height: 8 - color: Style.current.blue + color: currentAccount.iconColor anchors.top: title.verticalCenter anchors.topMargin: -3 anchors.left: title.right diff --git a/ui/app/AppLayouts/Wallet/WalletLayout.qml b/ui/app/AppLayouts/Wallet/WalletLayout.qml index 91745bb4aa..392d9ee1f3 100644 --- a/ui/app/AppLayouts/Wallet/WalletLayout.qml +++ b/ui/app/AppLayouts/Wallet/WalletLayout.qml @@ -75,11 +75,13 @@ SplitView { StatusTabButton { id: assetBtn + tabColor: walletModel.currentAccount.iconColor //% "Assets" btnText: qsTrId("wallet-assets") } StatusTabButton { id: collectiblesBtn + tabColor: walletModel.currentAccount.iconColor anchors.left: assetBtn.right anchors.leftMargin: 32 //% "Collectibles" @@ -87,6 +89,7 @@ SplitView { } StatusTabButton { id: historyBtn + tabColor: walletModel.currentAccount.iconColor anchors.left: collectiblesBtn.right anchors.leftMargin: 32 //% "History" diff --git a/ui/app/AppLayouts/Wallet/components/AddAccountWithPrivateKey.qml b/ui/app/AppLayouts/Wallet/components/AddAccountWithPrivateKey.qml index 8f80e4320b..2316a92924 100644 --- a/ui/app/AppLayouts/Wallet/components/AddAccountWithPrivateKey.qml +++ b/ui/app/AppLayouts/Wallet/components/AddAccountWithPrivateKey.qml @@ -49,6 +49,7 @@ ModalPopup { onOpened: { passwordInput.text = "" + accountColorInput.selectedColor = Constants.accountColors[Math.floor(Math.random() * Constants.accountColors.length)] passwordInput.forceActiveFocus(Qt.MouseFocusReason) } @@ -88,7 +89,6 @@ ModalPopup { ColorSelector { id: accountColorInput - selectedColor: Constants.accountColors[0] model: Constants.accountColors anchors.top: accountNameInput.bottom anchors.topMargin: marginBetweenInputs diff --git a/ui/app/AppLayouts/Wallet/components/AddAccountWithSeed.qml b/ui/app/AppLayouts/Wallet/components/AddAccountWithSeed.qml index b28273f85c..72faa702da 100644 --- a/ui/app/AppLayouts/Wallet/components/AddAccountWithSeed.qml +++ b/ui/app/AppLayouts/Wallet/components/AddAccountWithSeed.qml @@ -52,7 +52,10 @@ ModalPopup { } onOpened: { - passwordInput.text = "" + accountSeedInput.text = ""; + passwordInput.text = ""; + accountNameInput.text = ""; + accountColorInput.selectedColor = Constants.accountColors[Math.floor(Math.random() * Constants.accountColors.length)] passwordInput.forceActiveFocus(Qt.MouseFocusReason) } @@ -101,7 +104,6 @@ ModalPopup { ColorSelector { id: accountColorInput - selectedColor: Constants.accountColors[0] model: Constants.accountColors anchors.top: accountNameInput.bottom anchors.topMargin: marginBetweenInputs diff --git a/ui/app/AppLayouts/Wallet/components/AddWatchOnlyAccount.qml b/ui/app/AppLayouts/Wallet/components/AddWatchOnlyAccount.qml index 5acbe21c42..247864ba6f 100644 --- a/ui/app/AppLayouts/Wallet/components/AddWatchOnlyAccount.qml +++ b/ui/app/AppLayouts/Wallet/components/AddWatchOnlyAccount.qml @@ -37,6 +37,8 @@ ModalPopup { onOpened: { addressInput.text = ""; + accountNameInput.text = ""; + accountColorInput.selectedColor = Constants.accountColors[Math.floor(Math.random() * Constants.accountColors.length)] addressInput.forceActiveFocus(Qt.MouseFocusReason) } @@ -63,7 +65,6 @@ ModalPopup { ColorSelector { id: accountColorInput - selectedColor: Constants.accountColors[0] model: Constants.accountColors anchors.top: accountNameInput.bottom anchors.topMargin: marginBetweenInputs diff --git a/ui/app/AppLayouts/Wallet/components/GenerateAccountModal.qml b/ui/app/AppLayouts/Wallet/components/GenerateAccountModal.qml index f991045199..5cd334ec1d 100644 --- a/ui/app/AppLayouts/Wallet/components/GenerateAccountModal.qml +++ b/ui/app/AppLayouts/Wallet/components/GenerateAccountModal.qml @@ -37,6 +37,8 @@ ModalPopup { onOpened: { passwordInput.text = ""; + accountNameInput.text = ""; + accountColorInput.selectedColor = Constants.accountColors[Math.floor(Math.random() * Constants.accountColors.length)] passwordInput.forceActiveFocus(Qt.MouseFocusReason) } @@ -63,7 +65,6 @@ ModalPopup { ColorSelector { id: accountColorInput - selectedColor: Constants.accountColors[0] model: Constants.accountColors anchors.top: accountNameInput.bottom anchors.topMargin: marginBetweenInputs diff --git a/ui/shared/StatusTabButton.qml b/ui/shared/StatusTabButton.qml index c4fa94f434..6e3e54c490 100644 --- a/ui/shared/StatusTabButton.qml +++ b/ui/shared/StatusTabButton.qml @@ -4,6 +4,8 @@ import "../imports" TabButton { property string btnText: "Default Button" + property string tabColor: Style.current.blue + id: tabButton width: tabBtnText.width @@ -25,7 +27,7 @@ TabButton { Rectangle { visible: parent.checked - color: Style.current.blue + color: tabColor anchors.bottom: parent.bottom anchors.bottomMargin: 0 anchors.right: parent.right