From 78414b9c15ec0c4e9a844a2ce0295090586a1591 Mon Sep 17 00:00:00 2001
From: Pascal Precht <pascal.precht@gmail.com>
Date: Mon, 18 Oct 2021 12:03:14 +0200
Subject: [PATCH] refactor(@desktop/walletv2): clean up account related modals

---
 ui/app/AppLayouts/WalletV2/popups/AddAccountPopup.qml    | 8 +++-----
 .../WalletV2/popups/AddEditSavedAddressPopup.qml         | 9 +++------
 ui/app/AppLayouts/WalletV2/popups/CollectibleModal.qml   | 3 +++
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/ui/app/AppLayouts/WalletV2/popups/AddAccountPopup.qml b/ui/app/AppLayouts/WalletV2/popups/AddAccountPopup.qml
index 7ca5be832d..dee1490acd 100644
--- a/ui/app/AppLayouts/WalletV2/popups/AddAccountPopup.qml
+++ b/ui/app/AppLayouts/WalletV2/popups/AddAccountPopup.qml
@@ -2,12 +2,7 @@ import QtQuick 2.13
 import QtQuick.Controls 2.13
 import QtQuick.Dialogs 1.3
 
-
 import utils 1.0
-import "../../../../shared"
-import "../../../../shared/status"
-import "../views"
-import "../panels"
 
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
@@ -15,6 +10,9 @@ import StatusQ.Controls 0.1
 import StatusQ.Controls.Validators 0.1
 import StatusQ.Popups 0.1
 
+import "../views"
+import "../panels"
+
 StatusModal {
     id: root
     height: (keyOrSeedPhraseInput.input.edit.contentHeight > 56 || root.store.seedPhraseInserted) ? 517 : 498
diff --git a/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml b/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml
index 4d9baac2ae..a44dececd5 100644
--- a/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml
+++ b/ui/app/AppLayouts/WalletV2/popups/AddEditSavedAddressPopup.qml
@@ -2,11 +2,8 @@ import QtQuick 2.13
 import QtQuick.Controls 2.13
 import QtQuick.Dialogs 1.3
 
-
 import utils 1.0
-import "../../../../shared"
-import "../../../../shared/panels"
-import "../../../../shared/status"
+import "../../../../shared/controls"
 
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
@@ -93,12 +90,12 @@ StatusModal {
                 height: parent.height
                 anchors.top: parent.top
                 anchors.topMargin: 11
-                StyledText {
+                StatusBaseText {
                     id: inputLabel
                     text: "Emoji"
                     font.weight: Font.Medium
                     font.pixelSize: 13
-                    color: Style.current.textColor
+                    color: Theme.palette.directColor1
                 }
                 Rectangle {
                     width: parent.width
diff --git a/ui/app/AppLayouts/WalletV2/popups/CollectibleModal.qml b/ui/app/AppLayouts/WalletV2/popups/CollectibleModal.qml
index 10395a6a1a..3f530ef38b 100644
--- a/ui/app/AppLayouts/WalletV2/popups/CollectibleModal.qml
+++ b/ui/app/AppLayouts/WalletV2/popups/CollectibleModal.qml
@@ -2,6 +2,9 @@ import QtQuick 2.13
 import QtGraphicalEffects 1.13
 
 import utils 1.0
+
+import StatusQ.Controls 0.1
+
 import "../../../../shared"
 import "../../../../shared/popups"
 import "../../../../shared/panels"