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

fix(@desktop/wallet): Implement missing unprefered chains 

fixes #8530
This commit is contained in:
Khushboo Mehta 2022-12-01 16:48:44 +01:00 committed by Khushboo-dev-cpp
parent 97190ce716
commit 26fcb8b99f
9 changed files with 84 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/modules/main/networks/model.nim
View File

@ -176,3 +176,9 @@ QtObject:
if(item.getShortName() == toLowerAscii(shortName)):
return item.getChainId()
return 0
proc getLayer1Network*(self: Model, testNet: bool): int =
for item in self.items:
if item.getLayer() == 1 and item.getIsTest() == testNet:
return item.getChainId()
return 0

5
src/app/modules/main/networks/view.nim
View File

@ -145,4 +145,7 @@ QtObject:
QtProperty[QVariant] layer2Proxy:
read = getLayer2Proxy
notify = layer2ProxyChanged
notify = layer2ProxyChanged
proc getMainnetChainId*(self: View): int {.slot.} =
return self.layer1.getLayer1Network(self.areTestNetworksEnabled)

6
src/app_service/service/transaction/async_tasks.nim
View File

@ -83,6 +83,12 @@ const getSuggestedRoutesTask*: Task = proc(argEncoded: string) {.gcsafe, nimcall
let response = eth.suggestedRoutes(arg.account, amountAsHex, arg.token, arg.disabledFromChainIDs, arg.disabledToChainIDs, arg.preferredChainIDs, arg.priority, arg.sendType).result
var bestPaths = response["Best"].getElems().map(x => x.toTransactionPathDto())
# retry along with unpreferred chains incase no route is possible with preferred chains
if(bestPaths.len == 0 and arg.preferredChainIDs.len > 0):
let response = eth.suggestedRoutes(arg.account, amountAsHex, arg.token, arg.disabledFromChainIDs, arg.disabledToChainIDs, @[], arg.priority, arg.sendType).result
bestPaths = response["Best"].getElems().map(x => x.toTransactionPathDto())
bestPaths.sort(sortAsc[TransactionPathDto])
let output = %*{
"suggestedRoutes": SuggestedRoutesDto(

4
src/app_service/service/transaction/dto.nim
View File

@ -162,7 +162,6 @@ type
tokenFees*: float
bonderFees*: string
cost*: float
preferred*: bool
estimatedTime*: int
proc `$`*(self: TransactionPathDto): string =
@ -177,7 +176,6 @@ proc `$`*(self: TransactionPathDto): string =
tokenFees:{self.tokenFees},
bonderFees:{self.bonderFees},
cost:{self.cost},
preferred:{self.preferred},
estimatedTime:{self.estimatedTime}
)"""
@ -195,7 +193,6 @@ proc toTransactionPathDto*(jsonObj: JsonNode): TransactionPathDto =
result.amountOut = stint.fromHex(UInt256, jsonObj{"AmountOut"}.getStr)
result.estimatedTime = jsonObj{"EstimatedTime"}.getInt
discard jsonObj.getProp("GasAmount", result.gasAmount)
discard jsonObj.getProp("Preferred", result.preferred)
proc convertToTransactionPathDto*(jsonObj: JsonNode): TransactionPathDto =
result = TransactionPathDto()
@ -211,7 +208,6 @@ proc convertToTransactionPathDto*(jsonObj: JsonNode): TransactionPathDto =
result.amountOut = stint.u256(jsonObj{"amountOut"}.getStr)
result.estimatedTime = jsonObj{"estimatedTime"}.getInt
discard jsonObj.getProp("gasAmount", result.gasAmount)
discard jsonObj.getProp("preferred", result.preferred)
type
Fees* = ref object

2
ui/StatusQ/src/StatusQ/Components/StatusCard.qml
View File

@ -183,7 +183,7 @@ Rectangle {
id: basicInput
StatusBaseText {
id: secondaryLabel
Layout.maximumWidth: root.width - 12
Layout.maximumWidth: root.width - cardIcon.width - errorIcon.width - 24
elide: Text.ElideRight
font.pixelSize: 13
font.weight: Font.Medium

18
ui/imports/shared/popups/SendModal.qml
View File

@ -75,7 +75,7 @@ StatusDialog {
let amount = parseFloat(amountToSendInput.text) * Math.pow(10, assetSelector.selectedAsset.decimals)
popup.store.suggestedRoutes(popup.selectedAccount.address, amount.toString(16), assetSelector.selectedAsset.symbol,
store.disabledChainIdsFromList, store.disabledChainIdsToList,
d.preferredChainIds, fees.selectedPriority, popup.sendType)
store.preferredChainIds, fees.selectedPriority, popup.sendType)
}
})
@ -102,7 +102,6 @@ StatusDialog {
property string resolvedENSAddress
readonly property string uuid: Utils.uuid()
property bool isPendingTx: false
property var preferredChainIds: []
property bool sendTxError: false
property string sendTxErrorString
@ -120,7 +119,7 @@ StatusDialog {
} else {
let chainColor = popup.store.allNetworks.getNetworkColor(splitWords[i])
if(!!chainColor) {
d.addPreferredChain(popup.store.allNetworks.getNetworkChainId(splitWords[i]))
store.addPreferredChain(popup.store.allNetworks.getNetworkChainId(splitWords[i]))
editedText += `<span style='color: %1'>%2</span>`.arg(chainColor).arg(splitWords[i])+':'
}
}
@ -130,16 +129,6 @@ StatusDialog {
popup.recalculateRoutesAndFees()
}
}
function addPreferredChain(chainID) {
if(!chainID)
return
if(preferredChainIds.includes(chainID))
return
preferredChainIds.push(chainID)
}
}
width: 556
@ -153,6 +142,9 @@ StatusDialog {
onSelectedAccountChanged: popup.recalculateRoutesAndFees()
onOpened: {
store.addPreferredChain(popup.store.getMainnetChainId())
store.addUnpreferredChainsToDisabledChains()
amountToSendInput.input.edit.forceActiveFocus()
if(!!popup.preSelectedAsset) {

26
ui/imports/shared/stores/TransactionStore.qml
View File

@ -121,4 +121,30 @@ QtObject {
function plainText(text) {
return globalUtils.plainText(text)
}
property var preferredChainIds: []
function addPreferredChain(chainID) {
if(!chainID)
return
if(preferredChainIds.includes(chainID))
return
preferredChainIds.push(chainID)
}
function getMainnetChainId() {
return networksModule.getMainnetChainId()
}
function addUnpreferredChainsToDisabledChains() {
let mainnetChainId = getMainnetChainId()
for(var i = 0; i < allNetworks.count; i++) {
let chainId = allNetworks.rowData(i, "chainId") * 1
if(mainnetChainId !== chainId) {
addRemoveDisabledToChain(chainId, true)
}
}
}
}

38
ui/imports/shared/views/NetworkCardsComponent.qml
View File

@ -31,6 +31,7 @@ Item {
}
}
property bool interactive: true
property bool showPreferredChains: false
property var weiToEth: function(wei) {}
property var reCalculateSuggestedRoute: function() {}
@ -49,16 +50,19 @@ Item {
toNetworksRepeater.itemAt(i).routeOnNetwork = 0
}
}
function draw() {
canvas.clear()
canvas.requestPaint()
}
}
onVisibleChanged: if(visible) d.draw()
onBestRoutesChanged: d.draw()
width: 410
height: visible ? networkCardsLayout.height : 0
onBestRoutesChanged: {
canvas.clear()
canvas.requestPaint()
}
RowLayout {
id: networkCardsLayout
width: parent.width
@ -131,12 +135,12 @@ Item {
objectName: model.chainId
property int routeOnNetwork: 0
property double amountToReceive: 0
property bool preferred: store.preferredChainIds.includes(model.chainId)
primaryText: model.chainName
secondaryText: LocaleUtils.numberToLocaleString(amountToReceive)
tertiaryText: ""
// To-do preferred in not something that is supported yet
state: root.errorMode ? "error" : "default"
// opacity: preferred ? 1 : 0
tertiaryText: state === "unpreferred" ? qsTr("UNPREFERRED") : ""
state: root.errorMode ? "error" : !preferred ? "unpreferred" : "default"
opacity: preferred || showPreferredChains ? 1 : 0
cardIcon.source: Style.svg(model.iconUrl)
disabledText: qsTr("Disabled")
advancedMode: root.customMode
@ -150,9 +154,20 @@ Item {
root.reCalculateSuggestedRoute()
}
onVisibleChanged: {
if(visible)
if(visible) {
disabled = store.disabledChainIdsToList.includes(model.chainId)
preferred = store.preferredChainIds.includes(model.chainId)
}
}
onOpacityChanged: {
if(opacity === 1) {
disabled = store.disabledChainIdsToList.includes(model.chainId)
} else {
if(opacity === 0 && routeOnNetwork > 0)
root.reCalculateSuggestedRoute()
}
}
// To-do needed for custom view
// onAdvancedInputTextChanged: {
// if(selectedNetwork && selectedNetwork.chainName === model.chainName)
@ -217,11 +232,12 @@ Item {
fromN.routeOnNetwork += 1
toN.routeOnNetwork += 1
d.thereIsApossibleRoute = true
let routeColor = toN.preferred ? '#627EEA' : Theme.palette.pinColor1
StatusQUtils.Utils.drawArrow(ctx, fromN.x + fromN.width,
fromN.y + fromN.cardIconPosition + yOffsetFrom,
toNetworksLayout.x + toN.x,
toN.y + toN.cardIconPosition + yOffsetTo,
'#627EEA', xOffset)
routeColor, xOffset)
}
}
}

12
ui/imports/shared/views/NetworksAdvancedCustomRoutingView.qml
View File

@ -50,12 +50,17 @@ ColumnLayout {
wrapMode: Text.WordWrap
}
StatusButton {
id: preferredToggleButton
Layout.alignment: Qt.AlignRight
Layout.preferredHeight: 22
verticalPadding: 0
verticalPadding: -1
checkable: true
size: StatusBaseButton.Size.Small
icon.name: "hide"
text: qsTr("Show Unpreferred Networks")
icon.name: checked ? "show" : "hide"
icon.height: 16
icon.width: 16
text: checked ? qsTr("Hide Unpreferred Networks"): qsTr("Show Unpreferred Networks")
onToggled: if(!checked) store.addUnpreferredChainsToDisabledChains()
}
}
StatusBaseText {
@ -90,6 +95,7 @@ ColumnLayout {
reCalculateSuggestedRoute: function() {
root.reCalculateSuggestedRoute()
}
showPreferredChains: preferredToggleButton.checked
bestRoutes: root.bestRoutes
weiToEth: root.weiToEth
interactive: root.interactive