From e45409b4005ca74c9f1854cfac48a9062da34d42 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Thu, 15 Oct 2020 14:12:35 -0400
Subject: [PATCH] feat: add account selectort

---
 ui/app/AppLayouts/Browser/BrowserHeader.qml   | 25 --------
 .../AppLayouts/Browser/BrowserWalletMenu.qml  | 62 +++++++++++++++++++
 2 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/ui/app/AppLayouts/Browser/BrowserHeader.qml b/ui/app/AppLayouts/Browser/BrowserHeader.qml
index a756ac735c..6e3a922e61 100644
--- a/ui/app/AppLayouts/Browser/BrowserHeader.qml
+++ b/ui/app/AppLayouts/Browser/BrowserHeader.qml
@@ -133,31 +133,6 @@ Rectangle {
             }
         }
 
-        Menu {
-            id: accountsMenu
-            Repeater {
-                model: walletModel.accounts
-                MenuItem {
-                    visible: model.isWallet || model.walletType === "generated"
-                    height: visible ? 40 : 0
-                    text: model.name
-                    onTriggered: {
-                        web3Provider.dappsAddress = model.address;
-                        web3Provider.clearPermissions();
-                        for (let i = 0; i < tabs.count; ++i){
-                            tabs.getTab(i).item.reload();
-                        }
-                    }
-                    checked: {
-                        if(web3Provider.dappsAddress === model.address){
-                            return true;
-                        }
-                        return false;
-                    }
-                }
-            }
-        }
-
         BrowserWalletMenu {
             id: browserWalletMenu
             y: root.height + root.anchors.topMargin
diff --git a/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml b/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml
index defd60c593..ea0f3f9471 100644
--- a/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml
+++ b/ui/app/AppLayouts/Browser/BrowserWalletMenu.qml
@@ -73,4 +73,66 @@ Popup {
             }
         }
     }
+
+    Item {
+        property string currentAddress: ""
+        id: accountSelectorRow
+        width: parent.width
+        height: 44
+        anchors.top: walletHeader.bottom
+        anchors.topMargin: Style.current.bigPadding
+
+        AccountSelector {
+            id: accountRow
+            label: ""
+            anchors.left: parent.left
+            anchors.right: copyBtn.left
+            anchors.rightMargin: Style.current.padding
+            accounts: walletModel.accounts
+            selectedAccount: walletModel.currentAccount
+            currency: walletModel.defaultCurrency
+            reset: function() {
+                accounts = Qt.binding(function() { return walletModel.accounts })
+                selectedAccount = Qt.binding(function() { return walletModel.currentAccount })
+            }
+            onSelectedAccountChanged: {
+                if (!accountSelectorRow.currentAddress) {
+                    // We just set the account for the first time. Nothing to do here
+                    accountSelectorRow.currentAddress = selectedAccount.address
+                    return
+                }
+                if (accountSelectorRow.currentAddress === selectedAccount.address) {
+                    return
+                }
+
+                accountSelectorRow.currentAddress = selectedAccount.address
+                web3Provider.dappsAddress = selectedAccount.address;
+                web3Provider.clearPermissions();
+                for (let i = 0; i < tabs.count; ++i){
+                    tabs.getTab(i).item.reload();
+                }
+            }
+        }
+
+        CopyToClipBoardButton {
+            id: copyBtn
+            width: 20
+            height: 20
+            anchors.right: sendBtn.left
+            anchors.rightMargin: Style.current.padding
+            anchors.verticalCenter: parent.verticalCenter
+            textToCopy: accountRow.selectedAccount.address
+        }
+
+        StatusIconButton {
+            id: sendBtn
+            icon.name: "send"
+            width: 20
+            height: 20
+            anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+            iconColor: Style.current.primary
+            onClicked: console.log("Send Tx")
+        }
+    }
 }