From 472ce4702073dac083a0c647b5731b62293cda0b Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Thu, 3 Nov 2022 21:29:21 +0300
Subject: [PATCH] fix resolving of history back promise

---
 src/components/appRouter.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/appRouter.js b/src/components/appRouter.js
index f6f5e8e53c..05feb0ff9c 100644
--- a/src/components/appRouter.js
+++ b/src/components/appRouter.js
@@ -63,7 +63,11 @@ class AppRouter {
         if (this.promiseShow) await this.promiseShow;
 
         this.promiseShow = new Promise((resolve) => {
-            this.resolveOnNextShow = resolve;
+            const unlisten = history.listen(() => {
+                unlisten();
+                this.promiseShow = null;
+                resolve();
+            });
             history.back();
         });