From d876e4482bd7f9ef026e250fb314e6c50327899d Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 17 Feb 2017 14:32:08 +0000
Subject: [PATCH 1/2] Fix broken tests caused by adding IndexedDB support

This test assumed that `/sync` would be called immediately after rendering
`<MatrixChat />` but this isn't true in an IndexedDB world: it bounces via
`store.startup()` first.

It looks like the tests resolve this by adding `q.delay(1)` so that's what
I've done: in the future it would be better to extend `HttpBackend` to have
a `waitFor(req) Promise` function so we can removing timing from the tests.
---
 test/app-tests/joining.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 442b67c2d..30ef70db9 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -95,7 +95,10 @@ describe('joining a room', function () {
             });
 
             var roomView;
-            httpBackend.flush().then(() => {
+            // wait for /sync to happen
+            return q.delay(1).then(() => {
+                return httpBackend.flush();
+            }).then(() => {
                 var roomDir = ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, RoomDirectory);
 

From aad880b3b5cfea20d1f045932361356d34b7f7a8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 17 Feb 2017 15:31:28 +0000
Subject: [PATCH 2/2] Fix icon paths in manifest

They are not at the root of the web server, they are at the same
path as the manifest
---
 res/vector-icons/manifest.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/vector-icons/manifest.json b/res/vector-icons/manifest.json
index 2a34a2d2c..feab1753c 100644
--- a/res/vector-icons/manifest.json
+++ b/res/vector-icons/manifest.json
@@ -2,37 +2,37 @@
 	"name": "Riot",
 	"icons": [
 		{
-			"src": "\/icons\/android-chrome-36x36.png",
+			"src": "android-chrome-36x36.png",
 			"sizes": "36x36",
 			"type": "image\/png",
 			"density": "0.75"
 		},
 		{
-			"src": "\/icons\/android-chrome-48x48.png",
+			"src": "android-chrome-48x48.png",
 			"sizes": "48x48",
 			"type": "image\/png",
 			"density": "1.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-72x72.png",
+			"src": "android-chrome-72x72.png",
 			"sizes": "72x72",
 			"type": "image\/png",
 			"density": "1.5"
 		},
 		{
-			"src": "\/icons\/android-chrome-96x96.png",
+			"src": "android-chrome-96x96.png",
 			"sizes": "96x96",
 			"type": "image\/png",
 			"density": "2.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-144x144.png",
+			"src": "android-chrome-144x144.png",
 			"sizes": "144x144",
 			"type": "image\/png",
 			"density": "3.0"
 		},
 		{
-			"src": "\/icons\/android-chrome-192x192.png",
+			"src": "android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png",
 			"density": "4.0"