Merge branch 'master' into #633-load-open-orders

AugurProject · Aug 8, 2016 · 95d3662 · 95d3662
2 parents 58d1a44 + 72d2f64
commit 95d3662
Show file tree

Hide file tree

Showing 7 changed files with 70,683 additions and 60,109 deletions.
diff --git a/azure/2.0.0/build.js b/azure/2.0.0/build.js
diff --git a/azure/2.0.0/build.js.map b/azure/2.0.0/build.js.map
diff --git a/azure/2.0.0/splash.css b/azure/2.0.0/splash.css
diff --git a/azure/2.0.0/styles.css b/azure/2.0.0/styles.css
diff --git a/azure/env.json b/azure/env.json
@@ -0,0 +1,5 @@
+{
+   "gethHttpURL": "http://127.0.0.1:8545",
+   "gethWebsocketsURL": "ws://127.0.0.1:8546",
+   "autoLogin": true
+}
diff --git a/azure/index.html b/azure/index.html
@@ -11,7 +11,8 @@
 	<meta name="e840127dba35b2939858e9ed30d25cb70b353e25" content="117ae21d29f8732b0bde7381da50aa67b1548bd9" />
 
 	<link rel="icon" href="data:;base64,iVBORw0KGgo=">
-	<style type="text/css">#app,#splash,body,html{width:100%;height:100%}#splash,#splash-text{top:0;left:0;overflow:hidden}#splash{display:block;position:relative;color:#f5f5f5;background:#efefef}#splash-text{display:inline-block;position:absolute;bottom:0;right:0;width:50px;height:50px;margin:auto;color:#fbfbfb;background-image:url(2.0.0/images/augur_logo_200_white.png);background-repeat:no-repeat;background-position:center center;background-size:contain;font-family:Impact,"Arial Black","Avant Garde",Charcoal,sans-serif;font-size:20vh;font-weight:700;text-shadow:0 0 50px #e9e9e9;text-align:center;animation-name:splash-anim;animation-duration:10s;animation-iteration-count:infinite;animation-timing-function:cubic-bezier(.11,.63,.25,.89);animation-direction:alternate}@keyframes splash-anim{0%{transform:scale(1) rotate(0)}100%{transform:scale(4) rotate(3deg)}}</style>
+	<style type="text/css">#app,#splash,body,html{width:100%;height:100%}#splash,#splash-text{top:0;left:0;overflow:hidden}#splash{display:block;position:relative;color:#f5f5f5;background:#efefef}#splash-text{display:inline-block;position:absolute;bottom:0;right:0;width:50px;height:50px;margin:auto;color:#fbfbfb;background-image:url(2.0.0/images/augur_logo_200_white.png);background-repeat:no-repeat;background-position:center center;background-size:contain;font-family:Impact,"Arial Black","Avant Garde",Charcoal,sans-serif;font-size:20vh;font-weight:700;text-shadow:0 0 50px #e9e9e9;text-align:center;animation-name:splash-anim;animation-duration:10s;animation-iteration-count:infinite;animation-timing-function:cubic-bezier(.11,.63,.25,.89);animation-direction:alternate}@keyframes splash-anim{0%{transform:scale(1) rotate(0)}100%{transform:scale(4) rotate(3deg)}}
+</style>
 	<link rel="stylesheet" type="text/css" href="/2.0.0/styles.css">
 	<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:700,900,400">
 
@@ -23,3 +24,4 @@
 </head>
 <body><div id="app"><div id="splash"><span id="splash-text"></span></div></div></body>
 </html>
+
diff --git a/src/modules/app/actions/listen-to-updates.js b/src/modules/app/actions/listen-to-updates.js
@@ -30,7 +30,7 @@ export function listenToUpdates() {
 
 			// new market, result = { blockNumber, marketId }
 			(errNone, result) => {
-				if (!result.marketId) {
+				if (!result || !result.marketId) {
 					return;
 				}
 				dispatch(loadMarketsInfo(result.marketId));