From 4405e3bf12ab01bd11f72e1f991f40597f8c3c92 Mon Sep 17 00:00:00 2001
From: Looxor <thibault.lauriano@outlook.com>
Date: Mon, 12 Jul 2021 07:39:46 -0700
Subject: [PATCH 1/2] Fix Search Page Slow Issue (CMD+K) - 2nd solution

---
 src/pages/SearchPage.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
index 564e0181679c..ffddc8d7989d 100755
--- a/src/pages/SearchPage.js
+++ b/src/pages/SearchPage.js
@@ -178,7 +178,9 @@ class SearchPage extends Component {
                             onCloseButtonPress={() => Navigation.dismissModal(true)}
                         />
                         <View style={[styles.flex1, styles.w100, styles.pRelative]}>
-                            <FullScreenLoadingIndicator visible={!didScreenTransitionEnd} />
+                            {!didScreenTransitionEnd && (
+                                <FullScreenLoadingIndicator visible />
+                            )}
                             {didScreenTransitionEnd && (
                             <OptionsSelector
                                 sections={sections}

From c90e28bfa530a0962329925b245991f1e31d6f5b Mon Sep 17 00:00:00 2001
From: Looxor <thibault.lauriano@outlook.com>
Date: Wed, 14 Jul 2021 01:08:20 -0700
Subject: [PATCH 2/2] Fix Search Page Slow Issue (CMD+K) - 3rd solution

---
 src/components/FullscreenLoadingIndicator.js | 16 ++++++++++++++--
 src/pages/SearchPage.js                      |  2 +-
 src/styles/styles.js                         |  6 ++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/FullscreenLoadingIndicator.js b/src/components/FullscreenLoadingIndicator.js
index 6a203a9690bb..fb1651f9b04c 100644
--- a/src/components/FullscreenLoadingIndicator.js
+++ b/src/components/FullscreenLoadingIndicator.js
@@ -7,10 +7,16 @@ import themeColors from '../styles/themes/default';
 const propTypes = {
     /** Controls whether the loader is mounted and displayed */
     visible: PropTypes.bool,
+
+    /** Controls whether the loader is loaded fast or not
+     * This is experimental yet.
+    */
+    fastLoad: PropTypes.bool,
 };
 
 const defaultProps = {
     visible: true,
+    fastLoad: false,
 };
 
 /**
@@ -18,8 +24,14 @@ const defaultProps = {
  *
  * @returns {JSX.Element}
  */
-const FullScreenLoadingIndicator = ({visible}) => visible && (
-    <View style={[StyleSheet.absoluteFillObject, styles.fullScreenLoading]}>
+const FullScreenLoadingIndicator = ({visible, fastLoad}) => visible && (
+    <View
+        style={
+            fastLoad
+                ? styles.fullScreenLoadingFast
+                : [StyleSheet.absoluteFillObject, styles.fullScreenLoading]
+        }
+    >
         <ActivityIndicator color={themeColors.spinner} size="large" />
     </View>
 );
diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
index ffddc8d7989d..e0ebdcf5d4b1 100755
--- a/src/pages/SearchPage.js
+++ b/src/pages/SearchPage.js
@@ -179,7 +179,7 @@ class SearchPage extends Component {
                         />
                         <View style={[styles.flex1, styles.w100, styles.pRelative]}>
                             {!didScreenTransitionEnd && (
-                                <FullScreenLoadingIndicator visible />
+                                <FullScreenLoadingIndicator visible fastLoad />
                             )}
                             {didScreenTransitionEnd && (
                             <OptionsSelector
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 209f06362b6d..c937e5c312ee 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1591,6 +1591,12 @@ const styles = {
         zIndex: 10,
     },
 
+    fullScreenLoadingFast: {
+        height: '100%',
+        justifyContent: 'center',
+        alignItems: 'center',
+    },
+
     hiddenElementOutsideOfWindow: {
         position: 'fixed',
         top: 0,