Get currency from state in account details, send and confirm screens.

1 files changed, 4 insertions, 1 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 76cf1bae1..de6a06a58 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -76,6 +76,7 @@ function mapStateToProps (state) {
     lastUnreadNotice: state.metamask.lastUnreadNotice,
     lostAccounts: state.metamask.lostAccounts,
     frequentRpcList: state.metamask.frequentRpcList || [],
+    currentCurrency: state.metamask.currentCurrency,
 
     // state needed to get account dropdown temporarily rendering from app bar
     identities,
@@ -96,7 +97,9 @@ function mapDispatchToProps (dispatch, ownProps) {
 }
 
 App.prototype.componentWillMount = function () {
-  this.props.setCurrentCurrencyToUSD()
+  if (!this.props.currentCurrency) {
+    this.props.setCurrentCurrencyToUSD()
+  }
 }
 
 App.prototype.render = function () {