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: Disable request payment for testnet

This commit is contained in:
Emil Sawicki 2024-11-11 15:19:49 +01:00
parent 68b942fe3b
commit ccad5cfed9
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storybook/pages/StatusChatInputPage.qml
View File

@ -153,7 +153,7 @@ SplitView {
readonly property SharedStores.RequestPaymentStore requestPaymentStore: SharedStores.RequestPaymentStore { readonly property SharedStores.RequestPaymentStore requestPaymentStore: SharedStores.RequestPaymentStore {
currencyStore: SharedStores.CurrenciesStore {} currencyStore: SharedStores.CurrenciesStore {}
flatNetworksModel: NetworksModel.flatNetworks flatNetworksModel: NetworksModel.flatNetworks
processedAssetsModel: d.walletAssetsStore.renamedTokensBySymbolModel processedAssetsModel: d.walletAssetsStore.jointModel
plainAssetsModel: d.walletAssetsStore.walletTokensStore.plainTokensBySymbolModel plainAssetsModel: d.walletAssetsStore.walletTokensStore.plainTokensBySymbolModel
accountsModel: WalletAccountsModel {} accountsModel: WalletAccountsModel {}
} }

1
ui/app/AppLayouts/Chat/ChatLayout.qml
View File

@ -36,6 +36,7 @@ StackLayout {
required property SendStores.TransactionStore transactionStore required property SendStores.TransactionStore transactionStore
required property WalletStore.WalletAssetsStore walletAssetsStore required property WalletStore.WalletAssetsStore walletAssetsStore
required property SharedStores.CurrenciesStore currencyStore required property SharedStores.CurrenciesStore currencyStore
property bool areTestNetworksEnabled
property var sectionItemModel property var sectionItemModel

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

@ -46,6 +46,7 @@ Item {
property ProfileStores.ContactsStore contactsStore property ProfileStores.ContactsStore contactsStore
property var emojiPopup property var emojiPopup
property var stickersPopup property var stickersPopup
property bool areTestNetworksEnabled
property string activeChatId: parentModule && parentModule.activeItem.id property string activeChatId: parentModule && parentModule.activeItem.id
property int chatsCount: parentModule && parentModule.model ? parentModule.model.count : 0 property int chatsCount: parentModule && parentModule.model ? parentModule.model.count : 0
@ -327,6 +328,7 @@ Item {
emojiPopup: root.emojiPopup emojiPopup: root.emojiPopup
stickersPopup: root.stickersPopup stickersPopup: root.stickersPopup
chatType: root.activeChatType chatType: root.activeChatType
areTestNetworksEnabled: root.areTestNetworksEnabled
textInput.onTextChanged: { textInput.onTextChanged: {
if (!!d.activeChatContentModule && textInput.text !== d.activeChatContentModule.inputAreaModule.preservedProperties.text) { if (!!d.activeChatContentModule && textInput.text !== d.activeChatContentModule.inputAreaModule.preservedProperties.text) {

2
ui/app/AppLayouts/Chat/views/ChatView.qml
View File

@ -51,6 +51,7 @@ StatusSectionLayout {
required property var sendModalPopup required property var sendModalPopup
property var sectionItemModel property var sectionItemModel
property int joinedMembersCount property int joinedMembersCount
property bool areTestNetworksEnabled
property var emojiPopup property var emojiPopup
property var stickersPopup property var stickersPopup
@ -242,6 +243,7 @@ StatusSectionLayout {
sharedRootStore: root.sharedRootStore sharedRootStore: root.sharedRootStore
utilsStore: root.utilsStore utilsStore: root.utilsStore
rootStore: root.rootStore rootStore: root.rootStore
areTestNetworksEnabled: root.areTestNetworksEnabled
createChatPropertiesStore: root.createChatPropertiesStore createChatPropertiesStore: root.createChatPropertiesStore
contactsStore: root.contactsStore contactsStore: root.contactsStore
stickersLoaded: root.stickersLoaded stickersLoaded: root.stickersLoaded

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

@ -48,6 +48,7 @@ Rectangle {
property var stickersPopup: null property var stickersPopup: null
// Use this to only enable the Connections only when this Input opens the Emoji popup // Use this to only enable the Connections only when this Input opens the Emoji popup
property bool closeGifPopupAfterSelection: true property bool closeGifPopupAfterSelection: true
property bool areTestNetworksEnabled
property bool emojiEvent: false property bool emojiEvent: false
property bool isColonPressed: false property bool isColonPressed: false
@ -1034,8 +1035,8 @@ Rectangle {
StatusAction { StatusAction {
text: qsTr("Add payment request") text: qsTr("Add payment request")
icon.name: "wallet" icon.name: "wallet"
// TODO_ES disable for testnet (only production) visibleOnDisabled: true
// TODO_ES error message when disabled on testnet (only production) enabled: !root.areTestNetworksEnabled
onTriggered: control.openPaymentRequestPopup() onTriggered: control.openPaymentRequestPopup()
} }
@ -1273,7 +1274,6 @@ Rectangle {
topPadding: 12 topPadding: 12
imagePreviewArray: control.fileUrlsAndSources imagePreviewArray: control.fileUrlsAndSources
linkPreviewModel: control.linkPreviewModel linkPreviewModel: control.linkPreviewModel
requestPaymentModel: control.requestPaymentStore.requestPaymentModel
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
@ -1292,7 +1292,6 @@ Rectangle {
onDisableLinkPreview: () => control.disableLinkPreview() onDisableLinkPreview: () => control.disableLinkPreview()
onDismissLinkPreviewSettings: () => control.dismissLinkPreviewSettings() onDismissLinkPreviewSettings: () => control.dismissLinkPreviewSettings()
onDismissLinkPreview: (index) => control.dismissLinkPreview(index) onDismissLinkPreview: (index) => control.dismissLinkPreview(index)
onPaymentRequestRemoved: (index) => control.requestPaymentStore.removePaymentRequest(index)
} }
RowLayout { RowLayout {