status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-18 09:37:59 +00:00
Code Issues Projects Releases Wiki Activity

fix(@desktop/wallet): derivation path edit control breaks in custom mode

Browse Source 
Closes: #10479
This commit is contained in:
Sale Djenic 2023-05-03 13:18:50 +02:00 committed by saledjenic
parent 6a0a7770b2
commit 3588e2a44a
3 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/app/AppLayouts/Wallet/addaccount/panels/DerivationPath.qml
View File

@ -61,9 +61,6 @@ GridLayout {
Layout.fillWidth: true Layout.fillWidth: true
enabled: root.store.derivedAddressModel.count > 0 enabled: root.store.derivedAddressModel.count > 0
initialDerivationPath: root.store.addAccountModule.derivationPath
initialBasePath: root.store.selectedRootPath
levelsLimit: 4 // Allow only 5 separators in the derivation path levelsLimit: 4 // Allow only 5 separators in the derivation path
onDerivationPathChanged: { onDerivationPathChanged: {
@ -104,13 +101,11 @@ GridLayout {
onSelected: { onSelected: {
root.store.changeRootDerivationPath(rootPath) root.store.changeRootDerivationPath(rootPath)
derivationPathInput.resetDerivationPath(root.store.selectedRootPath, root.store.addAccountModule.derivationPath)
} }
} }
}
Connections { Component.onCompleted: {
target: root.store
function onSelectedRootPathChanged() {
derivationPathInput.resetDerivationPath(root.store.selectedRootPath, root.store.addAccountModule.derivationPath) derivationPathInput.resetDerivationPath(root.store.selectedRootPath, root.store.addAccountModule.derivationPath)
} }
} }

7
ui/app/AppLayouts/Wallet/addaccount/panels/DerivationPathInput.qml
View File

@ -18,9 +18,6 @@ Item {
readonly property alias derivationPath: d.currentDerivationPath readonly property alias derivationPath: d.currentDerivationPath
readonly property alias basePath: d.currentBasePath readonly property alias basePath: d.currentBasePath
required property string initialDerivationPath
required property string initialBasePath
property alias levelsLimit: controller.levelsLimit property alias levelsLimit: controller.levelsLimit
property alias errorMessage: d.errorMessage property alias errorMessage: d.errorMessage
@ -86,10 +83,6 @@ Item {
} }
} }
Component.onCompleted: {
resetDerivationPath(root.initialBasePath, root.initialDerivationPath)
}
Internals.Controller { Internals.Controller {
id: controller id: controller

11
ui/app/AppLayouts/Wallet/addaccount/panels/DerivationPathSection.qml
View File

@ -104,11 +104,12 @@ Column {
store: root.store store: root.store
} }
DerivationPathDisplay { Loader {
visible: root.store.editMode active: root.store.editMode
width: parent.width - 2 * root.padding sourceComponent: DerivationPathDisplay {
width: parent.width - 2 * root.padding
store: root.store store: root.store
}
} }
states: [ states: [