From b430cbd064fa8564e8f8edf7c6f5517a42646504 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 11 May 2016 12:54:19 -0700
Subject: [PATCH] Fix send view selected account bug

---
 CHANGELOG.md   | 2 ++
 ui/app/send.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ce47f7ac..8062b38f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- Fixed bug where send view would not load correctly the first time it was visited per account.
+
 ## 1.8.1 2016-05-10
 
 - Initial usage of scalable blockchain backend.
diff --git a/ui/app/send.js b/ui/app/send.js
index d34accddc..ff8ef4d65 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -12,7 +12,7 @@ module.exports = connect(mapStateToProps)(SendTransactionScreen)
 
 function mapStateToProps(state) {
   var result = {
-    address: state.appState.currentView.context,
+    address: state.metamask.selectedAccount,
     accounts: state.metamask.accounts,
     identities: state.metamask.identities,
     warning: state.appState.warning,