diff --git a/flake.lock b/flake.lock index 497dbfa..eae8aaf 100644 --- a/flake.lock +++ b/flake.lock @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1771237838, - "narHash": "sha256-UcdHiZ5IdfCSOy17WTz04ZV1n4qqycVfwYzI7BkXeuc=", + "lastModified": 1771705420, + "narHash": "sha256-DySEiVMYk2FWLJWar8rlPqfKDeWMqh5EqXSkn2csRO0=", "owner": "logos-co", "repo": "logos-design-system", - "rev": "596811cbb0a0644322267368e87fab80e34203d8", + "rev": "063c4b46accc621bc85fa8baab46b31ef65f3957", "type": "github" }, "original": { @@ -574,14 +574,17 @@ ] }, "locked": { - "lastModified": 1771606875, - "narHash": "sha256-g6YPUN8LtRGAj5OG4PAZNuKyNQL0uTP+5IZEcQVaozE=", - "path": "/Users/khushboomehta/Documents/logos/logos-execution-zone-module", - "type": "path" + "lastModified": 1771696930, + "narHash": "sha256-qEv/HZTBaKe6cDS/42EHmGRocorLqoeELR80LNyiI6c=", + "owner": "logos-blockchain", + "repo": "logos-execution-zone-module", + "rev": "3b7c853d81b4c3bdd6ecea84c84df2d37daed8eb", + "type": "github" }, "original": { - "path": "/Users/khushboomehta/Documents/logos/logos-execution-zone-module", - "type": "path" + "owner": "logos-blockchain", + "repo": "logos-execution-zone-module", + "type": "github" } }, "logos-liblogos": { diff --git a/flake.nix b/flake.nix index eddd990..bd6578d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.follows = "logos-liblogos/nixpkgs"; logos-cpp-sdk.url = "github:logos-co/logos-cpp-sdk"; logos-liblogos.url = "github:logos-co/logos-liblogos"; - logos-execution-zone-module.url = "path:/Users/khushboomehta/Documents/logos/logos-execution-zone-module"; + logos-execution-zone-module.url = "github:logos-blockchain/logos-execution-zone-module"; logos-capability-module.url = "github:logos-co/logos-capability-module"; logos-design-system.url = "github:logos-co/logos-design-system"; logos-design-system.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/src/qml/views/OnboardingView.qml b/src/qml/views/OnboardingView.qml index f047c5c..ae32c1f 100644 --- a/src/qml/views/OnboardingView.qml +++ b/src/qml/views/OnboardingView.qml @@ -44,8 +44,9 @@ Control { RowLayout { Layout.fillWidth: true spacing: Theme.spacing.small - CustomTextField { + LogosTextField { id: storagePathField + Layout.fillWidth: true placeholderText: qsTr("/Users/you/.lez-wallet/") } LogosButton { @@ -54,7 +55,7 @@ Control { } } LogosText { - text: qsTr("Config file (optional)") + text: qsTr("Config file") font.pixelSize: Theme.typography.secondaryText font.weight: Theme.typography.weightMedium color: Theme.palette.text @@ -62,11 +63,13 @@ Control { RowLayout { Layout.fillWidth: true spacing: Theme.spacing.small - CustomTextField { + LogosTextField { id: configPathField - placeholderText: qsTr("Use default config") + Layout.fillWidth: true + placeholderText: qsTr("Add path to config") } LogosButton { + Layout.preferredHeight: configPathField.height text: qsTr("Browse") onClicked: configFileDialog.open() } @@ -79,13 +82,15 @@ Control { color: Theme.palette.text Layout.topMargin: Theme.spacing.medium } - CustomTextField { + LogosTextField { id: passwordField + Layout.fillWidth: true placeholderText: qsTr("Password") echoMode: TextInput.Password } - CustomTextField { + LogosTextField { id: confirmField + Layout.fillWidth: true placeholderText: qsTr("Confirm") echoMode: TextInput.Password } @@ -115,43 +120,6 @@ Control { } } } - - component CustomTextField: Item { - id: textFieldRoot - Layout.fillWidth: true - implicitHeight: 40 - property alias text: input.text - property string placeholderText: "" - property int echoMode: TextInput.Normal - Rectangle { - anchors.fill: parent - radius: Theme.spacing.radiusSmall - color: Theme.palette.backgroundSecondary - border.width: 1 - border.color: input.activeFocus ? Theme.palette.overlayOrange : Theme.palette.backgroundElevated - } - Text { - id: placeholder - anchors.fill: parent - anchors.leftMargin: 12 - anchors.rightMargin: 12 - verticalAlignment: Text.AlignVCenter - text: textFieldRoot.placeholderText - color: Theme.palette.textMuted - font.pixelSize: Theme.typography.secondaryText - visible: input.text.length === 0 - } - TextInput { - id: input - anchors.fill: parent - anchors.leftMargin: 12 - anchors.rightMargin: 12 - verticalAlignment: Text.AlignVCenter - font.pixelSize: Theme.typography.secondaryText - color: Theme.palette.text - echoMode: textFieldRoot.echoMode - } - } } FolderDialog {