# Conflicts:
#	.gitignore
#	.gitlab-ci.yml
#	.gitmodules
#	debian
#	prod_build

[*] processing DapServiceController::walletInfoReceived;
[*] DapServiceController::requestWalletList();
[*] DapServiceController::requestWalletInfo()

# Conflicts:
#	CellFrameDashboardGUI/qml.qrc

Two wallet svg

See merge request cellframe/cellframe-dashboard!170

features-4597

See merge request !171

aleksandr.ledyaev authored 4 years ago and Alexandr Mruchok committed 4 years ago

[*] DapWalletTab.qml
[-] DapRightPanel_New.qml
[+] DapRightPanel_New.qml; DapRightPanelPage.qml;
DapRightPanelTextHeader.qml; DapRightPanelComboBoxHeader.qml

wallet_icon_dark_hover" ".png" with similar ones, but ".svg"

[*] left navigation panel

See merge request cellframe/cellframe-dashboard!167

andrei.chegodaikin authored 4 years ago and Alexandr Mruchok committed 4 years ago

DapDashboardScreen screen;

[*] DapCreateVPNOrderPanel.qml

[*] DapCreateVPNOrderPanel.qml; DapVPNServiceTab.qml;
DapVPNServiceTopPanel.qml
[+] ic_info_order.svg; DapVPNOrderInfoLine.qml; DapVPNOrdersGridView.qml

[*] DapCreateVPNOrderPanel.qml; DapNoOrdersPanel.qml; DapTextButton.qml;
DapVPNServiceTopPanel.qml
[+] DapDoubleSpinBox.qml; DapRightPanelElement.qml; DapSpinBox.qml

[*] DapMainApplicationWindow.qml
[+] DapCreateVPNOrderPanel.qml; DapNoOrdersPanel.qml; DapTextButton.qml;
DapVPNServiceTab.qml; DapVPNServiceTopPanel.qml; icon_vpn-service.svg;
icon_vpn-service_hover.svg; illustration_vpn-service.svg

# Conflicts:
#	CellFrameDashboardGUI/qml.qrc

[+] Wallet point to left menu;
[+] DapTokensListView, DapWalletTab, DapWalletTopPanel;

[*] CellFrameDashboardGUI.pro; DapApplication.cpp
[+] QRCodeGenerator.h; QRCodeGenerator.cpp; QrCodeQuickItem

DapNetworkPopupButton.qml

ic_copy_hover.svg; Icon_sync_net.svg; Icon_sync_net_hover.svg; next-
page.svg; next-page_hover.svg;

[-] networks_next_icon.png; networks_next_icon_hover.png;
networks_previous_icon.png; networks_previous_icon_hover.png

[*] DapNetworkName.qml; DapNetworkPanelButton.qml;
DapNetworkPopupButton.qml; DapNetworkPopup.qml; DapNetworksList.qml;
DapNetworksPanel.qml