fix merge conflicts

1 files changed, 27 insertions, 0 deletions

diff --git a/app/scripts/migrations/029.js b/app/scripts/migrations/029.js
new file mode 100644
index 000000000..e17479ccc
--- /dev/null
+++ b/app/scripts/migrations/029.js
@@ -0,0 +1,27 @@
+// next version number
+const version = 29
+const failTxsThat = require('./fail-tx')
+
+// time
+const seconds = 1000
+const minutes = 60 * seconds
+const hours = 60 * minutes
+const unacceptableDelay = 12 * hours
+
+/*
+
+normalizes txParams on unconfirmed txs
+
+*/
+
+module.exports = {
+  version,
+
+  migrate: failTxsThat(version, 'Stuck in approved state for too long.', (txMeta) => {
+    const isApproved = txMeta.status === 'approved'
+    const createdTime = txMeta.submittedTime
+    const now = Date.now()
+    return isApproved && now - createdTime > unacceptableDelay
+  }),
+}
+