From 008554463d0478e9b06f0da35dce1af83d08eb55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 13 Nov 2019 09:52:59 +0100
Subject: [PATCH] Lifecycle: Move the event index deletion into the clear
 storage method.

---
 src/Lifecycle.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 7360cd3231..1e68bcc062 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -613,7 +613,6 @@ export function onLoggedOut() {
     // so that React components unmount first. This avoids React soft crashes
     // that can occur when components try to use a null client.
     dis.dispatch({action: 'on_logged_out'});
-    EventIndexPeg.deleteEventIndex().done();
     stopMatrixClient();
     _clearStorage().done();
 }
@@ -633,7 +632,13 @@ function _clearStorage() {
         // we'll never make any requests, so can pass a bogus HS URL
         baseUrl: "",
     });
-    return cli.clearStores();
+
+    const clear = async() => {
+        await EventIndexPeg.deleteEventIndex();
+        await cli.clearStores();
+    }
+
+    return clear();
 }
 
 /**