status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@wallet): receive modal 

fixes #4534
This commit is contained in:
Anthony Laibe 2022-01-24 12:41:55 +01:00 committed by Sale Djenic
parent 2e3d252fec
commit 234af3283e
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/AppLayouts/Wallet/popups/ReceiveModal.qml
View File

@ -64,11 +64,15 @@ ModalPopup {
} }
Input { Input {
id: txtWalletAddress id: txtWalletAddress
//% "Wallet address" //% "Wallet address"
label: qsTrId("wallet-address") label: qsTrId("wallet-address")
anchors.top: accountSelector.bottom anchors.top: accountSelector.bottom
anchors.topMargin: Style.current.padding anchors.topMargin: Style.current.padding
anchors.left: parent.left
anchors.leftMargin: Style.current.padding
anchors.right: parent.right
anchors.rightMargin: Style.current.padding
copyToClipboard: true copyToClipboard: true
textField.readOnly: true textField.readOnly: true
customHeight: 56 customHeight: 56

4
ui/app/AppLayouts/Wallet/stores/RootStore.qml
View File

@ -138,9 +138,7 @@ QtObject {
} }
function getQrCode(address) { function getQrCode(address) {
// TODO: Move to transaction root module and not wallet return globalUtils.qrCode(address)
// Not Refactored Yet
// return profileModel.qrCode(address)
} }
function hex2Dec(value) { function hex2Dec(value) {

31
ui/imports/shared/controls/Input.qml
View File

@ -8,6 +8,7 @@ import utils 1.0
import "../panels" import "../panels"
import "../controls" import "../controls"
import "../stores"
Item { Item {
id: inputBox id: inputBox
@ -88,7 +89,7 @@ Item {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 0 anchors.bottomMargin: 0
anchors.right: clipboardButtonLoader.active ? clipboardButtonLoader.left : parent.right anchors.right: clipboardButtonLoader.active ? clipboardButtonLoader.left : parent.right
anchors.rightMargin: parent.rightMargin anchors.rightMargin: clipboardButtonLoader.active ? Style.current.padding : parent.rightMargin
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 0 anchors.leftMargin: 0
leftPadding: inputBox.hasIcon ? iconWidth + 20 : Style.current.padding leftPadding: inputBox.hasIcon ? iconWidth + 20 : Style.current.padding
@ -144,7 +145,7 @@ Item {
active: inputBox.copyToClipboard || inputBox.pasteFromClipboard active: inputBox.copyToClipboard || inputBox.pasteFromClipboard
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 8 anchors.rightMargin: Style.current.padding
sourceComponent: Component { sourceComponent: Component {
Item { Item {
width: copyBtn.width width: copyBtn.width
@ -172,23 +173,19 @@ Item {
qsTrId("paste") qsTrId("paste")
} }
height: 28
font.pixelSize: 12
size: StatusBaseButton.Size.Small
onClicked: { onClicked: {
// Not Refactored Yet if (inputBox.copyToClipboard) {
// if (inputBox.copyToClipboard) { RootStore.copyToClipboard(inputBox.textToCopy ? inputBox.textToCopy : inputValue.text)
// chatsModel.copyToClipboard(inputBox.textToCopy ? inputBox.textToCopy : inputValue.text) } else {
// } else { if (inputValue.canPaste) {
// if (inputValue.canPaste) { inputValue.paste()
// inputValue.paste() }
// } }
// }
// copyBtn.copied = true copyBtn.copied = true
// timer.setTimeout(function() { timer.setTimeout(function() {
// copyBtn.copied = false copyBtn.copied = false
// }, 2000); }, 2000);
} }
} }
} }

4
ui/imports/shared/stores/RootStore.qml
View File

@ -69,8 +69,8 @@ QtObject {
// return walletModelInst.transactionsView.transferTokens(from, to, address, amount, gasLimit, gasPrice, tipLimit, overallLimit, password, uuid); // return walletModelInst.transactionsView.transferTokens(from, to, address, amount, gasLimit, gasPrice, tipLimit, overallLimit, password, uuid);
} }
function copyToClipboard(textToCopy) { function copyToClipboard(text) {
// chatsModelInst.copyToClipboard(textToCopy) globalUtils.copyToClipboard(text)
} }
property var gifColumnA: chatSectionChatContentInputArea.gifColumnA property var gifColumnA: chatSectionChatContentInputArea.gifColumnA