status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-13 07:06:58 +00:00
Code Issues Projects Releases Wiki Activity

feat: Remove beta popup (#17264)

Browse Source 
* feat: Remove beta popup

* chore(@e2e): remove beta consent popup

---------

Co-authored-by: Anastasiya <anastasija.ig@gmail.com>
This commit is contained in:
Cuteivist 2025-02-11 10:18:16 +01:00 committed by GitHub
parent 90461d787c
commit 289c14aefd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 0 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
storybook/pages/UserAgreementPopupPage.qml
View File

@ -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

24
test/e2e/gui/components/onboarding/beta_consent_popup.py
View File

@ -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()

5
test/e2e/gui/main_window.py
View File

@ -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:

3
test/e2e/helpers/OnboardingHelper.py
View File

@ -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()

3
test/e2e/tests/crtitical_tests_prs/test_onboarding_generate_account_back_up_seed.py
View File

@ -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()

3
test/e2e/tests/crtitical_tests_prs/test_onboarding_sync_with_code.py
View File

@ -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()

3
test/e2e/tests/onboarding/test_onboarding_negative_scenarios.py
View File

@ -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()

10
ui/app/mainui/AppMain.qml
View File

@ -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 {}

97
ui/imports/shared/popups/UserAgreementPopup.qml
View File

@ -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"
}
]
}

1
ui/imports/shared/popups/qmldir
View File

@ -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