status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-21 11:08:55 +00:00
Code Issues Projects Releases Wiki Activity

fix(AddAccountPopup): layout issues

Browse Source 
Closes #6315
This commit is contained in:
Alexandra Betouni 2022-07-07 18:35:23 +03:00 committed by Alexandra Betouni
parent 51b661386a
commit 353110d4ae
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/app/AppLayouts/Wallet/panels/ImportSeedPhrasePanel.qml
View File

@ -49,8 +49,8 @@ GridView {
QtObject {
id: _internal
property int seedPhraseInputHeight: 44
property int seedPhraseInputWidth: 220
property int seedPhraseInputWidth: (parent.width/2)
property int seedPhraseInputHeight: 48
property var mnemonicInput: []
property string errorString: ""
readonly property var seedPhraseWordsOptions: ([12, 18, 24])
@ -66,8 +66,8 @@ GridView {
}
}
cellHeight: _internal.seedPhraseInputHeight + Style.current.halfPadding
cellWidth: _internal.seedPhraseInputWidth + Style.current.halfPadding
cellWidth: _internal.seedPhraseInputWidth
cellHeight: _internal.seedPhraseInputHeight
interactive: false
z: 100000
@ -161,8 +161,8 @@ GridView {
delegate: StatusSeedPhraseInput {
id: statusSeedInput
width: _internal.seedPhraseInputWidth
height: _internal.seedPhraseInputHeight
width: grid.cellWidth - (Style.current.halfPadding/2)
height: (grid.cellHeight - Style.current.halfPadding)
textEdit.errorMessageCmp.visible: false
leftComponentText: index + 1
inputList: BIP39_en { }
@ -223,12 +223,10 @@ GridView {
}
footer: Item {
id: footerC
function switchToIndex(index) {
changeSeedNbWordsTabBar.currentIndex = index
}
width: grid.width - Style.current.padding
width: grid.width - (Style.current.halfPadding/2)
height: changeSeedNbWordsTabBar.height + errorMessage.height + Style.current.padding*2
StatusBaseText {
id: errorMessage
@ -249,9 +247,9 @@ GridView {
}
StatusSwitchTabBar {
id: changeSeedNbWordsTabBar
width: parent.width
anchors.top: errorMessage.bottom
anchors.topMargin: Style.current.padding
anchors.horizontalCenter: parent.horizontalCenter
Repeater {
model: _internal.seedPhraseWordsOptions
StatusSwitchTabButton {

1
ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
View File

@ -205,7 +205,6 @@ StatusModal {
expandable: true
expandableComponent: AdvancedAddAccountView {
width: parent.width
Layout.margins: Style.current.padding
Component.onCompleted: advancedSelection.isValid = Qt.binding(function(){return isValid})
onCalculateDerivedPath: _internal.getDerivedAddressList()
onEnterPressed: {

14
ui/app/AppLayouts/Wallet/views/AdvancedAddAccountView.qml
View File

@ -97,7 +97,6 @@ ColumnLayout {
SelectGeneratedAccount {
id: selectGeneratedAccount
Layout.margins: Style.current.padding
Component.onCompleted: {
advancedSection.addAccountType = Qt.binding(function() {return addAccountType})
advancedSection.derivedFromAddress = Qt.binding(function() {return derivedFromAddress})
@ -112,9 +111,8 @@ ColumnLayout {
ImportSeedPhrasePanel {
id: importSeedPhrasePanel
Layout.preferredWidth: parent.width
Layout.preferredHeight: visible ? importSeedPhrasePanel.preferredHeight: 0
Layout.leftMargin: Style.current.padding
Layout.rightMargin: Style.current.padding
Layout.preferredHeight: importSeedPhrasePanel.preferredHeight
Layout.leftMargin: (Style.current.halfPadding/4)
visible: advancedSection.addAccountType === SelectGeneratedAccount.AddAccountType.ImportSeedPhrase && advancedSection.visible
onMnemonicStringChanged: {
advancedSection.mnemonicText = mnemonicString
@ -142,20 +140,20 @@ ColumnLayout {
}
RowLayout {
Layout.margins: Style.current.padding
Layout.preferredWidth: parent.width
Layout.fillWidth: true
Layout.rightMargin: 2
spacing: Style.current.bigPadding
visible: advancedSection.addAccountType !== SelectGeneratedAccount.AddAccountType.ImportPrivateKey &&
advancedSection.addAccountType !== SelectGeneratedAccount.AddAccountType.WatchOnly
DerivationPathsPanel {
id: derivationPathsPanel
Layout.preferredWidth: 213
Layout.preferredWidth: ((parent.width - (Style.current.bigPadding/2))/2)
Layout.alignment: Qt.AlignTop
Component.onCompleted: advancedSection.path = Qt.binding(function() { return derivationPathsPanel.path})
}
DerivedAddressesPanel {
id: derivedAddressesPanel
Layout.preferredWidth: 213
Layout.preferredWidth: ((parent.width - (Style.current.bigPadding/2))/2)
Layout.alignment: Qt.AlignTop
Component.onCompleted: advancedSection.pathSubFix = Qt.binding(function() { return derivedAddressesPanel.pathSubFix})
}