parent
bda2114209
commit
5e05a7613c
|
@ -22,6 +22,7 @@ import ../transaction/service as transaction_service
|
||||||
import ../network/service as network_service
|
import ../network/service as network_service
|
||||||
import ../token/service as token_service
|
import ../token/service as token_service
|
||||||
import ../eth/dto/coder
|
import ../eth/dto/coder
|
||||||
|
import ../eth/dto/transaction
|
||||||
|
|
||||||
|
|
||||||
logScope:
|
logScope:
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
StickerData 1.0 StickerData.qml
|
StickerData 1.0 StickerData.qml
|
||||||
StickerPackData 1.0 StickerPackData.qml
|
StickerPackData 1.0 StickerPackData.qml
|
||||||
|
StickersStore 1.0 StickersStore.qml
|
|
@ -66,6 +66,7 @@ StatusAppTwoPanelLayout {
|
||||||
id: ensContainer
|
id: ensContainer
|
||||||
ensUsernamesStore: profileView.store.ensUsernamesStore
|
ensUsernamesStore: profileView.store.ensUsernamesStore
|
||||||
contactsStore: profileView.store.contactsStore
|
contactsStore: profileView.store.contactsStore
|
||||||
|
stickersStore: profileView.store.stickersStore
|
||||||
profileContentWidth: _internal.profileContentWidth
|
profileContentWidth: _internal.profileContentWidth
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -152,5 +152,13 @@ QtObject {
|
||||||
return ""
|
return ""
|
||||||
return ensUsernamesModule.getStatusToken()
|
return ensUsernamesModule.getStatusToken()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isEIP1559Enabled() {
|
||||||
|
return walletSection.isEIP1559Enabled()
|
||||||
|
}
|
||||||
|
|
||||||
|
function suggestedFees() {
|
||||||
|
return JSON.parse(walletSectionTransactions.suggestedFees())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
import QtQuick 2.13
|
import QtQuick 2.13
|
||||||
import utils 1.0
|
import utils 1.0
|
||||||
|
|
||||||
|
import AppLayouts.Chat.stores 1.0
|
||||||
|
|
||||||
QtObject {
|
QtObject {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
|
@ -53,6 +55,10 @@ QtObject {
|
||||||
property WalletStore walletStore: WalletStore {
|
property WalletStore walletStore: WalletStore {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
property var stickersModuleInst: stickersModule
|
||||||
|
property var stickersStore: StickersStore {
|
||||||
|
stickersModule: stickersModuleInst
|
||||||
|
}
|
||||||
|
|
||||||
property bool browserMenuItemEnabled: localAccountSensitiveSettings.isBrowserEnabled
|
property bool browserMenuItemEnabled: localAccountSensitiveSettings.isBrowserEnabled
|
||||||
property bool walletMenuItemEnabled: localAccountSensitiveSettings.isWalletEnabled
|
property bool walletMenuItemEnabled: localAccountSensitiveSettings.isWalletEnabled
|
||||||
|
|
|
@ -17,6 +17,7 @@ Item {
|
||||||
|
|
||||||
property var ensUsernamesStore
|
property var ensUsernamesStore
|
||||||
property var contactsStore
|
property var contactsStore
|
||||||
|
property var stickersStore
|
||||||
property string username: ""
|
property string username: ""
|
||||||
|
|
||||||
signal backBtnClicked();
|
signal backBtnClicked();
|
||||||
|
@ -47,6 +48,8 @@ Item {
|
||||||
sourceComponent: StatusSNTTransactionModal {
|
sourceComponent: StatusSNTTransactionModal {
|
||||||
store: root.ensUsernamesStore
|
store: root.ensUsernamesStore
|
||||||
contactsStore: root.contactsStore
|
contactsStore: root.contactsStore
|
||||||
|
stickersStore: root.stickersStore
|
||||||
|
asyncGasEstimateTarget: root.stickersStore.stickersModule
|
||||||
assetPrice: "10"
|
assetPrice: "10"
|
||||||
contractAddress: root.ensUsernamesStore.getEnsRegisteredAddress()
|
contractAddress: root.ensUsernamesStore.getEnsRegisteredAddress()
|
||||||
estimateGasFunction: function(selectedAccount, uuid) {
|
estimateGasFunction: function(selectedAccount, uuid) {
|
||||||
|
|
|
@ -14,6 +14,7 @@ Item {
|
||||||
property EnsUsernamesStore ensUsernamesStore
|
property EnsUsernamesStore ensUsernamesStore
|
||||||
|
|
||||||
property var contactsStore
|
property var contactsStore
|
||||||
|
property var stickersStore
|
||||||
|
|
||||||
property int profileContentWidth
|
property int profileContentWidth
|
||||||
property bool showSearchScreen: false
|
property bool showSearchScreen: false
|
||||||
|
@ -245,6 +246,7 @@ Item {
|
||||||
EnsTermsAndConditionsView {
|
EnsTermsAndConditionsView {
|
||||||
ensUsernamesStore: ensView.ensUsernamesStore
|
ensUsernamesStore: ensView.ensUsernamesStore
|
||||||
contactsStore: ensView.contactsStore
|
contactsStore: ensView.contactsStore
|
||||||
|
stickersStore: ensView.stickersStore
|
||||||
username: selectedUsername
|
username: selectedUsername
|
||||||
onBackBtnClicked: back();
|
onBackBtnClicked: back();
|
||||||
onUsernameRegistered: done(userName);
|
onUsernameRegistered: done(userName);
|
||||||
|
|
|
@ -120,8 +120,8 @@ ModalPopup {
|
||||||
getGasEthValue: root.ensUsernamesStore.getGasEthValue
|
getGasEthValue: root.ensUsernamesStore.getGasEthValue
|
||||||
getFiatValue: root.ensUsernamesStore.getFiatValue
|
getFiatValue: root.ensUsernamesStore.getFiatValue
|
||||||
defaultCurrency: root.ensUsernamesStore.getCurrentCurrency()
|
defaultCurrency: root.ensUsernamesStore.getCurrentCurrency()
|
||||||
isEIP1559Enabled: root.store.isEIP1559Enabled()
|
isEIP1559Enabled: root.ensUsernamesStore.isEIP1559Enabled()
|
||||||
suggestedFees: root.store.suggestedFees()
|
suggestedFees: root.ensUsernamesStore.suggestedFees()
|
||||||
|
|
||||||
property var estimateGas: Backpressure.debounce(gasSelector, 600, function() {
|
property var estimateGas: Backpressure.debounce(gasSelector, 600, function() {
|
||||||
let estimatedGas = root.estimateGasFunction(selectFromAccount.selectedAccount);
|
let estimatedGas = root.estimateGasFunction(selectFromAccount.selectedAccount);
|
||||||
|
@ -217,7 +217,7 @@ ModalPopup {
|
||||||
return root.sendTransaction()
|
return root.sendTransaction()
|
||||||
}
|
}
|
||||||
|
|
||||||
if(gasSelector.isEIP1559Enabled && stack.currentGroup === group2 && gasSelector.advancedMode){
|
if(gasSelector.isEIP1559Enabled && stack.currentGroup === group3 && gasSelector.advancedMode){
|
||||||
if(gasSelector.showPriceLimitWarning || gasSelector.showTipLimitWarning){
|
if(gasSelector.showPriceLimitWarning || gasSelector.showTipLimitWarning){
|
||||||
Global.openPopup(transactionSettingsConfirmationPopupComponent, {
|
Global.openPopup(transactionSettingsConfirmationPopupComponent, {
|
||||||
currentBaseFee: gasSelector.suggestedFees.baseFee,
|
currentBaseFee: gasSelector.suggestedFees.baseFee,
|
||||||
|
|
Loading…
Reference in New Issue