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

fix(Onboarding): fix wording and terminology in LoginBySyncingFlow

Browse Source 
- basically Sync -> Pair where needed
This commit is contained in:
Lukáš Tinkl 2025-02-14 14:04:03 +01:00 committed by Lukáš Tinkl
parent 311657428a
commit fdb5fb5077
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/app/AppLayouts/Onboarding2/pages/LoginBySyncingPage.qml
View File

@ -17,7 +17,7 @@ OnboardingPage {
signal syncProceedWithConnectionString(string connectionString) signal syncProceedWithConnectionString(string connectionString)
title: qsTr("Log in by syncing") title: qsTr("Pair devices to sync")
contentItem: Item { contentItem: Item {
ColumnLayout { ColumnLayout {
@ -35,7 +35,7 @@ OnboardingPage {
} }
StatusBaseText { StatusBaseText {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -12 Layout.topMargin: -Theme.bigPadding
text: qsTr("If you have Status on another device") text: qsTr("If you have Status on another device")
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
@ -47,7 +47,6 @@ OnboardingPage {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
validateConnectionString: root.validateConnectionString validateConnectionString: root.validateConnectionString
secondTabName: qsTr("Enter code")
showBetaTag: false showBetaTag: false
onDisplayInstructions: instructionsPopup.createObject(root).open() onDisplayInstructions: instructionsPopup.createObject(root).open()

4
ui/app/AppLayouts/Onboarding2/pages/SyncProgressPage.qml
View File

@ -73,7 +73,7 @@ OnboardingPage {
when: root.syncState === Onboarding.ProgressState.Failed when: root.syncState === Onboarding.ProgressState.Failed
PropertyChanges { PropertyChanges {
target: root target: root
title: "<font color='%1'>".arg(Theme.palette.dangerColor1) + qsTr("Profile syncing failed") + "</font>" title: "<font color='%1'>".arg(Theme.palette.dangerColor1) + qsTr("Failed to pair devices") + "</font>"
} }
PropertyChanges { PropertyChanges {
target: subtitle target: subtitle
@ -165,7 +165,7 @@ OnboardingPage {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: 240 Layout.preferredWidth: 240
id: tryAgainButton id: tryAgainButton
text: qsTr("Try to sync again") text: qsTr("Try to pair again")
visible: false visible: false
onClicked: root.restartSyncRequested() onClicked: root.restartSyncRequested()
} }

10
ui/imports/shared/views/SyncingEnterCode.qml
View File

@ -126,18 +126,14 @@ ColumnLayout {
} }
} }
StatusFlatButton { StatusButton {
Layout.topMargin: Theme.xlPadding Layout.topMargin: Theme.xlPadding
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
visible: switchTabBar.currentIndex == 0 && !!root.firstInstructionButtonName || visible: switchTabBar.currentIndex == 0 && !!root.firstInstructionButtonName ||
switchTabBar.currentIndex == 1 && !!root.secondInstructionButtonName switchTabBar.currentIndex == 1 && !!root.secondInstructionButtonName
text: switchTabBar.currentIndex == 0? text: switchTabBar.currentIndex == 0 ? root.firstInstructionButtonName : root.secondInstructionButtonName
root.firstInstructionButtonName :
root.secondInstructionButtonName
font.pixelSize: Theme.additionalTextSize font.pixelSize: Theme.additionalTextSize
normalColor: "transparent" isOutline: true
borderWidth: 1
borderColor: Theme.palette.baseColor2
onClicked: { onClicked: {
root.displayInstructions() root.displayInstructions()
} }