Merge branch 'uat' into uat-master-011618

1 files changed, 27 insertions, 0 deletions

diff --git a/old-ui/lib/tx-helper.js b/old-ui/lib/tx-helper.js
new file mode 100644
index 000000000..de3f00d2d
--- /dev/null
+++ b/old-ui/lib/tx-helper.js
@@ -0,0 +1,27 @@
+const valuesFor = require('../app/util').valuesFor
+
+module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network) {
+  log.debug('tx-helper called with params:')
+  log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network })
+
+  const txValues = network ? valuesFor(unapprovedTxs).filter(txMeta => txMeta.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
+  log.debug(`tx helper found ${txValues.length} unapproved txs`)
+
+  const msgValues = valuesFor(unapprovedMsgs)
+  log.debug(`tx helper found ${msgValues.length} unsigned messages`)
+  let allValues = txValues.concat(msgValues)
+
+  const personalValues = valuesFor(personalMsgs)
+  log.debug(`tx helper found ${personalValues.length} unsigned personal messages`)
+  allValues = allValues.concat(personalValues)
+
+  const typedValues = valuesFor(typedMessages)
+  log.debug(`tx helper found ${typedValues.length} unsigned typed messages`)
+  allValues = allValues.concat(typedValues)
+
+  allValues = allValues.sort((a, b) => {
+    return a.time > b.time
+  })
+
+  return allValues
+}