Facebook iOS Signin Fix Attempt

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")

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 {

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

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

ios/Voke/AppDelegate.m

@@ -92,20 +92,21 @@ - (BOOL)application:(UIApplication *)application
             openURL:(NSURL *)url
             options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)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
     options:options
   ];
   // 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

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",

src/components/Video/index.tsx

@@ -231,6 +231,7 @@ function Video({
       {item?.type === 'youtube' ? (
         <YoutubePlayer
           ref={youtubeVideo}
+          useLocalHTML={true}
           videoId={youtubeParser(item?.url)}
           width={width}
           height={height}

src/domain/Adventure/ReleaseDate/index.tsx

@@ -144,17 +144,15 @@ const GroupReleaseDate = (props): React.ReactElement => {
       } 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.
         });
       }
     }

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 (
     <CustomTabs
+      key={route?.params?.resetTabs || 0}
       tabs={[
         {
           key: 'my',

yarn.lock

@@ -7050,10 +7050,10 @@ react-native-portalize@^1.0.7:
   resolved "https://registry.yarnpkg.com/react-native-portalize/-/react-native-portalize-1.0.7.tgz#8b3c742a06f863654d526ea1075a8596625f8482"
   integrity sha512-icqopPh9ZSV+I8C5LlZN9pQJ0OMeBDNqHhP80+qDx0hOGEcsDC09wgjogbEMfJE0GcMDM7PDYtyQkqa9gIqd1g==
 
-react-native-push-notification@^6.1.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/react-native-push-notification/-/react-native-push-notification-6.1.3.tgz#e377e91fc931d541f23b3a156f3451bae5f441a2"
-  integrity sha512-qNbFCkObCXwSFQbK6hJyx1Bym1D7V4XM8iN2L6eL3GAdNLmeBTdLdx3mPbKJtuaDJ1+deniFTQ2rz6hU4ELOXA==
+react-native-push-notification@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/react-native-push-notification/-/react-native-push-notification-7.4.0.tgz#81192356eddfee8eeaf72a9a696c7c90bf5b0ece"
+  integrity sha512-Ac3Ep71e2D8Q/Vy0OHBAO5JwhsFsNSuf9knkpXQWS0B9488nIZJLEMuTpF8610xPvGw7XxVrL/q0oZO5F1pOzw==
 
 react-native-reanimated@^1.13.2, react-native-reanimated@^1.9.0:
   version "1.13.3"
@@ -7152,18 +7152,18 @@ react-native-video@4.4.5:
     prop-types "^15.5.10"
     shaka-player "^2.4.4"
 
-react-native-webview@^11.3.1:
-  version "11.4.0"
-  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-11.4.0.tgz#cf8707e751231d81c17d54c5e2df0009d84e8949"
-  integrity sha512-il4OOJxBJgFXk8rtVgYQJIGRqYD5wJXc4By6nvnkHlH3hbyw1Mx5HKfP9Qmsy8xdCwHYgCBjUuCfHoGXJ9hMSA==
+react-native-webview@^11.6.5:
+  version "11.6.5"
+  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-11.6.5.tgz#34e86a342c6a2cbcf109db98f639f7bb8f055da2"
+  integrity sha512-5U+hI8snkCrFeDy+bUTszwhzcJIenaaOy3ubhY77HZq7R0pFIZzRYWkT0YXe1ymRYW9mSU96nr6S0AVDk8qkMw==
   dependencies:
     escape-string-regexp "2.0.0"
     invariant "2.2.4"
 
-react-native-youtube-iframe@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/react-native-youtube-iframe/-/react-native-youtube-iframe-1.4.1.tgz#a98d6a2aba4ad5b54e1d1137291a62ec3256d71e"
-  integrity sha512-19a7G47VOrDHc3ABKT10OuXkMsMotX5UcK+dqhC42Kz/NZ1bBx2sf645+Kn2WWOIG+RJB2uJgnIzPMezp4hGZg==
+react-native-youtube-iframe@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/react-native-youtube-iframe/-/react-native-youtube-iframe-2.1.1.tgz#d88ee972963c72a3834955048dfd1c2a0731498b"
+  integrity sha512-vnLzA5zcnMwa1gMqGfvkjaE82NW1Nd2Up4Q1OUz6IKm69xSG/9/m4APZ5fCN8UMhy6lH95iagd497J7jwEwz3w==
   dependencies:
     events "^3.2.0"