diff --git a/storybook/pages/UserAgreementPopupPage.qml b/storybook/pages/UserAgreementPopupPage.qml deleted file mode 100644 index bf6fe6333c..0000000000 --- a/storybook/pages/UserAgreementPopupPage.qml +++ /dev/null @@ -1,38 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 - -import shared.popups 1.0 - -import Storybook 1.0 - -SplitView { - orientation: Qt.Vertical - - Item { - - SplitView.fillWidth: true - SplitView.fillHeight: true - - PopupBackground { - anchors.fill: parent - } - - Button { - anchors.centerIn: parent - text: "Reopen" - - onClicked: popup.open() - } - } - - UserAgreementPopup { - id: popup - anchors.centerIn: parent - modal: false - visible: true - } -} - -// category: Popups - -// https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba⎜Desktop?type=design&node-id=31450-560694&t=Q4MOViPCoHsTjhs6-0 diff --git a/test/e2e/gui/components/onboarding/beta_consent_popup.py b/test/e2e/gui/components/onboarding/beta_consent_popup.py deleted file mode 100644 index 80fdd02e63..0000000000 --- a/test/e2e/gui/components/onboarding/beta_consent_popup.py +++ /dev/null @@ -1,24 +0,0 @@ -import allure - -from gui.components.base_popup import BasePopup -from gui.elements.button import Button -from gui.elements.check_box import CheckBox -from gui.elements.object import QObject -from gui.objects_map import names - - -class BetaConsentPopup(QObject): - - def __init__(self): - super().__init__(names.betaConsent_StatusModal) - self._agree_to_use_checkbox = CheckBox(names.agreeToUse_StatusCheckBox) - self._ready_to_use_checkbox = CheckBox(names.readyToUse_StatusCheckBox) - self._ready_to_use_button = Button(names.i_m_ready_to_use_Status_Desktop_Beta_StatusButton) - - @allure.step('Confirm all') - def confirm(self): - self._agree_to_use_checkbox.set(True) - self._ready_to_use_checkbox.set(True) - # TODO https://github.com/status-im/status-desktop/issues/15345 - self._ready_to_use_button.click(timeout=60) - self.wait_until_hidden() diff --git a/test/e2e/gui/main_window.py b/test/e2e/gui/main_window.py index 142ce6c660..5ee9cfb101 100644 --- a/test/e2e/gui/main_window.py +++ b/test/e2e/gui/main_window.py @@ -11,7 +11,6 @@ from gui.components.community.invite_contacts import InviteContactsPopup from gui.components.onboarding.share_usage_data_popup import ShareUsageDataPopup from gui.components.context_menu import ContextMenu from gui.components.onboarding.before_started_popup import BeforeStartedPopUp -from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.components.splash_screen import SplashScreen from gui.components.toast_message import ToastMessage @@ -190,8 +189,6 @@ class MainWindow(Window): if configs.system.get_platform() == "Darwin": AllowNotificationsView().start_using_status() SplashScreen().wait_until_appears().wait_until_hidden() - if not configs.system.TEST_MODE and not configs._local.DEV_BUILD: - BetaConsentPopup().confirm() assert SigningPhrasePopup().ok_got_it_button.is_visible SigningPhrasePopup().confirm_phrase() return self @@ -201,8 +198,6 @@ class MainWindow(Window): share_updates_popup = ShareUsageDataPopup() LoginView().log_in(user_account) SplashScreen().wait_until_appears().wait_until_hidden() - if not configs.system.TEST_MODE and not configs._local.DEV_BUILD: - BetaConsentPopup().confirm() if SigningPhrasePopup().is_visible: SigningPhrasePopup().confirm_phrase() if share_updates_popup.is_visible: diff --git a/test/e2e/helpers/OnboardingHelper.py b/test/e2e/helpers/OnboardingHelper.py index e0499b40f2..68ae7f5202 100644 --- a/test/e2e/helpers/OnboardingHelper.py +++ b/test/e2e/helpers/OnboardingHelper.py @@ -4,7 +4,6 @@ import configs._local import configs.system from gui.components.onboarding.before_started_popup import BeforeStartedPopUp -from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.signing_phrase_popup import SigningPhrasePopup from gui.components.splash_screen import SplashScreen from gui.screens.onboarding import WelcomeToStatusView, BiometricsView, YourEmojihashAndIdenticonRingView @@ -37,8 +36,6 @@ with step('Finalize onboarding and open main screen'): if configs.system.get_platform() == "Darwin": next_view.start_using_status() SplashScreen().wait_until_appears().wait_until_hidden() - if not configs.system.TEST_MODE and not configs._local.DEV_BUILD: - BetaConsentPopup().confirm() assert SigningPhrasePopup().ok_got_it_button.is_visible SigningPhrasePopup().confirm_phrase() diff --git a/test/e2e/tests/crtitical_tests_prs/test_onboarding_generate_account_back_up_seed.py b/test/e2e/tests/crtitical_tests_prs/test_onboarding_generate_account_back_up_seed.py index caf0c245b4..f32fd4ecad 100755 --- a/test/e2e/tests/crtitical_tests_prs/test_onboarding_generate_account_back_up_seed.py +++ b/test/e2e/tests/crtitical_tests_prs/test_onboarding_generate_account_back_up_seed.py @@ -11,7 +11,6 @@ from gui.components.signing_phrase_popup import SigningPhrasePopup import configs.timeouts from gui.components.onboarding.before_started_popup import BeforeStartedPopUp -from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.picture_edit_popup import shift_image, PictureEditPopup from gui.components.splash_screen import SplashScreen from gui.screens.onboarding import WelcomeToStatusView, BiometricsView, \ @@ -88,8 +87,6 @@ def test_generate_account_back_up_seed_sign_out(aut, main_window, user_account, if configs.system.get_platform() == "Darwin": next_view.start_using_status() SplashScreen().wait_until_appears().wait_until_hidden() - if not configs.system.TEST_MODE and not configs._local.DEV_BUILD: - BetaConsentPopup().confirm() assert SigningPhrasePopup().ok_got_it_button.is_visible SigningPhrasePopup().confirm_phrase() diff --git a/test/e2e/tests/crtitical_tests_prs/test_onboarding_sync_with_code.py b/test/e2e/tests/crtitical_tests_prs/test_onboarding_sync_with_code.py index b97d14ec12..a55af0f158 100644 --- a/test/e2e/tests/crtitical_tests_prs/test_onboarding_sync_with_code.py +++ b/test/e2e/tests/crtitical_tests_prs/test_onboarding_sync_with_code.py @@ -9,7 +9,6 @@ import configs.testpath import driver from constants import UserAccount, RandomUser from gui.components.onboarding.before_started_popup import BeforeStartedPopUp -from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.splash_screen import SplashScreen from gui.main_window import MainWindow from gui.screens.onboarding import AllowNotificationsView, WelcomeToStatusView, SyncResultView, SyncDeviceFoundView, \ @@ -77,8 +76,6 @@ def test_sync_device_during_onboarding(multiple_instances): if configs.system.get_platform() == "Darwin": AllowNotificationsView().start_using_status() SplashScreen().wait_until_appears().wait_until_hidden() - if not configs.system.TEST_MODE and not configs._local.DEV_BUILD: - BetaConsentPopup().confirm() assert SigningPhrasePopup().ok_got_it_button.is_visible SigningPhrasePopup().confirm_phrase() diff --git a/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py b/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py index d1ea1b9fe1..33833b36bc 100644 --- a/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py +++ b/test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py @@ -15,7 +15,6 @@ from constants import UserAccount, RandomUser from scripts.utils.generators import random_password_string from constants.onboarding import OnboardingMessages from driver.aut import AUT -from gui.components.onboarding.beta_consent_popup import BetaConsentPopup from gui.components.splash_screen import SplashScreen from gui.screens.onboarding import BiometricsView, LoginView, \ YourEmojihashAndIdenticonRingView @@ -47,8 +46,6 @@ def test_login_with_wrong_password(aut: AUT, main_window, error: str): if configs.system.get_platform() == "Darwin": next_view.start_using_status() SplashScreen().wait_until_appears().wait_until_hidden() - if not configs.system.TEST_MODE and not configs._local.DEV_BUILD: - BetaConsentPopup().confirm() if SigningPhrasePopup().is_visible: SigningPhrasePopup().confirm_phrase() diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml index 13866f2b6c..6ba5c70960 100644 --- a/ui/app/mainui/AppMain.qml +++ b/ui/app/mainui/AppMain.qml @@ -1929,7 +1929,6 @@ Item { networkConnectionStore: appMain.networkConnectionStore appMainVisible: appMain.visible swapEnabled: featureFlagsStore.swapEnabled - hideSignPhraseModal: userAgreementLoader.active dAppsVisible: dAppsServiceLoader.item ? dAppsServiceLoader.item.serviceAvailableToCurrentAddress : false dAppsEnabled: dAppsServiceLoader.item ? dAppsServiceLoader.item.isServiceOnline : false dAppsModel: dAppsServiceLoader.item ? dAppsServiceLoader.item.dappsModel : null @@ -2608,15 +2607,6 @@ Item { } } - Loader { - id: userAgreementLoader - active: production && !localAppSettings.testEnvironment - sourceComponent: UserAgreementPopup { - visible: appMain.visible - onClosed: userAgreementLoader.active = false - } - } - DAppsMetrics { id: dappMetrics metricsStore: SharedStores.MetricsStore {} diff --git a/ui/imports/shared/popups/UserAgreementPopup.qml b/ui/imports/shared/popups/UserAgreementPopup.qml deleted file mode 100644 index dafe3be3da..0000000000 --- a/ui/imports/shared/popups/UserAgreementPopup.qml +++ /dev/null @@ -1,97 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 - -import StatusQ.Core 0.1 -import StatusQ.Controls 0.1 -import StatusQ.Popups 0.1 -import StatusQ.Popups.Dialog 0.1 -import StatusQ.Components 0.1 -import StatusQ.Core.Theme 0.1 - -import utils 1.0 - -StatusModal { - id: root - width: 640 - title: qsTr("Welcome to Status Desktop Beta") - objectName: "desktopBetaStatusModal" - hasCloseButton: false - verticalPadding: 20 - - closePolicy: Popup.NoAutoClose - - component Paragraph: StatusBaseText { - lineHeightMode: Text.FixedHeight - lineHeight: 22 - visible: !!text - wrapMode: Text.Wrap - } - - component AgreementSection: ColumnLayout { - property alias title: titleItem.text - property alias body: bodyItem.text - spacing: 8 - Paragraph { - id: titleItem - Layout.fillWidth: true - Layout.fillHeight: true - font.weight: Font.DemiBold - } - - Paragraph { - id: bodyItem - Layout.fillWidth: true - Layout.fillHeight: true - } - } - - StatusScrollView { - id: scrollView - anchors.fill: parent - contentWidth: availableWidth - - ColumnLayout { - id: layout - width: scrollView.availableWidth - spacing: 20 - - AgreementSection { - title: qsTr("Warning - Status desktop is currently in Beta") - body: qsTr(" • Status Desktop is incompatible with Status Mobile versions 1.x - • This version of Status may break or stop working without warning - • Communities created with this version may be broken by future releases - • Status desktop currently consumes large amounts of bandwidth") - } - - AgreementSection { - body: qsTr("We are working to fix all these issues ASAP") - } - - StatusCheckBox { - id: agreeToUse - objectName: "desktopBetaAgreeCheckBox" - Layout.fillWidth: true - Layout.topMargin: -8 //reduced margin by design - text: qsTr("I’ve read the above and understand that Status Desktop is Beta software") - } - - StatusCheckBox { - id: readyToUse - objectName: "desktopBetaReadyCheckBox" - Layout.fillWidth: true - Layout.topMargin: -16 //reduced margin by design - text: qsTr("I’m ready to use Status Desktop Beta") - } - } - } - - rightButtons: [ - StatusButton { - text: qsTr("I’m ready to use Status Desktop Beta") - enabled: agreeToUse.checked && readyToUse.checked - onClicked: root.close() - objectName: "desktopBetaStatusButton" - } - ] -} diff --git a/ui/imports/shared/popups/qmldir b/ui/imports/shared/popups/qmldir index 86ea37f965..9dd45d6a9a 100644 --- a/ui/imports/shared/popups/qmldir +++ b/ui/imports/shared/popups/qmldir @@ -31,5 +31,4 @@ ReviewContactRequestPopup 1.0 ReviewContactRequestPopup.qml SendContactRequestModal 1.0 SendContactRequestModal.qml SettingsDirtyToastMessage 1.0 SettingsDirtyToastMessage.qml UnblockContactConfirmationDialog 1.0 UnblockContactConfirmationDialog.qml -UserAgreementPopup 1.0 UserAgreementPopup.qml UserStatusContextMenu 1.0 UserStatusContextMenu.qml