Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/config/firebase.js

src/config/firebase.js

@@ -28,7 +28,7 @@ const configureFunctionsEmulator = (instance, regionKey = "us-central1") => {
   } catch (error) {
     console.warn(
       `[firebase] Unable to set functions emulator for region ${regionKey}`,
-      error?.message,
+      error?.message
     );
   }
 };
@@ -52,10 +52,10 @@ if (!firebase?.apps?.filter(({ name_ }) => name_ === "[DEFAULT]").length) {
 
   // if (__DEV__) {
   //   firebase.functions().useEmulator("localhost", 5001);
-  // configureFunctionsEmulator(defaultFunctions, "us-central1");
   // }
   const defaultFunctions = firebase.functions();
   functionsInstances["us-central1"] = defaultFunctions;
+  configureFunctionsEmulator(defaultFunctions, "us-central1");
   console.log("Firebase init");
 }
 

src/screens/Home/Home.js

@@ -629,7 +629,7 @@ const Home = ({ navigation, route }) => {
 
   return (
     <>
-      {adventureStarted ? (
+      {/* {adventureStarted ? ( */}
       <View style={styles.root}>
         <Page
           shareBtn
@@ -674,35 +674,7 @@ const Home = ({ navigation, route }) => {
           </View>
         </Page>
       </View>
-      ) : (
+
-        <>
-          <Page
-            shareBtn
-            title="Landing Page"
-            backgroundImg={landingBackgroundImage}
-            contentContainerStyle={styles.pageContent}
-            backgroundColor="#303438"
-          >
-            <View
-              style={{
-                flex: 1,
-                justifyContent: "center",
-                alignItems: "center",
-              }}
-            >
-              <GradientButton
-                title="Commencer l'aventure MusicLand"
-                onPress={handleStartVisit}
-              />
-            </View>
-          </Page>
-          <FullscreenIntroVideo
-            url={videoUrl}
-            visible={!!videoUrl}
-            onClose={handleIntroVideoClose}
-          />
-        </>
-      )}
       {!isWeb ? (
         <CoinPackModal
           visible={isCoinModalVisible}

src/screens/LandingPage.js

@@ -119,31 +119,6 @@ export default function LandingPage() {
             )}
             {selectedLanguage && (
               <View style={styles.actions}>
-                {showFreeCreditsPopup && (
-                  <BlurView style={styles.freeCreditsCard}>
-                    <View style={styles.freeCreditsContent}>
-                      <View style={styles.freeCreditsTextContainer}>
-                        <Text style={styles.freeCreditsTitle}>
-                          Tu as 5 crédits gratuits
-                        </Text>
-                        <Text style={styles.freeCreditsSubtitle}>
-                          pour 1 parcours offert !
-                        </Text>
-                      </View>
-                      <TouchableOpacity
-                        onPress={() => setShowFreeCreditsPopup(false)}
-                        accessibilityRole="button"
-                        accessibilityLabel="Fermer le message des crédits offerts"
-                        style={styles.freeCreditsClose}
-                      >
-                        <Image
-                          source={icons.close}
-                          style={styles.freeCreditsCloseIcon}
-                        />
-                      </TouchableOpacity>
-                    </View>
-                  </BlurView>
-                )}
                 <GradientButton
                   title="Découvrir Musicland"
                   onPress={() => setVideoUrl(video?.introWeb)}
@@ -178,6 +153,31 @@ export default function LandingPage() {
                     containerStyle={styles.actionButton}
                   />
                 ) : null}
+                {showFreeCreditsPopup && (
+                  <BlurView style={styles.freeCreditsCard}>
+                    <View style={styles.freeCreditsContent}>
+                      <View style={styles.freeCreditsTextContainer}>
+                        <Text style={styles.freeCreditsTitle}>
+                          5 crédits offert
+                        </Text>
+                        <Text style={styles.freeCreditsSubtitle}>
+                          pour 1 parcours gratuit !
+                        </Text>
+                      </View>
+                      <TouchableOpacity
+                        onPress={() => setShowFreeCreditsPopup(false)}
+                        accessibilityRole="button"
+                        accessibilityLabel="Fermer le message des crédits offerts"
+                        style={styles.freeCreditsClose}
+                      >
+                        <Image
+                          source={icons.close}
+                          style={styles.freeCreditsCloseIcon}
+                        />
+                      </TouchableOpacity>
+                    </View>
+                  </BlurView>
+                )}
               </View>
             )}
           </View>