feat(AppMain): Replace MailserverConnectionDialog with banner

Close #6213
status-im · Jan 30, 2023 · e0ba80a · e0ba80a
1 parent 128ac8d
commit e0ba80a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 59 deletions.
diff --git a/test/ui-test/src/screens/StatusWalletScreen.py b/test/ui-test/src/screens/StatusWalletScreen.py
@@ -21,7 +21,6 @@ class MainWalletScreen(Enum):
     SAVED_ADDRESSES_BUTTON: str = "mainWallet_Saved_Addresses_Button"
     NETWORK_SELECTOR_BUTTON: str = "mainWallet_Network_Selector_Button"
     RIGHT_SIDE_TABBAR: str = "mainWallet_Right_Side_Tab_Bar"
-    MAILSERVER_RETRY: str = "mailserver_retry"
     FIRST_ACCOUNT_ITEM: str = "firstWalletAccount_Item"
     EPHEMERAL_NOTIFICATION_LIST: str = "mainWallet_Ephemeral_Notification_List"
     TOTAL_CURRENCY_BALANCE: str = "mainWallet_totalCurrencyBalance"

diff --git a/test/ui-test/testSuites/suite_wallet/shared/scripts/wallet_names.py b/test/ui-test/testSuites/suite_wallet/shared/scripts/wallet_names.py
@@ -12,9 +12,6 @@
 mainWallet_Right_Side_Tab_Bar = {"container": statusDesktop_mainWindow, "objectName": "rightSideWalletTabBar", "type": "StatusTabBar"}
 mainWallet_Ephemeral_Notification_List = {"container": statusDesktop_mainWindow, "objectName": "ephemeralNotificationList", "type": "StatusListView"}
 
-mailserver_dialog = {"container": statusDesktop_mainWindow_overlay, "objectName": "mailserverConnectionDialog", "type": "StatusDialog"}
-mailserver_retry = {"container": mailserver_dialog, "objectName": "mailserverConnectionDialog_retryButton", "type": "StatusButton"}
-
 accounts_StatusListView = {"container": statusDesktop_mainWindow, "objectName": "walletAccountsListView", "type": "StatusListView", "visible": True}
 firstWalletAccount_Item = {"container": accounts_StatusListView, "index": 0, "objectName": "walletAccountItem", "type": "StatusListItem", "visible": True}
 

diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
@@ -38,7 +38,6 @@ import AppLayouts.stores 1.0
 
 import SortFilterProxyModel 0.2
 
-import "popups"
 import "panels"
 import "activitycenter/popups"
 import "activitycenter/stores"
@@ -70,7 +69,7 @@ Item {
         }
 
         onMailserverNotWorking: {
-            Global.openPopup(mailserverNotWorkingPopupComponent)
+            mailserverConnectionBanner.show()
         }
 
         onActiveSectionChanged: {
@@ -714,7 +713,6 @@ Item {
                     }
                 }
 
-
                 ModuleWarning {
                     id: downloadingArchivesBanner
                     Layout.fillWidth: true
@@ -724,6 +722,14 @@ Item {
                     closeBtnVisible: false
                 }
 
+                ModuleWarning {
+                    id: mailserverConnectionBanner
+                    type: ModuleWarning.Danger
+                    text: qsTr("Can not connect to mailserver. Retrying automatically")
+                    onCloseClicked: hide()
+                    Layout.fillWidth: true
+                }
+
                 Component {
                     id: connectedBannerComponent
 
@@ -1009,15 +1015,6 @@ Item {
             }
         } // ColumnLayout
 
-        Component {
-            id: mailserverNotWorkingPopupComponent
-            MailserverConnectionDialog {
-                onClosed: {
-                    destroy()
-                }
-            }
-        }
-
         Component {
             id: chooseBrowserPopupComponent
             ChooseBrowserPopup {

diff --git a/ui/app/mainui/popups/MailserverConnectionDialog.qml b/ui/app/mainui/popups/MailserverConnectionDialog.qml