2 files changed, 35 insertions, 12 deletions
diff --git a/ui/app/config.js b/ui/app/config.js
index 0fe232c07..c14fa1d28 100644
--- a/ui/app/config.js
+++ b/ui/app/config.js
@@ -113,7 +113,13 @@ ConfigScreen.prototype.render = function () {
                 alignSelf: 'center',
               },
               onClick (event) {
-                exportAsFile('MetaMask State Logs', window.logState())
+                window.logStateString((err, result) => {
+                  if (err) {
+                    state.dispatch(actions.displayWarning('Error in retrieving state logs.'))
+                  } else {
+                    exportAsFile('MetaMask State Logs', result)
+                  }
+                })
               },
             }, 'Download State Logs'),
           ]),
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index e1a890535..05136f70f 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -1,4 +1,5 @@
 const extend = require('xtend')
+const copyToClipboard = require('copy-to-clipboard')
 
 //
 // Sub-Reducers take in the complete state and return their sub-state
@@ -41,17 +42,33 @@ function rootReducer (state, action) {
   return state
 }
 
-window.logState = function () {
-  const state = window.METAMASK_CACHED_LOG_STATE
-  let version
-  try {
-    version = global.platform.getVersion()
-  } catch (e) {
-    version = 'unable to load version.'
-  }
-  state.version = version
-  const stateString = JSON.stringify(state, removeSeedWords, 2)
-  return stateString
+window.logStateString = function (cb) {
+  let state = window.METAMASK_CACHED_LOG_STATE
+  const version = global.platform.getVersion()
+  const browser = window.navigator.userAgent
+  return global.platform.getPlatformInfo((err, platform) => {
+    if (err) {
+      return cb(err)
+    }
+    state.version = version
+    state.platform = platform
+    state.browser = browser
+    let stateString = JSON.stringify(state, removeSeedWords, 2)
+    return cb(null, stateString)
+  })
+}
+
+window.logState = function (toClipboard) {
+  return window.logStateString((err, result) => {
+    if (err) {
+      console.error(err.message)
+    } else if (toClipboard) {
+      copyToClipboard(result)
+      console.log('State log copied')
+    } else {
+      console.log(result)
+    }
+  })
 }
 
 function removeSeedWords (key, value) {