From eac74aa0b7cc288f278e061d37e617038989ff60 Mon Sep 17 00:00:00 2001 From: Lyubo Marinov Date: Sun, 15 Apr 2018 23:14:50 -0500 Subject: [PATCH] [RN] Fix _getRouteToRender after Deeplinking (#2760) --- react/features/app/middleware.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/react/features/app/middleware.js b/react/features/app/middleware.js index a7d0cfd8c..380083334 100644 --- a/react/features/app/middleware.js +++ b/react/features/app/middleware.js @@ -77,9 +77,20 @@ function _connectionEstablished(store, next, action) { function _navigate({ getState }) { const state = getState(); const { app } = state['features/app']; + const routeToRender = _getRouteToRender(state); - _getRouteToRender(state) - .then(routeToRender => app._navigate(routeToRender)); + // XXX Web changed _getRouteToRender to return Promsie instead of Route. + // Unfortunately, the commit left mobile to return Route. + let routeToRenderPromise; + + if (routeToRender && typeof routeToRender.then === 'function') { + routeToRenderPromise = routeToRender; + } + if (!routeToRenderPromise) { + routeToRenderPromise = Promise.resolve(routeToRender); + } + + routeToRenderPromise.then(app._navigate.bind(app)); } /**