diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
index 2c785f9935c4407419d11ecbfc7b4eceb5f102c9..2d04f2480c121db1c3f424ce9b53ec6042761e15 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
@@ -52,12 +52,12 @@ DapDashboardScreenForm
DapText
{
id: textMetworkAddress
- anchors.verticalCenter: parent.verticalCenter
anchors.left: networkAddressLabel.right
anchors.leftMargin: 36 * pt
- width: 172 * pt
- font.family: dapMainFonts.dapMainFontTheme.dapFontRobotoRegularCustom
- font.pixelSize: 10 * pt
+ anchors.right: networkAddressCopyButton.left
+ anchors.rightMargin: 4 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ fontDapText: dapMainFonts.dapMainFontTheme.dapFontRobotoRegular10
color: "#908D9D"
fullText: address
textElide: Text.ElideRight
@@ -69,8 +69,8 @@ DapDashboardScreenForm
{
id: networkAddressCopyButton
anchors.verticalCenter: parent.verticalCenter
- anchors.left: textMetworkAddress.right
- anchors.leftMargin: 4 * pt
+ anchors.right: parent.right
+ anchors.rightMargin: networkAddressLabel.anchors.leftMargin
width: 16 * pt
height: 16 * pt
hoverEnabled: true
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
index 9786f78a21c0f28fb63c2a309dac336996cf4ecc..f4ae2e19a1627ba66ea188f5744448219f419644 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
@@ -26,14 +26,17 @@ DapDashboardTabForm
dapDashboardTopPanel.dapComboboxWallet.onCurrentIndexChanged:
{
- dapDashboardScreen.dapListViewWallet.model = dapModelWallets.get(dapDashboardTopPanel.dapComboboxWallet.currentIndex).networks
- dapDashboardScreen.dapNameWalletTitle.text = dapModelWallets.get(dapDashboardTopPanel.dapComboboxWallet.currentIndex).name
- console.log("DapGetWalletHistoryCommand")
- console.log(" network: " + dapServiceController.CurrentNetwork)
- console.log(" chain: " + dapServiceController.CurrentChain)
- console.log(" wallet address: " + dapWallets[dapDashboardTopPanel.dapComboboxWallet.currentIndex].findAddress(dapServiceController.CurrentNetwork))
- dapServiceController.requestToService("DapGetWalletHistoryCommand", dapServiceController.CurrentNetwork, dapServiceController.CurrentChain, dapWallets[dapDashboardTopPanel.dapComboboxWallet.currentIndex].findAddress(dapServiceController.CurrentNetwork));
- state = "WALLETSHOW"
+ if(dapDashboardTopPanel.dapComboboxWallet.currentIndex != -1)
+ {
+ dapDashboardScreen.dapListViewWallet.model = dapModelWallets.get(dapDashboardTopPanel.dapComboboxWallet.currentIndex).networks
+ dapDashboardScreen.dapNameWalletTitle.text = dapModelWallets.get(dapDashboardTopPanel.dapComboboxWallet.currentIndex).name
+ console.log("DapGetWalletHistoryCommand")
+ console.log(" network: " + dapServiceController.CurrentNetwork)
+ console.log(" chain: " + dapServiceController.CurrentChain)
+ console.log(" wallet address: " + dapWallets[dapDashboardTopPanel.dapComboboxWallet.currentIndex].findAddress(dapServiceController.CurrentNetwork))
+ dapServiceController.requestToService("DapGetWalletHistoryCommand", dapServiceController.CurrentNetwork, dapServiceController.CurrentChain, dapWallets[dapDashboardTopPanel.dapComboboxWallet.currentIndex].findAddress(dapServiceController.CurrentNetwork));
+ state = "WALLETSHOW"
+ }
}
// Signal-slot connection realizing panel switching depending on predefined rules
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
index f03c9f3982fe79243de123ef80f3647d1df95c71..c349919b55f048a2e7ca59da274c0808e03a17c6 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
@@ -3,5 +3,16 @@ import Demlabs 1.0
DapDashboardTopPanelForm
{
-
+ Component.onCompleted:
+ {
+ if(dapModelWallets.count > 0)
+ {
+ if(dapModelWallets.get(0).name === "all wallets")
+ {
+ dapComboboxWallet.currentIndex = -1;
+ dapModelWallets.remove(0, 1);
+ dapComboboxWallet.currentIndex = 0;
+ }
+ }
+ }
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
index ab0a177fc00675defed36cfd6a8bcf574d0895dd..9af5cd36a84bc8557a726a3697da66734f7626c0 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
@@ -37,6 +37,7 @@ DapAbstractTopPanel
model: dapModelWallets
comboBoxTextRole: ["name"]
mainLineText: "all wallets"
+ isDefaultNeedToAppend: false
indicatorImageNormal: "qrc:/resources/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/resources/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt
@@ -67,6 +68,8 @@ DapAbstractTopPanel
fontComboBox: [dapMainFonts.dapMainFontTheme.dapFontRobotoRegular14]
colorMainTextComboBox: [["#FFFFFF", "#070023"]]
colorTextComboBox: [["#070023", "#FFFFFF"]]
+
+
}
}
//TODO: Disabled until the currency converter is implemented.
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
index e7bd1c973ef2ba7a9c739fe21347182a98d004fd..a72b24f16785d807b713453780ec19783b3d63d4 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
@@ -22,7 +22,7 @@ DapAbstractRightPanel
id: signatureTypeWallet
ListElement
{
- name: "Dilithium in my head"
+ name: "Dilithium"
sign: "sig_dil"
}
ListElement
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
index f5a190eb7e9570daa9b1e480f032dcc194ea9440..0af009dec58444d53916eca860be28d2d16ee3a5 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
@@ -25,4 +25,6 @@ DapNewPaymentMainRightPanelForm
nextActivated("transaction created")
}
+
+
}
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
index 8790b4cb28f219bde4c7402bcb02738828493893..5d73fb435e2a5c19238666804735399f0564a720 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
@@ -14,7 +14,8 @@ DapAbstractRightPanel
property alias dapCmboBoxTokenModel: comboboxToken.model
property alias dapCmboBoxToken: comboboxToken
-
+ //@param dapSendedToken Name of token to send
+ property string dapSendedToken: comboboxToken.mainLineText
property string dapCurrentWallet
@@ -245,7 +246,8 @@ DapAbstractRightPanel
font: dapMainFonts.dapMainFontTheme.dapFontRobotoRegular16
horizontalAlignment: Text.AlignRight
color: "#070023"
- text: "KLVN"
+ text: dapSendedToken
+
}
}
Rectangle
@@ -270,9 +272,10 @@ DapAbstractRightPanel
anchors.rightMargin: 20 * pt
anchors.top: splitLineAmount.top
anchors.topMargin: 16 * pt
- height: textAmountConvertValue.height
+ //height: textAmountConvertValue.height
color: "transparent"
- Text
+ ////////////Delete all USD
+ /*Text
{
id: textAmountConvertValue
anchors.verticalCenter: parent.verticalCenter
@@ -292,7 +295,7 @@ DapAbstractRightPanel
horizontalAlignment: Text.AlignRight
color: "#757184"
text: qsTr("USD")
- }
+ }*/
}
}
@@ -333,7 +336,7 @@ DapAbstractRightPanel
{
id: textInputRecipientWalletAddress
anchors.verticalCenter: parent.verticalCenter
- placeholderText: qsTr("Recipient wallet")
+ placeholderText: qsTr("Receiver Address")
font: dapMainFonts.dapMainFontTheme.dapFontRobotoRegular16
horizontalAlignment: Text.AlignLeft
anchors.top: frameRecipientWalletAddress.top
diff --git a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml
index 0dcadb79e9aed5ce4736ddc894dc33702594b8db..3a2c5516c24621643c0c0d358c34ec7a3b792582 100644
--- a/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml
+++ b/CellFrameDashboardGUI/screen/desktop/History/DapHistoryTab.qml
@@ -26,7 +26,7 @@ DapHistoryTabForm
Component.onCompleted:
{
- for(var i=0; i < dapModelWallets.count; ++i)
+ for(var i=0; i < dapWallets.count; ++i)
{
modelHistory.clear()
dapServiceController.requestToService("DapGetWalletHistoryCommand",