Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu

2 files changed, 190 insertions, 0 deletions

diff --git a/development/states/compilation-bug.json b/development/states/compilation-bug.json
new file mode 100644
index 000000000..a9dfc4d4e
--- /dev/null
+++ b/development/states/compilation-bug.json
@@ -0,0 +1,124 @@
+{
+  "metamask": {
+    "isInitialized": true,
+    "isUnlocked": true,
+    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "identities": {
+      "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9": {
+        "address": "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9",
+        "name": "Account 1"
+      },
+      "0xd7c0cd9e7d2701c710d64fc492c7086679bdf7b4": {
+        "address": "0xd7c0cd9e7d2701c710d64fc492c7086679bdf7b4",
+        "name": "Account 2"
+      },
+      "0x1acfb961c5a8268eac8e09d6241a26cbeff42241": {
+        "address": "0x1acfb961c5a8268eac8e09d6241a26cbeff42241",
+        "name": "Account 3"
+      },
+      "0xabc2bca51709b8615147352c62420f547a63a00c": {
+        "address": "0xabc2bca51709b8615147352c62420f547a63a00c",
+        "name": "Account 4"
+      }
+    },
+    "unconfTxs": {
+      "7992944905869041": {
+        "id": 7992944905869041,
+        "txParams": {
+          "from": "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9",
+          "value": "0x0",
+          "data": "0x606060405234610000575b60da806100186000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630dbe671f14603c575b6000565b3460005760466088565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820a99dfa6091771f518dd1ae8d1ee347bae3304dffd98fd24b1b99a8380bc60a750029",
+          "gas": "0x1af75",
+          "metamaskId": 7992944905869041,
+          "metamaskNetworkId": "3"
+        },
+        "time": 1482279685589,
+        "status": "unconfirmed",
+        "gasMultiplier": 1,
+        "metamaskNetworkId": "3",
+        "gasLimitSpecified": true,
+        "estimatedGas": "0x1af75",
+        "simulationFails": true
+      }
+    },
+    "currentFiat": "USD",
+    "conversionRate": 7.69158136,
+    "conversionDate": 1482279663,
+    "noActiveNotices": true,
+    "network": "3",
+    "accounts": {
+      "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9": {
+        "code": "0x",
+        "nonce": "0x3",
+        "balance": "0x11f646fe14c9c000",
+        "address": "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9"
+      },
+      "0xd7c0cd9e7d2701c710d64fc492c7086679bdf7b4": {
+        "code": "0x",
+        "nonce": "0x0",
+        "balance": "0x0",
+        "address": "0xd7c0cd9e7d2701c710d64fc492c7086679bdf7b4"
+      },
+      "0x1acfb961c5a8268eac8e09d6241a26cbeff42241": {
+        "code": "0x",
+        "balance": "0x0",
+        "nonce": "0x0",
+        "address": "0x1acfb961c5a8268eac8e09d6241a26cbeff42241"
+      },
+      "0xabc2bca51709b8615147352c62420f547a63a00c": {
+        "code": "0x",
+        "balance": "0x0",
+        "nonce": "0x0",
+        "address": "0xabc2bca51709b8615147352c62420f547a63a00c"
+      }
+    },
+    "transactions": [
+      {
+        "id": 7992944905869041,
+        "txParams": {
+          "from": "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9",
+          "value": "0x0",
+          "data": "0x606060405234610000575b60da806100186000396000f30060606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630dbe671f14603c575b6000565b3460005760466088565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b600060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16815600a165627a7a72305820a99dfa6091771f518dd1ae8d1ee347bae3304dffd98fd24b1b99a8380bc60a750029",
+          "gas": "0x1af75",
+          "metamaskId": 7992944905869041,
+          "metamaskNetworkId": "3"
+        },
+        "time": 1482279685589,
+        "status": "unconfirmed",
+        "gasMultiplier": 1,
+        "metamaskNetworkId": "3",
+        "gasLimitSpecified": true,
+        "estimatedGas": "0x1af75",
+        "simulationFails": true
+      }
+    ],
+    "provider": {
+      "type": "testnet"
+    },
+    "selectedAccount": "0xac39b311dceb2a4b2f5d8461c1cdaf756f4f7ae9",
+    "seedWords": false,
+    "isDisclaimerConfirmed": true,
+    "unconfMsgs": {},
+    "messages": [],
+    "shapeShiftTxList": [],
+    "keyringTypes": [
+      "Simple Key Pair",
+      "HD Key Tree"
+    ],
+    "lostAccounts": []
+  },
+  "appState": {
+    "menuOpen": false,
+    "currentView": {
+      "name": "confTx",
+      "context": 0
+    },
+    "accountDetail": {
+      "subview": "transactions"
+    },
+    "transForward": true,
+    "isLoading": false,
+    "warning": null
+  },
+  "identities": {}
+}
\ No newline at end of file
diff --git a/development/states/new-account.json b/development/states/new-account.json
new file mode 100644
index 000000000..8c9be3654
--- /dev/null
+++ b/development/states/new-account.json
@@ -0,0 +1,66 @@
+{
+  "metamask": {
+    "isInitialized": true,
+    "isUnlocked": true,
+    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "identities": {
+      "0xa6ef573d60594731178b7f85d80da13cc2af52dd": {
+        "address": "0xa6ef573d60594731178b7f85d80da13cc2af52dd",
+        "name": "Dan! 1"
+      },
+      "0xf9f52e84ad2c9122caa87478d27041ddaa215666": {
+        "address": "0xf9f52e84ad2c9122caa87478d27041ddaa215666",
+        "name": "Account 2"
+      }
+    },
+    "unconfTxs": {},
+    "currentFiat": "USD",
+    "conversionRate": 10.92067835,
+    "conversionDate": 1478282884,
+    "network": null,
+    "accounts": {
+      "0xa6ef573d60594731178b7f85d80da13cc2af52dd": {
+        "balance": "0x00",
+        "nonce": "0x100000",
+        "code": "0x",
+        "address": "0xa6ef573d60594731178b7f85d80da13cc2af52dd"
+      },
+      "0xf9f52e84ad2c9122caa87478d27041ddaa215666": {
+        "balance": "0x00",
+        "nonce": "0x100000",
+        "code": "0x",
+        "address": "0xf9f52e84ad2c9122caa87478d27041ddaa215666"
+      }
+    },
+    "transactions": [],
+    "provider": {
+      "type": "testnet"
+    },
+    "selectedAccount": "0xa6ef573d60594731178b7f85d80da13cc2af52dd",
+    "isConfirmed": true,
+    "unconfMsgs": {},
+    "messages": [],
+    "selectedAddress": "0xa6ef573d60594731178b7f85d80da13cc2af52dd",
+    "shapeShiftTxList": [],
+    "keyringTypes": [
+      "Simple Key Pair",
+      "HD Key Tree"
+    ]
+  },
+  "appState": {
+    "menuOpen": false,
+    "currentView": {
+      "name": "new-account"
+    },
+    "accountDetail": {
+      "subview": "transactions"
+    },
+    "transForward": true,
+    "isLoading": false,
+    "warning": null,
+    "forgottenPassword": null,
+    "detailView": {},
+    "scrollToBottom": false
+  },
+  "identities": {}
+}
\ No newline at end of file