Merged master into dev

1 files changed, 40 insertions, 0 deletions

diff --git a/development/states/terms-and-conditions.json b/development/states/terms-and-conditions.json
new file mode 100644
index 000000000..b20f819ed
--- /dev/null
+++ b/development/states/terms-and-conditions.json
@@ -0,0 +1,40 @@
+{
+  "metamask": {
+    "isInitialized": false,
+    "isUnlocked": false,
+    "rpcTarget": "https://rawtestrpc.metamask.io/",
+    "identities": {},
+    "unconfTxs": {},
+    "currentFiat": "USD",
+    "conversionRate": 8.18703468,
+    "conversionDate": 1481755832,
+    "network": "3",
+    "accounts": {},
+    "transactions": [],
+    "provider": {
+      "type": "testnet"
+    },
+    "isDisclaimerConfirmed": false,
+    "unconfMsgs": {},
+    "messages": [],
+    "shapeShiftTxList": [],
+    "keyringTypes": [
+      "Simple Key Pair",
+      "HD Key Tree"
+    ]
+  },
+  "appState": {
+    "menuOpen": false,
+    "currentView": {
+      "name": "accounts",
+      "detailView": null
+    },
+    "accountDetail": {
+      "subview": "transactions"
+    },
+    "transForward": true,
+    "isLoading": false,
+    "warning": null
+  },
+  "identities": {}
+}
\ No newline at end of file