2 files changed, 32 insertions, 1 deletions
diff --git a/test/integration/lib/send-new-ui.js b/test/integration/lib/send-new-ui.js
index 7bd9a7a65..163f3658c 100644
--- a/test/integration/lib/send-new-ui.js
+++ b/test/integration/lib/send-new-ui.js
@@ -129,7 +129,6 @@ async function runSendFlowTest(assert, done) {
 
   selectState.val('send edit')
   reactTriggerChange(selectState[0])
-  await timeout(10000)
 
   const confirmFromName = (await queryAsync($, '.sender-to-recipient__sender-name')).first()
   assert.equal(confirmFromName[0].textContent, 'Send Account 2', 'confirm screen should show correct from name')
diff --git a/test/unit/migrations/022-test.js b/test/unit/migrations/022-test.js
new file mode 100644
index 000000000..1333d929d
--- /dev/null
+++ b/test/unit/migrations/022-test.js
@@ -0,0 +1,32 @@
+const assert = require('assert')
+const migration22 = require('../../../app/scripts/migrations/022')
+const properTime = (new Date()).getTime()
+const storage = {
+  "meta": {},
+  "data": {
+    "TransactionController": {
+      "transactions": [
+        { "status": "submitted" },
+        { "status": "submitted", "submittedTime": properTime },
+        {"status": "confirmed"},
+      ]
+    },
+  },
+}
+
+describe('storage is migrated successfully where transactions that are submitted have submittedTimes', () => {
+  it('should add submittedTime key on the txMeta if appropriate', (done) => {
+    migration22.migrate(storage)
+    .then((migratedData) => {
+      const [txMeta1, txMeta2, txMeta3] = migratedData.data.TransactionController.transactions
+      assert.equal(migratedData.meta.version, 22)
+      // should have written a submitted time
+      assert(txMeta1.submittedTime)
+      // should not have written a submitted time because it already has one
+      assert.equal(txMeta2.submittedTime, properTime)
+      // should not have written a submitted time
+      assert(!txMeta3.submittedTime)
+      done()
+    }).catch(done)
+  })
+})