Merge remote-tracking branch 'origin/jacques'
# Conflicts: # functions/helpers/gemini.js # functions/src/heygen.js # functions/src/lyrics.js # functions/src/music.js # src/screens/CreatePassword.js # src/screens/Home/Home.js # src/screens/Playback/PlaybackAi.js # src/screens/Production/PlaybackDownload.js
This commit is contained in:
@@ -12,7 +12,7 @@ import firebase, { getFunctionsClient, projectsRef, serverTimestamp } from '../.
|
||||
import { uploadFileToFirebase } from '../../helpers/uploadToFirebase'
|
||||
import Page from '../../layouts/Page'
|
||||
import { Routes } from '../../navigation'
|
||||
import { goBack, navigate } from '../../navigation/NavigationService'
|
||||
import { navigate } from '../../navigation/NavigationService'
|
||||
import { useUserData, useUser } from '../../providers/UserDataProvider'
|
||||
import { useStripe } from '../../providers/StripeProvider'
|
||||
import { Palette } from '../../styles'
|
||||
@@ -444,6 +444,15 @@ const PlaybackDownload = ({ route }) => {
|
||||
isDownloading,
|
||||
pendingDownloadIntent,
|
||||
])
|
||||
|
||||
const handleGoHome = useCallback(() => {
|
||||
navigate(Routes.BottomTab, {
|
||||
screen: Routes.HomeStack,
|
||||
params: {
|
||||
screen: Routes.Home,
|
||||
},
|
||||
})
|
||||
}, [])
|
||||
return (
|
||||
<>
|
||||
<FullscreenIntroVideo
|
||||
@@ -456,7 +465,7 @@ const PlaybackDownload = ({ route }) => {
|
||||
backgroundColor="#07111B"
|
||||
headerType="NONE"
|
||||
>
|
||||
<MusicLandHeader onPressBack={goBack} progress={50} />
|
||||
<MusicLandHeader onPressBack={handleGoHome} progress={50} />
|
||||
<ScrollView contentContainerStyle={styles.container} showsVerticalScrollIndicator={false}>
|
||||
<CreateLyricsHeader
|
||||
title="Ton playback est prêt"
|
||||
@@ -505,6 +514,12 @@ const PlaybackDownload = ({ route }) => {
|
||||
<Text style={styles.downloadPendingText}>Paiement en attente de confirmation...</Text>
|
||||
) : null}
|
||||
</View>
|
||||
<BorderGradientButton
|
||||
title="Retour à l'accueil"
|
||||
onPress={handleGoHome}
|
||||
disabled={isPublishing || isDownloading}
|
||||
containerStyle={styles.homeButton}
|
||||
/>
|
||||
</ScrollView>
|
||||
</Page>
|
||||
</>
|
||||
@@ -586,4 +601,8 @@ const styles = StyleSheet.create({
|
||||
color: Palette.white,
|
||||
opacity: 0.8,
|
||||
},
|
||||
homeButton: {
|
||||
marginTop: 2,
|
||||
marginBottom: 18,
|
||||
},
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user