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(MintToken/RemoteDestruct): Review and update remote self destruct flow 

Updated strings and renamed files.

Part of #10603
This commit is contained in:
Noelia 2023-05-15 16:52:50 +02:00 committed by Noelia
parent 3ac9edbe96
commit 7aaf8fcec2
10 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storybook/PagesModel.qml
View File

@ -178,11 +178,11 @@ ListModel {
section: "Popups"
}
ListElement {
title: "RemoteSelfDestructPopup"
title: "RemotelyDestructPopup"
section: "Popups"
}
ListElement {
title: "SelfDestructAlertPopup"
title: "RemotelyDestructAlertPopup"
section: "Popups"
}
ListElement {

6
storybook/pages/SelfDestructAlertPopupPage.qml → storybook/pages/RemotelyDestructAlertPopupPage.qml
View File

@ -29,14 +29,14 @@ SplitView {
onClicked: dialog.open()
}
SelfDestructAlertPopup {
RemotelyDestructAlertPopup {
id: dialog
anchors.centerIn: parent
tokenCount: 12
onSelfDestructClicked: logs.logEvent("SelfDestructAlertPopup::onSelfDestructClicked")
onCancelClicked: logs.logEvent("SelfDestructAlertPopup::onCancelClicked")
onRemotelyDestructClicked: logs.logEvent("RemotelyDestructAlertPopup::onRemotelyDestructClicked")
onCancelClicked: logs.logEvent("RemotelyDestructAlertPopup::onCancelClicked")
}
}

4
storybook/pages/RemoteSelfDestructPopupPage.qml → storybook/pages/RemotelyDestructPopupPage.qml
View File

@ -29,14 +29,14 @@ SplitView {
onClicked: dialog.open()
}
RemoteSelfDestructPopup {
RemotelyDestructPopup {
id: dialog
anchors.centerIn: parent
collectibleName: editorCollectible.text
model: TokenHoldersModel {}
onSelfDestructClicked: logs.logEvent("RemoteSelfDestructPopup::onSelfDestructClicked")
onRemotelyDestructClicked: logs.logEvent("RemoteSelfDestructPopup::onRemotelyDestructClicked")
}
}

1
ui/StatusQ/src/assets.qrc
View File

@ -253,6 +253,7 @@
<file>assets/img/icons/reaction-b.svg</file>
<file>assets/img/icons/receive.svg</file>
<file>assets/img/icons/refresh.svg</file>
<file>assets/img/icons/remotely-destruct.svg</file>
<file>assets/img/icons/remove-circle.svg</file>
<file>assets/img/icons/remove-contact.svg</file>
<file>assets/img/icons/remove.svg</file>

3
ui/StatusQ/src/assets/img/icons/remotely-destruct.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.2903 6.93202L12.5794 1.26309C12.5524 1.1737 12.4285 1.16677 12.3917 1.25259L10.2451 6.26137C10.2213 6.31707 10.1537 6.3389 10.1018 6.30773L6.59847 4.20575C6.51886 4.15798 6.42279 4.23504 6.45215 4.32312L7.85613 8.53504C7.87771 8.5998 7.82951 8.66667 7.76126 8.66667H1.34751C1.24713 8.66667 1.20933 8.79802 1.29435 8.85137L7.11708 12.5051C7.17211 12.5396 7.18012 12.6166 7.13336 12.6618L2.74936 16.8916C2.68018 16.9583 2.73582 17.0747 2.83119 17.0628L8.53909 16.3493C8.6038 16.3412 8.65881 16.3962 8.65072 16.4609L7.94051 22.1426C7.92828 22.2404 8.05009 22.295 8.11502 22.2208L12.4969 17.2102C12.5327 17.1692 12.5947 17.1644 12.6364 17.1993L16.9316 20.7924C16.9974 20.8475 17.0974 20.7996 17.0957 20.7138L17.0106 16.3563C17.0093 16.2899 17.0719 16.2407 17.1361 16.2576L22.8723 17.7714C22.9713 17.7975 23.0409 17.6758 22.9683 17.6037L17.986 12.6609C17.9405 12.6158 17.9485 12.5402 18.0025 12.5057L23.7122 8.85089C23.7963 8.79703 23.7582 8.66667 23.6583 8.66667H18.0215C17.9577 8.66667 17.9102 8.60773 17.9237 8.54539L19.3239 2.11633C19.3454 2.01747 19.2233 1.95282 19.1536 2.02621L14.4585 6.97198C14.4057 7.02763 14.3124 7.00549 14.2903 6.93202Z" stroke="#FF2D55" stroke-width="1.5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

14
ui/app/AppLayouts/Chat/panels/communities/CommunityMintTokensSettingsPanel.qml
View File

@ -280,7 +280,7 @@ SettingsPageLayout {
id: footerPanel
function closePopups() {
remoteSelfdestructPopup.close()
remotelyDestructPopup.close()
alertPopup.close()
signSelfDestructPopup.close()
}
@ -291,25 +291,25 @@ SettingsPageLayout {
burnEnabled: false
onAirdropClicked: d.airdropClicked()
onRemotelySelfDestructClicked: remoteSelfdestructPopup.open()
onRemotelyDestructClicked: remotelyDestructPopup.open()
RemoteSelfDestructPopup {
id: remoteSelfdestructPopup
RemotelyDestructPopup {
id: remotelyDestructPopup
collectibleName: root.title
model: d.tokenOwnersModel
onSelfDestructClicked: {
onRemotelyDestructClicked: {
d.selfDestructTokensList = selfDestructTokensList
alertPopup.tokenCount = tokenCount
alertPopup.open()
}
}
SelfDestructAlertPopup {
RemotelyDestructAlertPopup {
id: alertPopup
onSelfDestructClicked: signSelfDestructPopup.open()
onRemotelyDestructClicked: signSelfDestructPopup.open()
}
SignMintTokenTransactionPopup {

8
ui/app/AppLayouts/Chat/panels/communities/MintTokensFooterPanel.qml
View File

@ -18,7 +18,7 @@ Control {
signal airdropClicked
signal retailClicked
signal remotelySelfDestructClicked
signal remotelyDestructClicked
signal burnClicked
height: 61 // by design
@ -57,12 +57,12 @@ Control {
StatusFlatButton {
id: remotelySelfDestructButton
icon.name: "retail"
text: qsTr("Remotely self destruct")
icon.name: "remotely-destruct"
text: qsTr("Remotely destruct")
type: StatusBaseButton.Type.Danger
borderColor: "transparent"
onClicked: root.remotelySelfDestructClicked()
onClicked: root.remotelyDestructClicked()
}
StatusFlatButton {

8
ui/app/AppLayouts/Chat/popups/community/SelfDestructAlertPopup.qml → ui/app/AppLayouts/Chat/popups/community/RemotelyDestructAlertPopup.qml
View File

@ -17,10 +17,10 @@ StatusDialog {
property int tokenCount: 0
signal selfDestructClicked
signal remotelyDestructClicked
signal cancelClicked
title: qsTr("Self-destruct %n token(s)", "", root.tokenCount)
title: qsTr("Remotely destruct %n token(s)", "", root.tokenCount)
implicitWidth: 400 // by design
topPadding: Style.current.padding
bottomPadding: topPadding
@ -46,11 +46,11 @@ StatusDialog {
}
StatusButton {
text: qsTr("Self-destruct")
text: qsTr("Remotely destruct")
type: StatusBaseButton.Type.Danger
onClicked: {
root.selfDestructClicked()
root.remotelyDestructClicked()
close()
}
}

8
ui/app/AppLayouts/Chat/popups/community/RemoteSelfDestructPopup.qml → ui/app/AppLayouts/Chat/popups/community/RemotelyDestructPopup.qml
View File

@ -20,7 +20,7 @@ StatusDialog {
property string collectibleName
signal selfDestructClicked(int tokenCount, var selfDestructTokensList)
signal remotelyDestructClicked(int tokenCount, var selfDestructTokensList)
QtObject {
id: d
@ -59,7 +59,7 @@ StatusDialog {
}
}
title: qsTr("Remotely self-destruct %1 token").arg(root.collectibleName)
title: qsTr("Remotely destruct %1 token").arg(root.collectibleName)
implicitWidth: 600 // by design
topPadding: Style.current.padding
bottomPadding: topPadding
@ -88,9 +88,9 @@ StatusDialog {
rightButtons: ObjectModel {
StatusButton {
enabled: d.tokenCount > 0
text: qsTr("Self-destruct %n token(s)", "", d.tokenCount)
text: qsTr("Remotely destruct %n token(s)", "", d.tokenCount)
type: StatusBaseButton.Type.Danger
onClicked: root.selfDestructClicked(d.tokenCount,
onClicked: root.remotelyDestructClicked(d.tokenCount,
ModelUtils.modelToArray(d.selfDestructTokensList,
["walletAddress", "amount"]))
}

4
ui/app/AppLayouts/Chat/popups/community/qmldir
View File

@ -1,5 +1,5 @@
CreateChannelPopup 1.0 CreateChannelPopup.qml
CommunityTokenPermissionsPopup 1.0 CommunityTokenPermissionsPopup.qml
RemoteSelfDestructPopup 1.0 RemoteSelfDestructPopup.qml
SelfDestructAlertPopup 1.0 SelfDestructAlertPopup.qml
RemotelyDestructPopup 1.0 RemotelyDestructPopup.qml
RemotelyDestructAlertPopup 1.0 RemotelyDestructAlertPopup.qml
SignMintTokenTransactionPopup 1.0 SignMintTokenTransactionPopup.qml