From d6411f08ab5fd5a7a124d4e0c33c1256a2f04e4f Mon Sep 17 00:00:00 2001 From: Godfrain Jacques Date: Tue, 13 Aug 2024 15:38:31 -0700 Subject: [PATCH] feat(connector)_: use status image for DApps connected with Status connector --- ui/StatusQ/src/assets.qrc | 1 + .../src/assets/img/icons/status-connector.svg | 8594 +++++++++++++++++ .../services/dapps/DappsConnectorSDK.qml | 2 + .../popups/walletconnect/ConnectDAppModal.qml | 1 + .../walletconnect/DAppSignRequestModal.qml | 3 + .../walletconnect/RoundImageWithBadge.qml | 4 +- .../popups/walletconnect/private/DAppCard.qml | 2 + 7 files changed, 8605 insertions(+), 2 deletions(-) create mode 100644 ui/StatusQ/src/assets/img/icons/status-connector.svg diff --git a/ui/StatusQ/src/assets.qrc b/ui/StatusQ/src/assets.qrc index ba40188927..169fdc8d6e 100644 --- a/ui/StatusQ/src/assets.qrc +++ b/ui/StatusQ/src/assets.qrc @@ -178,6 +178,7 @@ assets/img/icons/copy.svg assets/img/icons/crown.svg assets/img/icons/dapp.svg + assets/img/icons/status-connector.svg assets/img/icons/delete.svg assets/img/icons/desktop.svg assets/img/icons/discord.svg diff --git a/ui/StatusQ/src/assets/img/icons/status-connector.svg b/ui/StatusQ/src/assets/img/icons/status-connector.svg new file mode 100644 index 0000000000..7cfb1599d2 --- /dev/null +++ b/ui/StatusQ/src/assets/img/icons/status-connector.svg @@ -0,0 +1,8594 @@ + + + + + + + + + + diff --git a/ui/app/AppLayouts/Wallet/services/dapps/DappsConnectorSDK.qml b/ui/app/AppLayouts/Wallet/services/dapps/DappsConnectorSDK.qml index b333aaceb1..2283acdeb0 100644 --- a/ui/app/AppLayouts/Wallet/services/dapps/DappsConnectorSDK.qml +++ b/ui/app/AppLayouts/Wallet/services/dapps/DappsConnectorSDK.qml @@ -397,6 +397,7 @@ WalletConnectSDKBase { dAppUrl: proposalMedatada.url dAppName: proposalMedatada.name dAppIconUrl: !!proposalMedatada.icons && proposalMedatada.icons.length > 0 ? proposalMedatada.icons[0] : "" + dAppBadgeIcon: "status-connector" multipleChainSelection: false onConnect: { @@ -438,6 +439,7 @@ WalletConnectSDKBase { dappName: request.dappName dappUrl: request.dappUrl dappIcon: request.dappIcon + badgeIcon: "status-connector" accountColor: request.account.color accountName: request.account.name diff --git a/ui/imports/shared/popups/walletconnect/ConnectDAppModal.qml b/ui/imports/shared/popups/walletconnect/ConnectDAppModal.qml index 92b29790ef..a4a01d0137 100644 --- a/ui/imports/shared/popups/walletconnect/ConnectDAppModal.qml +++ b/ui/imports/shared/popups/walletconnect/ConnectDAppModal.qml @@ -62,6 +62,7 @@ StatusDialog { property alias dAppUrl: dappCard.dAppUrl property alias dAppName: dappCard.name property alias dAppIconUrl: dappCard.iconUrl + property alias dAppBadgeIcon: dappCard.badgeIcon property alias connectionStatus: d.connectionStatus /* diff --git a/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml b/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml index fa2794c872..254ba44465 100644 --- a/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml +++ b/ui/imports/shared/popups/walletconnect/DAppSignRequestModal.qml @@ -22,6 +22,8 @@ SignTransactionModalBase { required property url dappUrl required property url dappIcon required property string dappName + // Making a non breaking change for the dappBadge, default is walletconnect + property string badgeIcon // Payload to sign required property string requestPayload // Account @@ -46,6 +48,7 @@ SignTransactionModalBase { subtitle: SQUtils.StringUtils.extractDomainFromLink(root.dappUrl) headerIconComponent: RoundImageWithBadge { imageUrl: root.dappIcon + badgeIcon: root.badgeIcon width: 40 height: 40 } diff --git a/ui/imports/shared/popups/walletconnect/RoundImageWithBadge.qml b/ui/imports/shared/popups/walletconnect/RoundImageWithBadge.qml index 8e503bb411..b533c9da07 100644 --- a/ui/imports/shared/popups/walletconnect/RoundImageWithBadge.qml +++ b/ui/imports/shared/popups/walletconnect/RoundImageWithBadge.qml @@ -12,7 +12,7 @@ Item { id: root property url imageUrl: "" - property string badgeIcon: "walletconnect" + property string badgeIcon: "" property string fallbackIcon: "dapp" readonly property bool iconLoaded: !mainImage.isError && !mainImage.isLoading && mainImage.image.source !== "" @@ -76,7 +76,7 @@ Item { height: width anchors.bottom: parent.bottom anchors.right: parent.right - asset.name: root.badgeIcon + asset.name: root.badgeIcon || "walletconnect" asset.color: "transparent" asset.width: width asset.height: height diff --git a/ui/imports/shared/popups/walletconnect/private/DAppCard.qml b/ui/imports/shared/popups/walletconnect/private/DAppCard.qml index c4ae14b542..cb50a37843 100644 --- a/ui/imports/shared/popups/walletconnect/private/DAppCard.qml +++ b/ui/imports/shared/popups/walletconnect/private/DAppCard.qml @@ -16,6 +16,7 @@ ColumnLayout { property alias name: appNameText.text property url dAppUrl: "" property url iconUrl: "" + property string badgeIcon: "" property bool connectionSuccessful property bool connectionAttempted @@ -28,6 +29,7 @@ ColumnLayout { Layout.preferredHeight: Layout.preferredWidth imageUrl: iconUrl + badgeIcon: root.badgeIcon } ColumnLayout {