diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml index 1b46dd590c..9b79a4f05f 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ChatCommandsPopup.qml @@ -3,7 +3,6 @@ import QtQuick.Controls 2.13 import QtGraphicalEffects 1.13 import "../../../../../imports" import "../../../../../shared" -import "../../../../../shared/status" Popup { id: root @@ -53,13 +52,12 @@ Popup { padding: Style.current.halfPadding spacing: Style.current.halfPadding - StatusChatCommandButton { + + ChatCommandButton { + iconColor: Style.current.purple + iconSource: "../../../../img/send.svg" //% "Send transaction" text: qsTrId("send-transaction") - icon.color: Style.current.purple - icon.name: "send" - icon.width: 16 - icon.height: 18 onClicked: function () { chatCommandModal.sendChatCommand = root.requestAddressForTransaction chatCommandModal.isRequested = false @@ -80,14 +78,12 @@ Popup { } - StatusChatCommandButton { + ChatCommandButton { + iconColor: Style.current.orange + iconSource: "../../../../img/send.svg" + rotatedImage: true //% "Request transaction" text: qsTrId("request-transaction") - icon.color: Style.current.orange - icon.name: "send" - icon.width: 16 - icon.height: 18 - iconRotation: 180 onClicked: function () { chatCommandModal.sendChatCommand = root.requestTransaction chatCommandModal.isRequested = true diff --git a/ui/shared/status/StatusChatCommandsPopup.qml b/ui/shared/status/StatusChatCommandsPopup.qml new file mode 100644 index 0000000000..8c330fff4e --- /dev/null +++ b/ui/shared/status/StatusChatCommandsPopup.qml @@ -0,0 +1,68 @@ +import QtQuick 2.13 +import QtQuick.Controls 2.13 +import QtGraphicalEffects 1.13 +import "../../imports" +import "../../shared" + +Popup { + id: root + width: buttonRow.width + height: buttonRow.height + padding: 0 + margins: 0 + + signal sendTransactionCommandButtonClicked() + signal receiveTransactionCommandButtonClicked() + + background: Rectangle { + color: Style.current.background + radius: Style.current.radius + border.width: 0 + layer.enabled: true + layer.effect: DropShadow { + verticalOffset: 3 + radius: 8 + samples: 15 + fast: true + cached: true + color: "#22000000" + } + } + + Row { + id: buttonRow + anchors.left: parent.left + anchors.leftMargin: 0 + anchors.top: parent.top + anchors.topMargin: 0 + padding: Style.current.halfPadding + spacing: Style.current.halfPadding + + StatusChatCommandButton { + //% "Send transaction" + text: qsTrId("send-transaction") + icon.color: Style.current.purple + icon.name: "send" + icon.width: 16 + icon.height: 18 + onClicked: function () { + root.sendTransactionCommandButtonClicked() + } + } + + + StatusChatCommandButton { + //% "Request transaction" + text: qsTrId("request-transaction") + icon.color: Style.current.orange + icon.name: "send" + icon.width: 16 + icon.height: 18 + iconRotation: 180 + onClicked: function () { + root.sendTransactionCommandButtonClicked() + } + } + + } +} diff --git a/ui/shared/status/qmldir b/ui/shared/status/qmldir index 967c5f286e..ffdaf4ee39 100644 --- a/ui/shared/status/qmldir +++ b/ui/shared/status/qmldir @@ -1,5 +1,6 @@ StatusButton 1.0 StatusButton.qml StatusChatCommandButton 1.0 StatusChatCommandButton.qml +StatusChatCommandPopup 1.0 StatusChatCommandPopup.qml StatusChatInfo 1.0 StatusChatInfo.qml StatusChatInfoButton 1.0 StatusChatInfoButton.qml StatusIconButton 1.0 StatusIconButton.qml