1 files changed, 7 insertions, 6 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 8bd7766ad..7782fc41e 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -19,7 +19,7 @@ const setupRaven = require('./lib/setupRaven')
 const reportFailedTxToSentry = require('./lib/reportFailedTxToSentry')
 const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics')
 const EdgeEncryptor = require('./edge-encryptor')
-
+const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code')
 
 const STORAGE_KEY = 'metamask-config'
 const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
@@ -58,7 +58,8 @@ setupMetamaskMeshMetrics()
 
 async function initialize () {
   const initState = await loadStateFromPersistence()
-  await setupController(initState)
+  const initLangCode = await getFirstPreferredLangCode()
+  await setupController(initState, initLangCode)
   log.debug('MetaMask initialization complete.')
 }
 
@@ -84,17 +85,16 @@ async function loadStateFromPersistence () {
 
   // write to disk
   if (localStore.isSupported) localStore.set(versionedData)
-  diskStore.putState(versionedData)
 
   // return just the data
   return versionedData.data
 }
 
-function setupController (initState) {
+function setupController (initState, initLangCode) {
   //
   // MetaMask Controller
   //
-
+  
   const controller = new MetamaskController({
     // User confirmation callbacks:
     showUnconfirmedMessage: triggerUi,
@@ -102,6 +102,8 @@ function setupController (initState) {
     showUnapprovedTx: triggerUi,
     // initial state
     initState,
+    // initial locale code
+    initLangCode,
     // platform specific api
     platform,
     encryptor: isEdge ? new EdgeEncryptor() : undefined,
@@ -121,7 +123,6 @@ function setupController (initState) {
     debounce(1000),
     storeTransform(versionifyData),
     storeTransform(syncDataWithExtension),
-    asStream(diskStore),
     (error) => {
       log.error('pump hit error', error)
     }