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

Use ClipboardUtils.text instead of backend-dependent getFromClipboard

This commit is contained in:
Michał Cieślak 2024-08-27 23:48:34 +02:00 committed by Michał
parent a8940a71f5
commit 9c3b8fc34b
7 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
storybook/qmlTests/tests/tst_EnterSeedPhrase.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import QtQml 2.15
import QtQml.Models 2.15
import StatusQ 0.1
import StatusQ.Core.Utils 0.1
import QtTest 1.15
@ -133,9 +134,7 @@ Item {
itemUnderTest.dictionary.append(expectedSeedPhrase.map((word) => ({seedWord: word})))
const clipboardHelper = createTemporaryQmlObject("import QtQuick 2.15; QtObject { property var getFromClipboard }", root)
clipboardHelper.getFromClipboard = () => expectedSeedPhrase.join(" ")
Utils.globalUtilsInst = clipboardHelper
ClipboardUtils.setText(expectedSeedPhrase.join(" "))
// Trigger the paste action
keyClick("v", Qt.ControlModifier)
@ -239,9 +238,7 @@ Item {
itemUnderTest.dictionary.append(dictionaryVariation.map((word) => ({seedWord: word})))
const clipboardHelper = createTemporaryQmlObject("import QtQuick 2.15; QtObject { property var getFromClipboard }", root)
clipboardHelper.getFromClipboard = () => expectedSeedPhrase.join(" ")
Utils.globalUtilsInst = clipboardHelper
ClipboardUtils.setText(expectedSeedPhrase.join(" "))
// Trigger the paste action
keyClick("v", Qt.ControlModifier)

3
ui/app/AppLayouts/Profile/popups/SendContactRequestModal.qml
View File

@ -4,6 +4,7 @@ import QtQuick.Layouts 1.14
import utils 1.0
import StatusQ 0.1
import StatusQ.Controls 0.1
import StatusQ.Controls.Validators 0.1
import StatusQ.Core 0.1
@ -110,7 +111,7 @@ StatusModal {
size: StatusBaseButton.Size.Tiny
text: qsTr("Paste")
onClicked: {
d.realChatKey = root.contactsStore.getFromClipboard()
d.realChatKey = ClipboardUtils.text
d.showPasteButton = false
d.textChanged(d.realChatKey)
}

4
ui/app/AppLayouts/Profile/stores/ContactsStore.qml
View File

@ -51,10 +51,6 @@ QtObject {
return root.globalUtilsInst.generateAlias(pubKey)
}
function getFromClipboard() {
return root.globalUtilsInst.getFromClipboard()
}
function isMyMutualContact(pubKey) {
return root.contactsModule.isMyMutualContact(pubKey)
}

3
ui/imports/shared/panels/EnterSeedPhrase.qml
View File

@ -1,6 +1,7 @@
import QtQuick 2.14
import QtQuick.Layouts 1.14
import StatusQ 0.1
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Core.Utils 0.1
@ -96,7 +97,7 @@ ColumnLayout {
}
function pasteWords () {
const clipboardText = Utils.getFromClipboard()
const clipboardText = ClipboardUtils.text
// Split words separated by commas and or blank spaces (spaces, enters, tabs)
const words = clipboardText.trim().split(/[, \s]+/)

4
ui/imports/shared/popups/common/BasePopupStore.qml
View File

@ -19,8 +19,4 @@ QtObject {
property var submitPopup: function(){}
property var changeSeedPhrase: function(){}
property var validSeedPhrase: function(){}
function getFromClipboard() {
return globalUtils.getFromClipboard()
}
}

3
ui/imports/shared/popups/common/EnterPrivateKey.qml
View File

@ -2,6 +2,7 @@ import QtQuick 2.14
import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14
import StatusQ 0.1
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Controls 0.1
@ -79,7 +80,7 @@ Item {
size: StatusBaseButton.Size.Tiny
text: qsTr("Paste")
onClicked: {
privKeyInput.text = root.store.getFromClipboard()
privKeyInput.text = ClipboardUtils.text
}
}
}

4
ui/imports/utils/Utils.qml
View File

@ -714,10 +714,6 @@ QtObject {
return text
}
function getFromClipboard() {
return globalUtilsInst.getFromClipboard()
}
function copyImageToClipboardByUrl(content) {
globalUtilsInst.copyImageToClipboardByUrl(content)
}