diff --git a/android/app/build.gradle b/android/app/build.gradle index 9958dd03a..544be42ad 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,11 +143,15 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion vectorDrawables.useSupportLibrary = true - versionCode grgit.log(includes:['HEAD']).size() + 1000 + // versionCode grgit.log(includes:['HEAD']).size() + 1000 + versionCode 8000 // Update on release versionName "5.6.9" multiDexEnabled true testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' + dexOptions { + javaMaxHeapSize "4g" + } } splits { @@ -222,6 +226,8 @@ dependencies { implementation 'com.google.firebase:firebase-crashlytics:17.3.0' implementation 'com.android.support:multidex:2.0.1' // https://medium.com/@jQN/react-native-multidex-error-8f9a1daf8c34 + implementation 'com.google.firebase:firebase-messaging:21.1.0' + if (enableHermes) { def hermesPath = "../../node_modules/hermes-engine/android/"; debugImplementation files(hermesPath + "hermes-debug.aar") diff --git a/android/build.gradle b/android/build.gradle index 65b58ec6c..ecbf5b8e8 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -33,8 +33,9 @@ buildscript { } // Voke: Fastline Travis -apply plugin: 'org.ajoberstar.grgit' -ext.grgit = org.ajoberstar.grgit.Grgit.open() +// August 2021 - NOT WORKING ANYMORE +// apply plugin: 'org.ajoberstar.grgit' +// ext.grgit = org.ajoberstar.grgit.Grgit.open() allprojects { repositories { diff --git a/android/gradle.properties b/android/gradle.properties index 962ec1d7a..fc488aa24 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -26,3 +26,5 @@ android.enableJetifier=true # Version of flipper SDK to use with React Native FLIPPER_VERSION=0.85.0 + +firebaseMessagingVersion=21.1.0 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 864078475..eae01565b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -368,7 +368,7 @@ PODS: - react-native-video/Video (= 4.4.5) - react-native-video/Video (4.4.5): - React - - react-native-webview (11.4.0): + - react-native-webview (11.6.5): - React-Core - React-perflogger (0.64.0) - React-RCTActionSheet (0.64.0): @@ -786,7 +786,7 @@ SPEC CHECKSUMS: react-native-startup-time: 740451fcbc7e3c8f67b036365387401ab917de1c react-native-version-check: d8b8900e6ce03ae1568cb22ef9451f2508188883 react-native-video: eee541262ada11bc7ffe8ec5508e6a877937c462 - react-native-webview: 4dfb534e9600b87fe667c5ca4fe09149383218b9 + react-native-webview: 2e8fe70dc32b50d3231c23043f8e8b5a5525d346 React-perflogger: 9c547d8f06b9bf00cb447f2b75e8d7f19b7e02af React-RCTActionSheet: 3080b6e12e0e1a5b313c8c0050699b5c794a1b11 React-RCTAnimation: 3f96f21a497ae7dabf4d2f150ee43f906aaf516f diff --git a/ios/Voke/AppDelegate.m b/ios/Voke/AppDelegate.m index 01b81189c..f457d26bd 100644 --- a/ios/Voke/AppDelegate.m +++ b/ios/Voke/AppDelegate.m @@ -92,11 +92,12 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary *)options { // Voke: Deeplink from Facebook -// BOOL handleFBSDK = [[FBSDKApplicationDelegate sharedInstance] application:application -// openURL:url -// sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey] -// annotation:options[UIApplicationOpenURLOptionsAnnotationKey] -// ]; + BOOL handleFBSDK = [[FBSDKApplicationDelegate sharedInstance] application:application + openURL:url + sourceApplication:options[UIApplicationOpenURLOptionsSourceApplicationKey] + annotation:options[UIApplicationOpenURLOptionsAnnotationKey] + ]; + // Voke: Deeplink for React Native BOOL handleRCT = [RCTLinkingManager application:application openURL:url @@ -104,8 +105,8 @@ - (BOOL)application:(UIApplication *)application ]; // Voke: Deeplink for Firebase? // BOOL handleFirebase = [[RNFBDynamicLinksAppDelegateInterceptor sharedInstance] application:application openURL:url options:options]; -// return handleFBSDK || handleRCT; - return handleRCT; + return handleFBSDK || handleRCT; + // return handleRCT; } // Voke: Needed for handling orientation changes // https://github.com/wonday/react-native-orientation-locker diff --git a/package.json b/package.json index 01eb03719..690a679d5 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "react-native-orientation-locker": "wonday/react-native-orientation-locker#master", "react-native-permissions": "^3.0.0", "react-native-portalize": "^1.0.7", - "react-native-push-notification": "^6.1.3", + "react-native-push-notification": "^7.4.0", "react-native-reanimated": "^1.13.2", "react-native-safe-area-context": "^3.1.9", "react-native-scalable-image": "^1.1.0", @@ -90,8 +90,8 @@ "react-native-vector-icons": "^7.1.0", "react-native-version-check": "^3.4.2", "react-native-video": "4.4.5", - "react-native-webview": "^11.3.1", - "react-native-youtube-iframe": "^1.2.4", + "react-native-webview": "^11.6.5", + "react-native-youtube-iframe": "^2.1.1", "react-redux": "^7.2.2", "redux": "^4.0.5", "redux-persist": "^6.0.0", diff --git a/src/components/Video/index.tsx b/src/components/Video/index.tsx index b0a80d0b6..89dc08180 100644 --- a/src/components/Video/index.tsx +++ b/src/components/Video/index.tsx @@ -231,6 +231,7 @@ function Video({ {item?.type === 'youtube' ? ( { } else { WARN('Failed to create a valid invite.', result); setIsLoading(false); - navigation.reset({ - index: 0, - type: 'stack', // Required to make dynamic nav bar to work properly. - routes: [{ name: 'LoggedInApp' }], + navigation.navigate('Adventures', { + resetTabs: Math.floor(Math.random() * 99), // Reset/Remount tabs component using random key. }); } } catch (e) { setIsLoading(false); WARN( 'Error creating invite @ ReleaseDate > Group ReleaseDate > handleContinue', - e.errors[0], + e?.error || e?.errors[0], ); if (e?.message === 'Network request failed') { Alert.alert(e?.message, t('checkInternet')); @@ -163,10 +161,8 @@ const GroupReleaseDate = (props): React.ReactElement => { } else { // Alert.alert(`Can't create a valid invite.`, 'Please try again.'); // console.error(e); - navigation.reset({ - index: 0, - type: 'stack', // Required to make dynamic nav bar to work properly. - routes: [{ name: 'LoggedInApp' }], + navigation.navigate('Adventures', { + resetTabs: Math.floor(Math.random() * 99), // Reset/Remount tabs component using random key. }); } } diff --git a/src/domain/Adventures/AdventuresTab/index.tsx b/src/domain/Adventures/AdventuresTab/index.tsx index 9ea1cdc99..e150a58ee 100644 --- a/src/domain/Adventures/AdventuresTab/index.tsx +++ b/src/domain/Adventures/AdventuresTab/index.tsx @@ -8,7 +8,7 @@ import { TDataState } from 'utils/types'; import AdventuresMy from '../AdventuresMy'; import AdventuresFind from '../AdventuresFind'; -const Adventures = (): React.ReactElement => { +const Adventures = ({ navigation, route }): React.ReactElement => { const myAdventuresIds = useSelector(({ data }: { data: TDataState }) => data.myAdventures.allIds) || []; @@ -26,6 +26,7 @@ const Adventures = (): React.ReactElement => { return (