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 tx bubbles

This commit is contained in:
Pascal Precht 2020-10-12 16:52:32 +02:00
parent 8b465c20f7
commit 41e5626bfa
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/TransactionBubble.qml
View File

@ -83,8 +83,8 @@ Item {
switch (root.state) { switch (root.state) {
case Constants.pending: case Constants.pending:
case Constants.confirmed: case Constants.confirmed:
case Constants.addressRequested: return isCurrentUser
case Constants.transactionRequested: case Constants.transactionRequested:
case Constants.addressRequested: return isCurrentUser
case Constants.declined: case Constants.declined:
case Constants.transactionDeclined: case Constants.transactionDeclined:
case Constants.addressReceived: return !isCurrentUser case Constants.addressReceived: return !isCurrentUser
@ -190,7 +190,7 @@ Item {
id: buttonsLoader id: buttonsLoader
active: (root.state === Constants.addressRequested && !root.outgoing) || active: (root.state === Constants.addressRequested && !root.outgoing) ||
(root.state === Constants.addressReceived && root.outgoing) || (root.state === Constants.addressReceived && root.outgoing) ||
(root.state === Constants.transactionRequested) (root.state === Constants.transactionRequested && !root.outgoing)
sourceComponent: root.outgoing ? signAndSendComponent : acceptTransactionComponent sourceComponent: root.outgoing ? signAndSendComponent : acceptTransactionComponent
anchors.top: bubbleLoader.active ? bubbleLoader.bottom : valueContainer.bottom anchors.top: bubbleLoader.active ? bubbleLoader.bottom : valueContainer.bottom
anchors.topMargin: bubbleLoader.active ? root.innerMargin : 20 anchors.topMargin: bubbleLoader.active ? root.innerMargin : 20