From 298a6c347707be30e58685de5b00de89ec74fa80 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Tue, 30 Jul 2024 12:55:03 -0400 Subject: [PATCH] chore(beta): add beta tag to pairing screens (#15873) (#15901) Fixes #15871 Adds a beta tag to the pairing screens on onboarding and settings --- .../Onboarding/views/KeysMainView.qml | 36 +++++++++++++++++++ .../Profile/stores/ProfileSectionStore.qml | 3 +- .../AppLayouts/Profile/views/SyncingView.qml | 30 ++++++++++------ ui/imports/shared/views/SyncingEnterCode.qml | 7 ++++ 4 files changed, 65 insertions(+), 11 deletions(-) diff --git a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml index fdc4a6f7a8..bf1359452f 100644 --- a/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml +++ b/ui/app/AppLayouts/Onboarding/views/KeysMainView.qml @@ -231,6 +231,14 @@ Item { root.startupStore.doPrimaryAction() } } + + StatusBetaTag { + id: betaTagButton1 + visible: true + anchors.left: button1.right + anchors.leftMargin: 8 + anchors.verticalCenter: button1.verticalCenter + } } StatusBaseText { @@ -334,6 +342,10 @@ Item { target: button1 text: qsTr("Scan or enter a sync code") } + PropertyChanges { + target: betaTagButton1 + visible: true + } PropertyChanges { target: button2 text: qsTr("I don’t have other device") @@ -365,6 +377,10 @@ Item { target: button1 text: "" } + PropertyChanges { + target: betaTagButton1 + visible: false + } PropertyChanges { target: button2 text: qsTr("Login with Keycard") @@ -396,6 +412,10 @@ Item { target: button1 text: qsTr("Generate new keys") } + PropertyChanges { + target: betaTagButton1 + visible: false + } PropertyChanges { target: button2 text: qsTr("Generate keys for a new Keycard") @@ -427,6 +447,10 @@ Item { target: button1 text: qsTr("Import a seed phrase") } + PropertyChanges { + target: betaTagButton1 + visible: false + } PropertyChanges { target: button2 text: qsTr("Import a seed phrase into a new Keycard") @@ -458,6 +482,10 @@ Item { target: button1 text: qsTr("Try to fetch profile again") } + PropertyChanges { + target: betaTagButton1 + visible: false + } PropertyChanges { target: button2 text: qsTr("Create new profile with the same chatkey") @@ -487,6 +515,10 @@ Item { target: button1 text: qsTr("Continue") } + PropertyChanges { + target: betaTagButton1 + visible: false + } PropertyChanges { target: button2 text: "" @@ -518,6 +550,10 @@ Item { target: button1 text: qsTr("Create replacement Keycard with seed phrase") } + PropertyChanges { + target: betaTagButton1 + visible: false + } PropertyChanges { target: button2 text: qsTr("Start using account without keycard") diff --git a/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml b/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml index 432350980a..7f4ccdefb1 100644 --- a/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml +++ b/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml @@ -111,7 +111,8 @@ QtObject { isExperimental: true}) append({subsection: Constants.settingsSubsection.syncingSettings, text: qsTr("Syncing"), - icon: "rotate"}) + icon: "rotate", + isExperimental: true}) } } diff --git a/ui/app/AppLayouts/Profile/views/SyncingView.qml b/ui/app/AppLayouts/Profile/views/SyncingView.qml index 6a2449fd39..5c39c21304 100644 --- a/ui/app/AppLayouts/Profile/views/SyncingView.qml +++ b/ui/app/AppLayouts/Profile/views/SyncingView.qml @@ -169,17 +169,27 @@ SettingsContentBase { spacing: 17 - StatusBaseText { - - objectName: "syncNewDeviceTextLabel" - - Layout.fillWidth: true + Item { + Layout.alignment: Qt.AlignHCenter + height: syncNewDeviceText.height + width: syncNewDeviceText.width Layout.topMargin: -8 - horizontalAlignment: Text.AlignHCenter - color: Theme.palette.primaryColor1 - font.pixelSize: 17 - font.weight: Font.Bold - text: qsTr("Sync a New Device") + + StatusBaseText { + id: syncNewDeviceText + objectName: "syncNewDeviceTextLabel" + + color: Theme.palette.primaryColor1 + font.pixelSize: 17 + font.weight: Font.Bold + text: qsTr("Sync a New Device") + + StatusBetaTag { + anchors.left: parent.right + anchors.leftMargin: 8 + anchors.verticalCenter: parent.verticalCenter + } + } } StatusBaseText { diff --git a/ui/imports/shared/views/SyncingEnterCode.qml b/ui/imports/shared/views/SyncingEnterCode.qml index 56e7691c1b..aae94bf460 100644 --- a/ui/imports/shared/views/SyncingEnterCode.qml +++ b/ui/imports/shared/views/SyncingEnterCode.qml @@ -3,6 +3,7 @@ import QtQuick.Layouts 1.14 import StatusQ.Core 0.1 import StatusQ.Core.Theme 0.1 +import StatusQ.Components 0.1 import StatusQ.Controls 0.1 import StatusQ.Controls.Validators 0.1 @@ -44,6 +45,12 @@ ColumnLayout { } } + StatusBetaTag { + anchors.left: switchTabBar.right + anchors.leftMargin: 8 + anchors.verticalCenter: switchTabBar.verticalCenter + } + StackLayout { Layout.fillWidth: true Layout.preferredHeight: Math.max(syncQr.implicitHeight, syncCode.implicitHeight)