Master > Develop (#609)

* Voke 5.6.6 + Campaign Tracking + Family User Flow (#608)

* Added Family Adventure Flow
* Deeplinking

* remove unneeded patch

* Bump versionCode

* skip 2fa upgrade

* Version Code Bump by 1000

* move env default

* build with ios api key

* update apple file encryption

* Added Fix Image Process (required for iOS)

We forgot to copy "npx react-native-fix-image" form Travis config.

* allow tmux

* remove tmux

* Remove Tutorial + Redirect to Active Adventure

* VC-1289

+ sending UTM to the server only after User ID received.
+ better "Release Next!" button response when interned is down.

* Merge fix

Co-authored-by: Tataihono Nikora <tataihono.nikora@gmail.com>
Co-authored-by: Vlad Mitkovsky <vlad@mitkovsky.com>

.github/workflows/ci-cd.yml

@@ -52,29 +52,29 @@ jobs:
   #     - name: ✅ TypeScript lint
   #       run: npm run lint:ts
 
-  prettier:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: webfactory/ssh-agent@v0.5.0
-        with:
-            ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 12
-      - uses: bahmutov/npm-install@v1
-      - name: 💅 Prettier Check
-        run: npm run prettier:check
+  # prettier:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - uses: webfactory/ssh-agent@v0.5.0
+  #       with:
+  #           ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
+  #     - uses: actions/setup-node@v2
+  #       with:
+  #         node-version: 12
+  #     - uses: bahmutov/npm-install@v1
+  #     - name: 💅 Prettier Check
+  #       run: npm run prettier:check
 
   onesky-upload:
     runs-on: ubuntu-latest
-    needs: [prettier] # [test, eslint, typescript, prettier]
+    # needs: [prettier] # [test, eslint, typescript, prettier]
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
       - uses: webfactory/ssh-agent@v0.5.0
         with:
-            ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
+          ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
       - uses: actions/setup-node@v2
         with:
           node-version: 12
@@ -152,13 +152,13 @@ jobs:
 
   ios-deploy:
     runs-on: macos-latest
-    needs: [prettier] # [test, eslint, typescript, prettier]
+    # needs: [prettier] # [test, eslint, typescript, prettier]
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
       - uses: webfactory/ssh-agent@v0.5.0
         with:
-            ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
+          ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
       - uses: actions/setup-node@v2
         with:
           node-version: 12
@@ -194,12 +194,14 @@ jobs:
             ${{ runner.os }}-local-derived-data-v2-
       - name: Touch all cache files
         run: find ios/.local_derived_data -exec touch -t 2004210000 {} \; || true
-      # https://github.com/react-native-community/releases/issues/214#issuecomment-779920261
-      - name: FBReactNativeSpec patch
+      - name: 🔓 Decrypt AppleAppStoreAPI.json
         run: |
-          mkdir node_modules/react-native/React/FBReactNativeSpec/FBReactNativeSpec
-          touch node_modules/react-native/React/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
-          touch node_modules/react-native/React/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
+          echo $APPLE_APP_STORE_API_FILE > ios/fastlane/AppleAppStoreAPI.json.asc
+          openssl enc -d -aes-256-cbc -base64 -K $APPLE_APP_STORE_API_FILE_KEY -iv $APPLE_APP_STORE_API_FILE_IV -in ios/fastlane/AppleAppStoreAPI.json.asc -out ios/fastlane/AppleAppStoreAPI.json
+        env:
+          APPLE_APP_STORE_API_FILE: ${{ secrets.APPLE_APP_STORE_API_FILE }}
+          APPLE_APP_STORE_API_FILE_KEY: ${{ secrets.APPLE_APP_STORE_API_FILE_KEY }}
+          APPLE_APP_STORE_API_FILE_IV: ${{ secrets.APPLE_APP_STORE_API_FILE_IV }}
       - name: 🏗️🚀🍏 Build and push to Testflight
         uses: maierj/fastlane-action@v2.0.0
         with:
@@ -220,15 +222,15 @@ jobs:
 
   android-deploy:
     runs-on: ubuntu-latest
-    needs: [prettier] # [test, eslint, typescript, prettier]
+    # needs: [prettier] # [test, eslint, typescript, prettier]
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - uses: webfactory/ssh-agent@v0.5.0
         with:
-            ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
+          ssh-private-key: ${{ secrets.VOKE_CI_SSH_KEY }}
       - uses: actions/setup-node@v2
         with:
           node-version: 12

.gitignore

@@ -81,3 +81,5 @@ android/app/src/main/res/values/com_crashlytics_export_strings.xml
 
 # Bundle artifact
 *.jsbundle
+
+ios/fastlane/AppleAppStoreAPI.json

android/app/build.gradle

@@ -142,8 +142,12 @@ android {
         multiDexEnabled true // Voke.
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
+        vectorDrawables.useSupportLibrary = true
+        versionCode grgit.log(includes:['HEAD']).size() + 1000
         versionName "5.6.7"
-        versionCode grgit.log(includes:['HEAD']).size()
+        multiDexEnabled true
+        testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     splits {

android/gradle.properties

@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.54.0
+FLIPPER_VERSION=0.75.1

ios/fastlane/.env.default → ios/.env.default

@@ -1,5 +1,6 @@
 ## Fastlane Build variables
 SPACESHIP_SKIP_2FA_UPGRADE=1
+CRU_API_KEY_PATH="./fastlane/AppleAppStoreAPI.json"
 
 ## Fastlane Build - Project related variables
 CRU_FASTLANE_USERNAME="cruapps@cru.org"

ios/Podfile

@@ -31,7 +31,7 @@ target 'Voke' do
   # you should disable the next line.
   # use_flipper!()
   # https://github.com/facebook/react-native/issues/30836#issuecomment-772830882
-  use_flipper!({ 'Flipper-Folly' => '2.3.0' })
+  use_flipper!({ 'Flipper-Folly' => '2.5' })
 
 
   post_install do |installer|