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

feat: Card fixes

This commit is contained in:
Emil Sawicki 2024-12-02 08:37:54 +01:00
parent 7c844964e6
commit fa85173e0a
12 changed files with 120 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storybook/pages/LinksMessageViewPage.qml
View File

@ -32,6 +32,7 @@ SplitView {
linkPreviewModel: mockedLinkPreviewModel
gifLinks: [ "https://media.tenor.com/qN_ytiwLh24AAAAC/cold.gif" ]
paymentRequestModel: mockedPaymentRequestModel
areTestNetworksEnabled: false
senderName: "Alice"
@ -77,6 +78,11 @@ SplitView {
checked: linksMessageView.isOnline
onToggled: linksMessageView.isOnline = !linksMessageView.isOnline
}
CheckBox {
text: qsTr("Testnet enabled")
checked: linksMessageView.areTestNetworksEnabled
onToggled: linksMessageView.areTestNetworksEnabled = !linksMessageView.areTestNetworksEnabled
}
}
}
}

14
ui/app/AppLayouts/Chat/views/ChatColumnView.qml
View File

@ -200,6 +200,14 @@ Item {
// Call later to make sure activeUsersStore and activeMessagesStore bindings are updated
Qt.callLater(d.restoreInputState, preservedText)
}
function formatBalance(amount, symbol) {
let asset = ModelUtils.getByKey(WalletStore.RootStore.tokensStore.flatTokensModel, "symbol", symbol)
if (!asset)
return "0"
const num = AmountsArithmetic.toNumber(amount, asset.decimals)
return root.rootStore.currencyStore.formatCurrencyAmount(num, symbol, {noSynbol: true})
}
}
EmptyChatPanel {
@ -238,11 +246,13 @@ Item {
utilsStore: root.utilsStore
rootStore: root.rootStore
contactsStore: root.contactsStore
formatBalance: d.formatBalance
emojiPopup: root.emojiPopup
stickersPopup: root.stickersPopup
stickersLoaded: root.stickersLoaded
isBlocked: model.blocked
sendViaPersonalChatEnabled: root.sendViaPersonalChatEnabled
areTestNetworksEnabled: root.areTestNetworksEnabled
onOpenStickerPackPopup: {
root.openStickerPackPopup(stickerPackId)
}
@ -294,6 +304,8 @@ Item {
sharedStore: root.sharedRootStore
linkPreviewModel: !!d.activeChatContentModule ? d.activeChatContentModule.inputAreaModule.linkPreviewModel : null
paymentRequestModel: !!d.activeChatContentModule ? d.activeChatContentModule.inputAreaModule.paymentRequestModel : null
formatBalance: d.formatBalance
urlsList: d.urlsList
askToEnableLinkPreview: {
if(!d.activeChatContentModule || !d.activeChatContentModule.inputAreaModule || !d.activeChatContentModule.inputAreaModule.preservedProperties)
@ -391,7 +403,7 @@ Item {
d.activeChatContentModule.inputAreaModule.setLinkPreviewEnabledForCurrentMessage(false)
}
onDismissLinkPreview: (index) => d.activeChatContentModule.inputAreaModule.removeLinkPreviewData(index)
onRemovePaymentRequestPreviewRequested: (index) => d.activeChatContentModule.inputAreaModule.removePaymentRequestPreviewData(index)
onRemovePaymentRequestPreview: (index) => d.activeChatContentModule.inputAreaModule.removePaymentRequestPreviewData(index)
}
ChatPermissionQualificationPanel {

4
ui/app/AppLayouts/Chat/views/ChatContentView.qml
View File

@ -38,8 +38,10 @@ ColumnLayout {
property ContactsStore contactsStore
property string chatId
property int chatType: Constants.chatType.unknown
property var formatBalance
readonly property alias chatMessagesLoader: chatMessagesLoader
property bool areTestNetworksEnabled
property var emojiPopup
property var stickersPopup
@ -94,6 +96,7 @@ ColumnLayout {
rootStore: root.rootStore
contactsStore: root.contactsStore
messageStore: root.messageStore
formatBalance: root.formatBalance
emojiPopup: root.emojiPopup
stickersPopup: root.stickersPopup
usersStore: root.usersStore
@ -103,6 +106,7 @@ ColumnLayout {
isChatBlocked: root.isBlocked || !root.isUserAllowedToSendMessage
channelEmoji: !chatContentModule ? "" : (chatContentModule.chatDetails.emoji || "")
sendViaPersonalChatEnabled: root.sendViaPersonalChatEnabled
areTestNetworksEnabled: root.areTestNetworksEnabled
onShowReplyArea: (messageId, senderId) => {
root.showReplyArea(messageId)
}

4
ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
View File

@ -39,9 +39,11 @@ Item {
property UsersStore usersStore
property ContactsStore contactsStore
property string channelEmoji
property var formatBalance
property var emojiPopup
property var stickersPopup
property bool areTestNetworksEnabled
property string chatId: ""
property bool stickersLoaded: false
@ -283,10 +285,12 @@ Item {
stickersPopup: root.stickersPopup
chatLogView: ListView.view
chatContentModule: root.chatContentModule
formatBalance: root.formatBalance
isChatBlocked: root.isChatBlocked
sendViaPersonalChatEnabled: root.sendViaPersonalChatEnabled
areTestNetworksEnabled: root.areTestNetworksEnabled
chatId: root.chatId
messageId: model.id

7
ui/app/mainui/AppMain.qml
View File

@ -713,7 +713,7 @@ Item {
sendModal.preSelectedHoldingType = Constants.TokenType.ERC20
}
if (!!amount) {
sendModal.preDefinedAmountToSend = amount
sendModal.preDefinedRawAmountToSend = amount
}
if (!!chainId) {
sendModal.preSelectedChainId = chainId
@ -1882,6 +1882,7 @@ Item {
property int preSelectedHoldingType: Constants.TokenType.Unknown
property int preSelectedSendType: Constants.SendType.Unknown
property string preDefinedAmountToSend
property string preDefinedRawAmountToSend
property int preSelectedChainId: 0
property bool onlyAssets: false
@ -1910,6 +1911,7 @@ Item {
sendModal.preSelectedAccountAddress = ""
sendModal.preSelectedRecipient = undefined
sendModal.preDefinedAmountToSend = ""
sendModal.preDefinedRawAmountToSend = ""
sendModal.preSelectedChainId = 0
sendModal.stickersPackId = ""
@ -1936,6 +1938,9 @@ Item {
if (sendModal.preDefinedAmountToSend != "") {
item.preDefinedAmountToSend = sendModal.preDefinedAmountToSend
}
if (sendModal.preDefinedRawAmountToSend != "") {
item.preDefinedRawAmountToSend = sendModal.preDefinedRawAmountToSend
}
if (!!sendModal.preSelectedChainId) {
item.preSelectedChainId = sendModal.preSelectedChainId
}

12
ui/imports/shared/controls/chat/ChatInputLinksPreviewArea.qml
View File

@ -39,6 +39,8 @@ Control {
*/
required property var paymentRequestModel
property var formatBalance: null
readonly property alias hoveredUrl: d.hoveredUrl
readonly property bool hasContent: imagePreviewArray.length > 0 || showLinkPreviewSettings || linkPreviewRepeater.count > 0 || paymentRequestRepeater.count > 0
@ -47,7 +49,7 @@ Control {
signal linkReload(string link)
signal linkClicked(string link)
signal removePaymentRequestPreviewRequested(int index)
signal removePaymentRequestPreview(int index)
signal enableLinkPreview()
signal enableLinkPreviewForThisMessage()
@ -110,9 +112,13 @@ Control {
delegate: PaymentRequestMiniCardDelegate {
required property var model
amount: model.amount
amount: {
if (!root.formatBalance)
return model.amount
return root.formatBalance(model.amount, model.symbol)
}
symbol: model.symbol
onClose: root.removePaymentRequestPreviewRequested(model.index)
onClose: root.removePaymentRequestPreview(model.index)
}
}
Repeater {

21
ui/imports/shared/controls/delegates/PaymentRequestCardDelegate.qml
View File

@ -7,6 +7,7 @@ import QtGraphicalEffects 1.15
import StatusQ.Core.Theme 0.1
import StatusQ.Components 0.1
import StatusQ.Controls 0.1
import shared.controls.chat 1.0
@ -19,6 +20,8 @@ CalloutCard {
required property string symbol
required property string address
required property bool areTestNetworksEnabled
property string senderName
property string senderThumbnailImage
property int senderColorId
@ -42,9 +45,8 @@ CalloutCard {
QtObject {
id: d
property real bannerImageMargins: 1 / Screen.devicePixelRatio // image size isn't pixel perfect..
property bool highlight: root.highlight || root.hovered
property string bannerImageSource: ""
readonly property bool highlight: (root.highlight || root.hovered) && isAvailable
readonly property bool isAvailable: !root.areTestNetworksEnabled
}
contentItem: ColumnLayout {
@ -132,11 +134,22 @@ CalloutCard {
}
}
StatusToolTip {
text: qsTr("Not available in the testnet mode")
visible: !d.isAvailable && root.hovered
y: -height
}
MouseArea {
id: ma
anchors.fill: root
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: root.clicked(mouse)
onClicked: {
if (!d.isAvailable)
return
root.clicked(mouse)
}
}
}

26
ui/imports/shared/popups/send/SendModal.qml
View File

@ -41,6 +41,7 @@ StatusDialog {
property alias preSelectedRecipientType: recipientInputLoader.selectedRecipientType
property string preDefinedAmountToSend
property string preDefinedRawAmountToSend
property int preSelectedChainId: 0
property string stickersPackId
@ -99,8 +100,8 @@ StatusDialog {
return Constants.NoError
}
readonly property double maxFiatBalance: isSelectedHoldingValidAsset ? selectedHolding.currencyBalance : 0
readonly property double maxCryptoBalance: isSelectedHoldingValidAsset ? selectedHolding.currentBalance : 0
readonly property double maxFiatBalance: isSelectedHoldingValidAsset && !!selectedHolding.currencyBalance ? selectedHolding.currencyBalance : 0
readonly property double maxCryptoBalance: isSelectedHoldingValidAsset && !!selectedHolding.currencyBalance ? selectedHolding.currentBalance : 0
readonly property double maxInputBalance: amountToSend.fiatMode ? maxFiatBalance : maxCryptoBalance
readonly property string tokenSymbol: !!d.selectedHolding && !!d.selectedHolding.symbol ? d.selectedHolding.symbol: ""
@ -234,13 +235,24 @@ StatusDialog {
if (popup.preSelectedHoldingType === Constants.TokenType.Native
|| popup.preSelectedHoldingType === Constants.TokenType.ERC20) {
const entry = SQUtils.ModelUtils.getByKey(
let iconSource = ""
let entry = SQUtils.ModelUtils.getByKey(
assetsAdaptor.outputAssetsModel, "tokensKey",
popup.preSelectedHoldingID)
if (entry) {
iconSource = entry.iconSource
} else {
entry = SQUtils.ModelUtils.getByKey(
popup.store.walletAssetStore.renamedTokensBySymbolModel, "tokensKey",
popup.preSelectedHoldingID)
iconSource = Constants.tokenIcon(entry.symbol)
}
d.selectedHoldingType = Constants.TokenType.ERC20
d.selectedHolding = entry
holdingSelector.setSelection(entry.symbol, entry.iconSource,
holdingSelector.setSelection(entry.symbol, iconSource,
popup.preSelectedHoldingID)
holdingSelector.selectedItem = entry
} else {
@ -260,6 +272,7 @@ StatusDialog {
holdingSelector.currentTab = TokenSelectorPanel.Tabs.Collectibles
}
}
if(!!popup.preDefinedAmountToSend) {
// TODO: At this stage the number should not be localized. However
// in many places when initializing popup the number is provided
@ -267,9 +280,12 @@ StatusDialog {
// number consistently. Only the displaying component should apply
// final localized formatting.
const delocalized = popup.preDefinedAmountToSend.replace(LocaleUtils.userInputLocale.decimalPoint, ".")
amountToSend.setValue(delocalized)
}
if (!!popup.preDefinedRawAmountToSend) {
amountToSend.setRawValue(popup.preDefinedRawAmountToSend)
}
if (!!popup.preSelectedChainId) {
popup.preDefinedAmountToSend = popup.preDefinedAmountToSend.replace(Qt.locale().decimalPoint, '.')

16
ui/imports/shared/popups/send/views/AmountToSend.qml
View File

@ -107,6 +107,22 @@ Control {
textField.text = d.localize(trimmed)
}
function setRawValue(valueString) {
if (!valueString)
valueString = "0"
if (d.fiatMode) {
setValue(valueString)
return
}
const divisor = SQUtils.AmountsArithmetic.fromExponent(root.multiplierIndex)
const stringNumber = SQUtils.AmountsArithmetic.div(SQUtils.AmountsArithmetic.fromString(valueString), divisor).toFixed(root.multiplierIndex)
const trimmed = d.removeDecimalTrailingZeros(stringNumber)
textField.text = d.localize(trimmed)
}
function clear() {
textField.clear()
}

7
ui/imports/shared/status/StatusChatInput.qml
View File

@ -37,7 +37,7 @@ Rectangle {
signal disableLinkPreview()
signal dismissLinkPreviewSettings()
signal dismissLinkPreview(int index)
signal removePaymentRequestPreviewRequested(int index)
signal removePaymentRequestPreview(int index)
property var usersModel
property SharedStores.RootStore sharedStore
@ -69,6 +69,8 @@ Rectangle {
property var linkPreviewModel: null
property var formatBalance: null
property var urlsList: []
property bool askToEnableLinkPreview: false
@ -1226,6 +1228,7 @@ Rectangle {
imagePreviewArray: control.fileUrlsAndSources
linkPreviewModel: control.linkPreviewModel
paymentRequestModel: control.paymentRequestModel
formatBalance: control.formatBalance
showLinkPreviewSettings: control.askToEnableLinkPreview
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
@ -1244,7 +1247,7 @@ Rectangle {
onDisableLinkPreview: () => control.disableLinkPreview()
onDismissLinkPreviewSettings: () => control.dismissLinkPreviewSettings()
onDismissLinkPreview: (index) => control.dismissLinkPreview(index)
onRemovePaymentRequestPreviewRequested: (index) => control.removePaymentRequestPreviewRequested(index)
onRemovePaymentRequestPreview: (index) => control.removePaymentRequestPreview(index)
}
RowLayout {

14
ui/imports/shared/views/chat/LinksMessageView.qml
View File

@ -6,6 +6,7 @@ import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Controls 0.1
import StatusQ.Components 0.1
import StatusQ.Core.Utils 0.1 as SQUtils
import shared.controls 1.0
import shared.panels 1.0
@ -30,6 +31,10 @@ Flow {
required property bool gifUnfurlingEnabled
required property bool canAskToUnfurlGifs
required property bool areTestNetworksEnabled
property var formatBalance: null
property string senderName
property string senderThumbnailImage
property int senderColorId
@ -69,7 +74,12 @@ Flow {
delegate: PaymentRequestCardDelegate {
required property var model
objectName: "PaymentRequestDelegate_" + model.index
amount: model.amount
areTestNetworksEnabled: root.areTestNetworksEnabled
amount: {
if (!root.formatBalance)
return model.amount
return root.formatBalance(model.amount, model.symbol)
}
symbol: model.symbol
address: model.receiver
senderName: root.senderName
@ -81,7 +91,7 @@ Flow {
Repeater {
id: tempRepeater
visible: root.canAskToUnfurlGifs
visible: root.cankToUnfurlGifs
model: root.gifUnfurlingEnabled ? gifLinks : []
delegate: LinkPreviewGifDelegate {

12
ui/imports/shared/views/chat/MessageView.qml
View File

@ -74,6 +74,7 @@ Loader {
property string messageAttachments: ""
property var transactionParams
property var emojiReactionsModel
property var formatBalance
// These 2 properties can be dropped when the new unfurling flow supports GIFs
property var links
@ -138,6 +139,8 @@ Loader {
property bool sendViaPersonalChatEnabled
property bool areTestNetworksEnabled
property bool stickersLoaded: false
property string sticker
property int stickerPack: -1
@ -982,6 +985,8 @@ Loader {
playAnimations: root.Window.active && root.messageStore.isChatActive
isOnline: root.rootStore.mainModuleInst.isOnline
highlightLink: delegate.hoveredLink
areTestNetworksEnabled: root.areTestNetworksEnabled
formatBalance: root.formatBalance
onImageClicked: (image, mouse, imageSource, url) => {
d.onImageClicked(image, mouse, imageSource, url)
}
@ -993,11 +998,8 @@ Loader {
canAskToUnfurlGifs: !root.sharedRootStore.neverAskAboutUnfurlingAgain
onSetNeverAskAboutUnfurlingAgain: root.sharedRootStore.setNeverAskAboutUnfurlingAgain(neverAskAgain)
onPaymentRequestClicked: (index) => {
const receiver = StatusQUtils.ModelUtils.get(paymentRequestModel, index, "receiver")
const amount = StatusQUtils.ModelUtils.get(paymentRequestModel, index, "amount")
const symbol = StatusQUtils.ModelUtils.get(paymentRequestModel, index, "symbol")
const chainId = StatusQUtils.ModelUtils.get(paymentRequestModel, index, "chainId")
Global.paymentRequestClicked(receiver, symbol, amount, chainId)
const request = StatusQUtils.ModelUtils.get(paymentRequestModel, index)
Global.paymentRequestClicked(request.receiver, request.symbol, request.amount, request.chainId)
}
Component.onCompleted: {