3 files changed, 42 insertions, 3 deletions
diff --git a/ui/app/helpers/conversions.util.js b/ui/app/helpers/conversions.util.js
index 5204faa1f..20ef9e35b 100644
--- a/ui/app/helpers/conversions.util.js
+++ b/ui/app/helpers/conversions.util.js
@@ -1,6 +1,11 @@
+import ethUtil from 'ethereumjs-util'
 import { conversionUtil } from '../conversion-util'
 import { ETH, GWEI, WEI } from '../constants/common'
 
+export function bnToHex (inputBn) {
+  return ethUtil.addHexPrefix(inputBn.toString(16))
+}
+
 export function hexToDecimal (hexValue) {
   return conversionUtil(hexValue, {
     fromNumericBase: 'hex',
@@ -8,6 +13,13 @@ export function hexToDecimal (hexValue) {
   })
 }
 
+export function decimalToHex (decimal) {
+  return conversionUtil(decimal, {
+    fromNumericBase: 'dec',
+    toNumericBase: 'hex',
+  })
+}
+
 export function getEthConversionFromWeiHex ({ value, conversionRate, numberOfDecimals = 6 }) {
   const denominations = [ETH, GWEI, WEI]
 
diff --git a/ui/app/helpers/tests/transactions.util.test.js b/ui/app/helpers/tests/transactions.util.test.js
new file mode 100644
index 000000000..103a84a8c
--- /dev/null
+++ b/ui/app/helpers/tests/transactions.util.test.js
@@ -0,0 +1,22 @@
+import * as utils from '../transactions.util'
+import assert from 'assert'
+
+describe('Transactions utils', () => {
+  describe('getTokenData', () => {
+    it('should return token data', () => {
+      const tokenData = utils.getTokenData('0xa9059cbb00000000000000000000000050a9d56c2b8ba9a5c7f2c08c3d26e0499f23a7060000000000000000000000000000000000000000000000000000000000004e20')
+      assert.ok(tokenData)
+      const { name, params } = tokenData
+      assert.equal(name, 'transfer')
+      const [to, value] = params
+      assert.equal(to.name, '_to')
+      assert.equal(to.type, 'address')
+      assert.equal(value.name, '_value')
+      assert.equal(value.type, 'uint256')
+    })
+
+    it('should not throw errors when called without arguments', () => {
+      assert.doesNotThrow(() => utils.getTokenData())
+    })
+  })
+})
diff --git a/ui/app/helpers/transactions.util.js b/ui/app/helpers/transactions.util.js
index 0e1a6ca37..8b87bb538 100644
--- a/ui/app/helpers/transactions.util.js
+++ b/ui/app/helpers/transactions.util.js
@@ -14,19 +14,20 @@ import {
   TRANSFER_FROM_ACTION_KEY,
   SIGNATURE_REQUEST_KEY,
   UNKNOWN_FUNCTION_KEY,
+  CANCEL_ATTEMPT_ACTION_KEY,
 } from '../constants/transactions'
 
 import { addCurrencies } from '../conversion-util'
 
 abiDecoder.addABI(abi)
 
-export function getTokenData (data = {}) {
+export function getTokenData (data = '') {
   return abiDecoder.decodeMethod(data)
 }
 
 const registry = new MethodRegistry({ provider: global.ethereumProvider })
 
-export async function getMethodData (data = {}) {
+export async function getMethodData (data = '') {
   const prefixedData = ethUtil.addHexPrefix(data)
   const fourBytePrefix = prefixedData.slice(0, 10)
   const sig = await registry.lookup(fourBytePrefix)
@@ -44,7 +45,11 @@ export function isConfirmDeployContract (txData = {}) {
 }
 
 export async function getTransactionActionKey (transaction, methodData) {
-  const { txParams: { data, to } = {}, msgParams } = transaction
+  const { txParams: { data, to } = {}, msgParams, type } = transaction
+
+  if (type === 'cancel') {
+    return CANCEL_ATTEMPT_ACTION_KEY
+  }
 
   if (msgParams) {
     return SIGNATURE_REQUEST_KEY