Skip to content

Commit 4948ee7

Browse files
committed
fix: getDappDetails moved to Utils.qml for reusability
1 parent 757ae06 commit 4948ee7

File tree

4 files changed

+28
-24
lines changed

4 files changed

+28
-24
lines changed

ui/app/AppLayouts/Browser/stores/BrowserActivityStore.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ QtObject {
6868
}
6969

7070
function getDappDetails(chainId, contractAddress) {
71-
return undefined
71+
return Utils.getDappDetails(chainId, contractAddress)
7272
}
7373

7474
function isOwnedAccount(address) {

ui/app/AppLayouts/Wallet/stores/RootStore.qml

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -463,29 +463,8 @@ QtObject {
463463
return address1.toUpperCase() === address2.toUpperCase()
464464
}
465465

466-
// TODO: https://github.com/status-im/status-desktop/issues/15329
467-
// Get DApp data from the backend
468466
function getDappDetails(chainId, contractAddress) {
469-
switch (contractAddress) {
470-
case Constants.swap.paraswapV5ApproveContractAddress:
471-
case Constants.swap.paraswapV5SwapContractAddress:
472-
return {
473-
"icon": Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)),
474-
"url": Constants.swap.paraswapHostname,
475-
"name": Constants.swap.paraswapName,
476-
"approvalContractAddress": Constants.swap.paraswapV5ApproveContractAddress,
477-
"swapContractAddress": Constants.swap.paraswapV5SwapContractAddress,
478-
}
479-
case Constants.swap.paraswapV6_2ContractAddress:
480-
return {
481-
"icon": Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)),
482-
"url": Constants.swap.paraswapUrl,
483-
"name": Constants.swap.paraswapName,
484-
"approvalContractAddress": Constants.swap.paraswapV6_2ContractAddress,
485-
"swapContractAddress": Constants.swap.paraswapV6_2ContractAddress,
486-
}
487-
}
488-
return undefined
467+
return Utils.getDappDetails(chainId, contractAddress)
489468
}
490469

491470
function resetActivityData() {

ui/imports/shared/controls/TransactionDelegate.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ StatusListItem {
212212

213213
readonly property bool isLightTheme: Theme.palette.name === Constants.lightThemeName
214214
property color animatedBgColor
215-
property int txType: activityStore.getTransactionType(root.modelData)
215+
readonly property int txType: activityStore.getTransactionType(root.modelData)
216216

217217
readonly property var secondIconAsset: StatusAssetSettings {
218218
width: root.tokenIconAsset.width

ui/imports/utils/Utils.qml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,31 @@ QtObject {
861861
return nativeTokenRawToDecimal(chainID, rawGasPrice)
862862
}
863863

864+
// TODO: https://github.com/status-im/status-desktop/issues/15329
865+
// Get DApp data from the backend
866+
function getDappDetails(chainId, contractAddress) {
867+
switch (contractAddress) {
868+
case Constants.swap.paraswapV5ApproveContractAddress:
869+
case Constants.swap.paraswapV5SwapContractAddress:
870+
return {
871+
"icon": Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)),
872+
"url": Constants.swap.paraswapHostname,
873+
"name": Constants.swap.paraswapName,
874+
"approvalContractAddress": Constants.swap.paraswapV5ApproveContractAddress,
875+
"swapContractAddress": Constants.swap.paraswapV5SwapContractAddress,
876+
}
877+
case Constants.swap.paraswapV6_2ContractAddress:
878+
return {
879+
"icon": Theme.png("swap/%1".arg(Constants.swap.paraswapIcon)),
880+
"url": Constants.swap.paraswapUrl,
881+
"name": Constants.swap.paraswapName,
882+
"approvalContractAddress": Constants.swap.paraswapV6_2ContractAddress,
883+
"swapContractAddress": Constants.swap.paraswapV6_2ContractAddress,
884+
}
885+
}
886+
return undefined
887+
}
888+
864889
// Leave this function at the bottom of the file as QT Creator messes up the code color after this
865890
function isPunct(c) {
866891
return /(!|\@|#|\$|%|\^|&|\*|\(|\)|\+|\||-|=|\\|{|}|[|]|"|;|'|<|>|\?|,|\.|\/)/.test(c)

0 commit comments

Comments
 (0)