mirror of
https://github.com/status-im/status-desktop.git
synced 2025-02-27 14:01:19 +00:00
feat: Fixes
This commit is contained in:
parent
d1ccce5d4d
commit
04341f0321
@ -391,6 +391,7 @@ Item {
|
|||||||
d.activeChatContentModule.inputAreaModule.setLinkPreviewEnabledForCurrentMessage(false)
|
d.activeChatContentModule.inputAreaModule.setLinkPreviewEnabledForCurrentMessage(false)
|
||||||
}
|
}
|
||||||
onDismissLinkPreview: (index) => d.activeChatContentModule.inputAreaModule.removeLinkPreviewData(index)
|
onDismissLinkPreview: (index) => d.activeChatContentModule.inputAreaModule.removeLinkPreviewData(index)
|
||||||
|
onRemovePaymentRequest: (index) => d.activeChatContentModule.inputAreaModule.removePaymentRequestPreviewData(index)
|
||||||
}
|
}
|
||||||
|
|
||||||
ChatPermissionQualificationPanel {
|
ChatPermissionQualificationPanel {
|
||||||
|
@ -47,7 +47,7 @@ Control {
|
|||||||
signal linkReload(string link)
|
signal linkReload(string link)
|
||||||
signal linkClicked(string link)
|
signal linkClicked(string link)
|
||||||
|
|
||||||
signal paymentRequestRemoved(int index)
|
signal removePaymentRequest(int index)
|
||||||
|
|
||||||
signal enableLinkPreview()
|
signal enableLinkPreview()
|
||||||
signal enableLinkPreviewForThisMessage()
|
signal enableLinkPreviewForThisMessage()
|
||||||
@ -112,7 +112,7 @@ Control {
|
|||||||
|
|
||||||
amount: model.amount
|
amount: model.amount
|
||||||
symbol: model.symbol
|
symbol: model.symbol
|
||||||
onClose: root.paymentRequestRemoved(model.index)
|
onClose: root.removePaymentRequest(model.index)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Repeater {
|
Repeater {
|
||||||
|
@ -71,13 +71,25 @@ CalloutCard {
|
|||||||
font.pixelSize: Theme.additionalTextSize
|
font.pixelSize: Theme.additionalTextSize
|
||||||
font.weight: Font.Medium
|
font.weight: Font.Medium
|
||||||
}
|
}
|
||||||
StatusBaseText {
|
RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
|
StatusBaseText {
|
||||||
|
Layout.maximumWidth: parent.width * 0.8
|
||||||
|
Layout.fillHeight: true
|
||||||
font.pixelSize: Theme.tertiaryTextFontSize
|
font.pixelSize: Theme.tertiaryTextFontSize
|
||||||
color: Theme.palette.baseColor1
|
color: Theme.palette.baseColor1
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
text: "%1 %2".arg(root.amount).arg(root.symbol)
|
elide: Text.ElideRight
|
||||||
|
text: root.amount
|
||||||
|
}
|
||||||
|
StatusBaseText {
|
||||||
|
Layout.fillHeight: true
|
||||||
|
font.pixelSize: Theme.tertiaryTextFontSize
|
||||||
|
color: Theme.palette.baseColor1
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
text: root.symbol
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +37,7 @@ Rectangle {
|
|||||||
signal disableLinkPreview()
|
signal disableLinkPreview()
|
||||||
signal dismissLinkPreviewSettings()
|
signal dismissLinkPreviewSettings()
|
||||||
signal dismissLinkPreview(int index)
|
signal dismissLinkPreview(int index)
|
||||||
|
signal removePaymentRequest(int index)
|
||||||
|
|
||||||
property var usersModel
|
property var usersModel
|
||||||
property SharedStores.RootStore sharedStore
|
property SharedStores.RootStore sharedStore
|
||||||
@ -1224,6 +1225,7 @@ Rectangle {
|
|||||||
topPadding: 12
|
topPadding: 12
|
||||||
imagePreviewArray: control.fileUrlsAndSources
|
imagePreviewArray: control.fileUrlsAndSources
|
||||||
linkPreviewModel: control.linkPreviewModel
|
linkPreviewModel: control.linkPreviewModel
|
||||||
|
paymentRequestModel: control.paymentRequestModel
|
||||||
showLinkPreviewSettings: control.askToEnableLinkPreview
|
showLinkPreviewSettings: control.askToEnableLinkPreview
|
||||||
onImageRemoved: (index) => {
|
onImageRemoved: (index) => {
|
||||||
//Just do a copy and replace the whole thing because it's a plain JS array and thre's no signal when a single item is removed
|
//Just do a copy and replace the whole thing because it's a plain JS array and thre's no signal when a single item is removed
|
||||||
@ -1242,6 +1244,7 @@ Rectangle {
|
|||||||
onDisableLinkPreview: () => control.disableLinkPreview()
|
onDisableLinkPreview: () => control.disableLinkPreview()
|
||||||
onDismissLinkPreviewSettings: () => control.dismissLinkPreviewSettings()
|
onDismissLinkPreviewSettings: () => control.dismissLinkPreviewSettings()
|
||||||
onDismissLinkPreview: (index) => control.dismissLinkPreview(index)
|
onDismissLinkPreview: (index) => control.dismissLinkPreview(index)
|
||||||
|
onRemovePaymentRequest: (index) => control.removePaymentRequest(index)
|
||||||
}
|
}
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
|
@ -68,7 +68,7 @@ Flow {
|
|||||||
model: root.paymentRequestModel
|
model: root.paymentRequestModel
|
||||||
delegate: PaymentRequestCardDelegate {
|
delegate: PaymentRequestCardDelegate {
|
||||||
required property var model
|
required property var model
|
||||||
objectName: "RpaymentRequestDelegate_" + model.index
|
objectName: "PaymentRequestDelegate_" + model.index
|
||||||
amount: model.amount
|
amount: model.amount
|
||||||
symbol: model.symbol
|
symbol: model.symbol
|
||||||
address: model.receiver
|
address: model.receiver
|
||||||
|
Loading…
x
Reference in New Issue
Block a user