diff --git a/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml b/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml index a6bb2677b4..44d73a455d 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml @@ -17,7 +17,7 @@ OnboardingPage { signal syncProceedWithConnectionString(string connectionString) - title: qsTr("Log in by syncing") + title: qsTr("Pair devices to sync") contentItem: Item { ColumnLayout { @@ -35,7 +35,7 @@ OnboardingPage { } StatusBaseText { Layout.fillWidth: true - Layout.topMargin: -12 + Layout.topMargin: -Theme.bigPadding text: qsTr("If you have Status on another device") color: Theme.palette.baseColor1 wrapMode: Text.WordWrap @@ -47,7 +47,6 @@ OnboardingPage { Layout.alignment: Qt.AlignHCenter validateConnectionString: root.validateConnectionString - secondTabName: qsTr("Enter code") showBetaTag: false onDisplayInstructions: instructionsPopup.createObject(root).open() diff --git a/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml b/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml index c937b9b754..3cbdbd1c6e 100644 --- a/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml +++ b/ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml @@ -73,7 +73,7 @@ OnboardingPage { when: root.syncState === Onboarding.ProgressState.Failed PropertyChanges { target: root - title: "".arg(Theme.palette.dangerColor1) + qsTr("Profile syncing failed") + "" + title: "".arg(Theme.palette.dangerColor1) + qsTr("Failed to pair devices") + "" } PropertyChanges { target: subtitle @@ -165,7 +165,7 @@ OnboardingPage { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: 240 id: tryAgainButton - text: qsTr("Try to sync again") + text: qsTr("Try to pair again") visible: false onClicked: root.restartSyncRequested() } diff --git a/ui/imports/shared/views/SyncingEnterCode.qml b/ui/imports/shared/views/SyncingEnterCode.qml index 050d60b164..48f060985f 100644 --- a/ui/imports/shared/views/SyncingEnterCode.qml +++ b/ui/imports/shared/views/SyncingEnterCode.qml @@ -126,18 +126,14 @@ ColumnLayout { } } - StatusFlatButton { + StatusButton { Layout.topMargin: Theme.xlPadding Layout.alignment: Qt.AlignHCenter visible: switchTabBar.currentIndex == 0 && !!root.firstInstructionButtonName || switchTabBar.currentIndex == 1 && !!root.secondInstructionButtonName - text: switchTabBar.currentIndex == 0? - root.firstInstructionButtonName : - root.secondInstructionButtonName + text: switchTabBar.currentIndex == 0 ? root.firstInstructionButtonName : root.secondInstructionButtonName font.pixelSize: Theme.additionalTextSize - normalColor: "transparent" - borderWidth: 1 - borderColor: Theme.palette.baseColor2 + isOutline: true onClicked: { root.displayInstructions() }