2 files changed, 38 insertions, 0 deletions
diff --git a/app/scripts/migrations/028.js b/app/scripts/migrations/028.js
new file mode 100644
index 000000000..ce52cec05
--- /dev/null
+++ b/app/scripts/migrations/028.js
@@ -0,0 +1,37 @@
+// next version number
+const version = 28
+
+/*
+
+normalizes txParams on unconfirmed txs
+
+*/
+const clone = require('clone')
+
+module.exports = {
+  version,
+
+  migrate: async function (originalVersionedData) {
+    const versionedData = clone(originalVersionedData)
+    versionedData.meta.version = version
+    const state = versionedData.data
+    const newState = transformState(state)
+    versionedData.data = newState
+    return versionedData
+  },
+}
+
+function transformState (state) {
+  const newState = state
+
+  if (newState.PreferencesController) {
+    if (newState.PreferencesController.tokens) {
+      const tokens = newState.TransactionController.tokens
+      const selectedAddress = newState.PreferencesController.selectedAddress
+      newState.PreferencesController.tokens = []
+      newState.PreferencesController.addressTokens = {'mainnet': {selectedAddress: tokens}}
+    }
+  }
+
+  return newState
+}
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 04d90bfff..2499b7fd1 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -37,4 +37,5 @@ module.exports = [
   require('./024'),
   require('./025'),
   require('./026'),
+  require('./028'),
 ]