refactor: move `ModalPopup` to ui/shared/popups

ui/app/AppLayouts/Browser/popups/AddFavoriteModal.qml

@@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 

ui/app/AppLayouts/Browser/popups/JSDialogWindow.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 import QtWebEngine 1.10
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 import utils 1.0

ui/app/AppLayouts/Browser/popups/SignMessageModal.qml

@@ -7,9 +7,11 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/panels"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property var request
     property var selectedAccount
@@ -135,6 +137,7 @@ ModalPopup {
                 anchors.fill: parent
                 anchors.verticalCenter: parent.verticalCenter
 
+                // TODO; replace with StatusModal
                 ModalPopup {
                     id: messagePopup
                     //% "Message"

ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandModal.qml

@@ -7,8 +7,10 @@ import utils 1.0
 import "../../../../../shared"
 import "../../../../../shared/panels"
 import "../../../../../shared/controls"
+import "../../../../../shared/popups"
 import "../../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property string commandTitle: "Send"
     property string finalButtonLabel: "Request address"

ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/SignTransactionModal.qml

@@ -10,6 +10,7 @@ import "../../../../../shared/panels"
 import "../../../../../shared/controls"
 import "../../../../../shared/popups"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property var selectedAccount
     property var selectedRecipient

ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionComponents/SelectAccountModal.qml

@@ -6,8 +6,10 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 import "../../../../../../shared"
 import "../../../../../../shared/controls"
+import "../../../../../../shared/popups"
 import "../../../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: root
     //% "Select account"

ui/app/AppLayouts/Chat/CommunityComponents/AccessExistingCommunityPopup.qml

@@ -5,8 +5,10 @@ import QtQuick.Dialogs 1.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     width: 400

ui/app/AppLayouts/Chat/components/ChooseBrowserPopup.qml

@@ -3,8 +3,10 @@ import QtQuick.Controls 2.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property string link
 

ui/app/AppLayouts/Chat/components/GroupChatPopup.qml

@@ -6,9 +6,11 @@ import QtQml.Models 2.3
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "./"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 

ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml

@@ -4,9 +4,11 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "./"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     enum ChannelType {

ui/app/AppLayouts/Chat/components/NicknamePopup.qml

@@ -6,9 +6,11 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "./"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property int nicknameLength: nicknameInput.textField.text.length
     readonly property int maxNicknameLength: 32

ui/app/AppLayouts/Chat/components/PinnedMessagesPopup.qml

@@ -3,10 +3,12 @@ import QtQuick.Controls 2.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../data"
 import "../ChatColumn"
 
+// TODO: replace with StatusMOdal
 ModalPopup {
     property bool userCanPin: {
         switch (chatsModel.channelView.activeChannel.chatType) {

ui/app/AppLayouts/Chat/components/PrivateChatPopup.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "./"
 

ui/app/AppLayouts/Chat/components/ProfilePopup.qml

@@ -183,6 +183,7 @@ StatusModal {
             }
         }
 
+        // TODO: replace with StatusModal
         ModalPopup {
             id: qrCodePopup
             width: 320

ui/app/AppLayouts/Chat/components/PublicChatPopup.qml

@@ -5,10 +5,12 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../data/channelList.js" as ChannelJSON
 import "./"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property string channelNameValidationError: ""
 

ui/app/AppLayouts/Chat/components/RenameGroupPopup.qml

@@ -5,9 +5,11 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "./"
 
+// TODO: replace with StatusModal
 ModalPopup {
     function doRename(){
         chatsModel.groups.rename(groupName.text)

ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml

@@ -5,8 +5,10 @@ import QtQuick.Layouts 1.14
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 

ui/app/AppLayouts/Onboarding/popups/ConfirmAddExistingKeyModal.qml

@@ -4,8 +4,10 @@ import QtQuick.Controls 2.13
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property var onOpenModalClick: function () {}
     id: popup

ui/app/AppLayouts/Onboarding/popups/EnterSeedPhraseModal.qml

@@ -5,8 +5,10 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property var onConfirmSeedClick: function () {}
     id: popup

ui/app/AppLayouts/Onboarding/popups/GenKeyModal.qml

@@ -7,9 +7,11 @@ import StatusQ.Controls 0.1
 import utils 1.0
 
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../panels"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property int selectedIndex: 0
     property var onClosed: function () {}

ui/app/AppLayouts/Onboarding/popups/InvalidSeedPhraseModal.qml

@@ -5,7 +5,9 @@ import utils 1.0
 
 import "../../../../shared"
 import "../../../../shared/status"
+import "../../../../shared/popups"
 
+// TODO: replace with StatusModal
 ModalPopup {
   id: popup
   //% "Invalid seed phrase"

ui/app/AppLayouts/Onboarding/popups/MnemonicRecoverySuccessModal.qml

@@ -6,8 +6,10 @@ import utils 1.0
 import "../../../../shared"
 import "../../../../shared/status"
 import "../../../../shared/panels"
+import "../../../../shared/popups"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     //% "Your keys have been successfully recovered"

ui/app/AppLayouts/Onboarding/popups/SelectAnotherAccountModal.qml

@@ -3,11 +3,13 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 import "../panels"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property var onAccountSelect: function () {}
     property var onOpenModalClick: function () {}

ui/app/AppLayouts/Onboarding/shared/CreatePasswordModal.qml

@@ -7,6 +7,7 @@ import StatusQ.Controls 0.1
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 
 // TODO: replace with StatusModal
 ModalPopup {

ui/app/AppLayouts/Profile/popups/ChatLinksPreviewModal.qml

@@ -3,8 +3,10 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 

ui/app/AppLayouts/Profile/popups/ConfirmAppRestartModal.qml

@@ -4,8 +4,10 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     height: 237
     width: 400

ui/app/AppLayouts/Profile/popups/DappList.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 
 import "./"
 import "../panels"

ui/app/AppLayouts/Profile/popups/ENSPopup.qml

@@ -5,7 +5,9 @@ import QtQml.Models 2.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 

ui/app/AppLayouts/Profile/popups/EthereumExplorerModal.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 // TODO: replace with StatusModal

ui/app/AppLayouts/Profile/popups/FleetsModal.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 import "../controls"

ui/app/AppLayouts/Profile/popups/HomepageModal.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls 2.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 // TODO: replace with StatusModal

ui/app/AppLayouts/Profile/popups/MutedChatsModal.qml

@@ -5,8 +5,10 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: root
     //% "Muted chats"

ui/app/AppLayouts/Profile/popups/NetworksModal.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 import "../controls"

ui/app/AppLayouts/Profile/popups/OpenLinksWithModal.qml

@@ -3,8 +3,10 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 

ui/app/AppLayouts/Profile/popups/PermissionList.qml

@@ -8,6 +8,7 @@ import StatusQ.Controls 0.1
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 import "./"

ui/app/AppLayouts/Profile/popups/SearchEngineModal.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 // TODO: replace with StatusModal

ui/app/AppLayouts/Profile/popups/StoreToKeychainSelectionModal.qml

@@ -3,8 +3,10 @@ import QtQuick.Controls 2.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 

ui/app/AppLayouts/Profile/views/MyProfileView.qml

@@ -5,6 +5,7 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/panels"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 import "../popups"

ui/app/AppLayouts/Profile/views/SyncView.qml

@@ -9,6 +9,7 @@ import StatusQ.Controls 0.1
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
 Item {

ui/app/AppLayouts/Wallet/popups/AccountSettingsModal.qml

@@ -6,6 +6,7 @@ import QtQuick.Dialogs 1.3
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 

ui/app/AppLayouts/Wallet/popups/AddAccountWithPrivateKeyModal.qml

@@ -6,6 +6,7 @@ import utils 1.0
 
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 

ui/app/AppLayouts/Wallet/popups/AddAccountWithSeedModal.qml

@@ -6,6 +6,7 @@ import utils 1.0
 
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 

ui/app/AppLayouts/Wallet/popups/AddCustomTokenModal.qml

@@ -6,6 +6,7 @@ import utils 1.0
 
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 

ui/app/AppLayouts/Wallet/popups/AddWatchOnlyAccountModal.qml

@@ -6,6 +6,7 @@ import utils 1.0
 
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 

ui/app/AppLayouts/Wallet/popups/CollectiblesModal.qml

@@ -3,9 +3,11 @@ import QtGraphicalEffects 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../panels"
 
+// TODO: Replace with StatusModal
 ModalPopup {
     property string collectibleName: "Furbeard"
     property string collectibleId: "1423"

ui/app/AppLayouts/Wallet/popups/GenerateAccountModal.qml

@@ -6,6 +6,7 @@ import utils 1.0
 
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 

ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml

@@ -5,6 +5,7 @@ import utils 1.0
 
 import "../../../../shared"
 import "../../../../shared/controls"
+import "../../../../shared/popups"
 import "../stores"
 
 // TODO: replace with StatusModal

ui/app/AppLayouts/Wallet/popups/SetCurrencyModal.qml

@@ -4,9 +4,11 @@ import QtQuick.Controls 2.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/status"
+import "../../../../shared/popups"
 import "../panels"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     width: 480

ui/app/AppLayouts/Wallet/popups/SignPhraseModal.qml

@@ -4,9 +4,11 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: signPhrasePopup
 

ui/app/AppLayouts/Wallet/popups/TokenSettingsModal.qml

@@ -4,9 +4,11 @@ import QtQuick.Controls 2.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/status"
+import "../../../../shared/popups"
 import "../panels"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
     //% "Manage Assets"

ui/app/AppLayouts/Wallet/popups/TransactionModal.qml

@@ -3,8 +3,10 @@ import QtQuick 2.13
 import utils 1.0
 import "../../../../shared"
 import "../../../../shared/panels"
+import "../../../../shared/popups"
 import "../stores"
 
+// TODO: replace with StatusModal
 ModalPopup {
   id: popup
 

ui/app/AppLayouts/WalletV2/popups/CollectibleModal.qml

@@ -3,8 +3,10 @@ import QtGraphicalEffects 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: root
     title: root.name || qsTr("unnamed")

ui/app/AppLayouts/WalletV2/popups/SignPhraseModal.qml

@@ -4,9 +4,11 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 import "."
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: signPhrasePopup
     title: qsTrId("signing-phrase")

ui/shared/TransactionPreview.qml

@@ -6,6 +6,7 @@ import QtGraphicalEffects 1.13
 import utils 1.0
 import "../shared/status"
 import "../shared/panels"
+import "../shared/popups"
 
 Item {
     id: root
@@ -524,6 +525,7 @@ Item {
                     }
                 }
 
+                // TODO: replace with StatusModal
                 ModalPopup {
                     id: dataPopup
                     //% "Data field"

ui/shared/UnblockContactConfirmationDialog.qml

@@ -4,8 +4,10 @@ import QtQuick.Layouts 1.13
 
 import utils 1.0
 import "../shared/status"
+import "./popups"
 import "./"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: unblockContactConfirmationDialog
     height: 237

ui/shared/popups/BlockContactConfirmationDialog.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../status"
 import "../"
+import "."
 
 // TODO: replace with StatusModal
 ModalPopup {

ui/shared/popups/DownloadModal.qml

@@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../status"
 import "../"
+import "."
 
 // TODO: replace with StatusModal
 ModalPopup {

ui/shared/popups/ImageCropperModal.qml

@@ -6,6 +6,7 @@ import utils 1.0
 import "../"
 import "../status"
 import "../controls"
+import "."
 
 // TODO: replace with StatusModal
 ModalPopup {

ui/shared/popups/InviteFriendsPopup.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls 2.3
 import utils 1.0
 import "../controls"
 import "../"
+import "."
 
 // TODO: replace with StatusModal
 ModalPopup {

ui/shared/popups/ModalPopup.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.13
 import QtGraphicalEffects 1.13
 
 import utils 1.0
+import "../"
 
 Popup {
     property string title
@@ -86,7 +87,7 @@ Popup {
 
             SVGImage {
                 id: closeModalImg
-                source: "./img/close.svg"
+                source: Style.svg("close")
                 width: 11
                 height: 11
                 anchors.horizontalCenter: parent.horizontalCenter

ui/shared/popups/SendModal.qml

@@ -8,7 +8,9 @@ import "../"
 import "../panels"
 import "../controls"
 import "../status"
+import "."
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: root
     property alias selectFromAccount: selectFromAccount

ui/shared/popups/TransactionSettingsConfirmationPopup.qml

@@ -5,7 +5,9 @@ import QtQuick.Layouts 1.13
 import utils 1.0
 import "../status"
 import "../"
+import "."
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: popup
 

ui/shared/qmldir

@@ -1,6 +1,5 @@
 StyledButton 1.0 StyledButton.qml
 RoundedIcon 1.0 RoundedIcon.qml
-ModalPopup 1.0 ModalPopup.qml
 PopupMenu 1.0 PopupMenu.qml
 Separator 1.0 Separator.qml
 StatusTabButton 1.0 StatusTabButton.qml

ui/shared/status/StatusETHTransactionModal.qml

@@ -9,6 +9,7 @@ import "../../shared/status"
 import "../../shared/controls"
 import "../../shared/popups"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: root
     readonly property var asset: {"name": "Ethereum", "symbol": "ETH"}

ui/shared/status/StatusSNTTransactionModal.qml

@@ -9,6 +9,7 @@ import "../../shared/status"
 import "../../shared/controls"
 import "../../shared/popups"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: root
     readonly property var asset: JSON.parse(walletModel.tokensView.getStatusToken())

ui/shared/status/StatusStickerMarket.qml

@@ -53,6 +53,7 @@ Item {
                 }
             }
 
+            // TODO: replace with StatusModal
             ModalPopup {
                 id: stickerPackDetailsPopup
                 height: 540

ui/shared/status/StatusStickerPackClickPopup.qml

@@ -6,8 +6,10 @@ import QtGraphicalEffects 1.0
 import utils 1.0
 import "../../shared"
 import "../../shared/status"
+import "../../shared/popups"
 import "../../app/AppLayouts/Chat/ChatColumn/samples"
 
+// TODO: replace with StatusModal
 ModalPopup {
     id: stickerPackDetailsPopup