Merge branch 'dev' into TxManager

1 files changed, 62 insertions, 0 deletions

diff --git a/development/states/notice.json b/development/states/notice.json
new file mode 100644
index 000000000..f974d358e
--- /dev/null
+++ b/development/states/notice.json
@@ -0,0 +1,62 @@
+{
+  "metamask": {
+    "isInitialized": true,
+    "isUnlocked": true,
+    "identities": {
+      "0x24a1d059462456aa332d6da9117aa7f91a46f2ac": {
+        "address": "0x24a1d059462456aa332d6da9117aa7f91a46f2ac",
+        "name": "Account 1"
+      }
+    },
+    "unconfTxs": {},
+    "currentFiat": "USD",
+    "conversionRate": 8.3533002,
+    "conversionDate": 1481671082,
+    "noActiveNotices": false,
+    "lastUnreadNotice": {
+      "read": false,
+      "date": "Tue Dec 13 2016",
+      "title": "MultiVault Support",
+      "body": "# Multi\n# Line\n## Support\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi tincidunt dapibus justo a auctor. Sed luctus metus non mi laoreet, sit amet placerat nibh ultricies. Cras fringilla, urna sit amet sodales porttitor, lacus risus lacinia lorem, non euismod magna felis id ex. Nam iaculis, ante nec imperdiet suscipit, nisi quam fringilla nisl, sed fringilla turpis lectus et nibh. Pellentesque sed neque pretium nulla elementum lacinia eu eget felis. Nulla facilisi. Pellentesque id mi tempor, tempus sapien id, ultricies nibh. Integer faucibus elit non orci dapibus porttitor. Pellentesque rutrum hendrerit sapien ut lacinia. Nunc elementum eget arcu eu volutpat. Integer ullamcorper aliquam metus, eu malesuada tellus vestibulum a.\n",
+      "id": 0
+    },
+    "network": "3",
+    "accounts": {
+      "0x24a1d059462456aa332d6da9117aa7f91a46f2ac": {
+        "code": "0x",
+        "nonce": "0x0",
+        "balance": "0x0",
+        "address": "0x24a1d059462456aa332d6da9117aa7f91a46f2ac"
+      }
+    },
+    "transactions": [],
+    "provider": {
+      "type": "testnet"
+    },
+    "selectedAccount": "0x24a1d059462456aa332d6da9117aa7f91a46f2ac",
+    "seedWords": null,
+    "isDisclaimerConfirmed": true,
+    "unconfMsgs": {},
+    "messages": [],
+    "shapeShiftTxList": [],
+    "keyringTypes": [
+      "Simple Key Pair",
+      "HD Key Tree"
+    ]
+  },
+  "appState": {
+    "menuOpen": false,
+    "currentView": {
+      "name": "accountDetail",
+      "detailView": null,
+      "context": "0x24a1d059462456aa332d6da9117aa7f91a46f2ac"
+    },
+    "accountDetail": {
+      "subview": "transactions"
+    },
+    "transForward": true,
+    "isLoading": false,
+    "warning": null
+  },
+  "identities": {}
+}