Merge remote-tracking branch 'origin/feat/fc' into develop

* origin/feat/fc: (511 commits)
  build: start development on next release
  build: set emojis as launched
  feat(fc): add counter to room description
  feat(fc): implement room descriptions for hosts
  chore(fc): establish beta flag for room descriptions
  chore(fc): update protos and add plumbing for room descriptions
  chore(emojis): be opportunistic about their send delivery success
  fix(ui/emojis): move EmojiModal to ModalScreen
  chore(ui/emojis): add statusBarPadding to EmojiModal
  chore(fc): sort emojis by sentAt to keep order consistent
  chore(ui/emojis): add navbar padding and increase spacing in garden
  fix(fc): attempt to fix frequent reaction query to prevent duplicates
  chore(fc): tweak frequent emoji query
  fix(fc): add proper key for handling tapped emoji counters (also remove consideration of x offset)
  chore(fc): remove deleted reaction filtering and only consider those used 4+ times
  feat(fc): add weighting to ranking of frequently used emojis based on sent (and not-removed) reactions
  feat(fc): pull in Unicode CLDR for keywording; implement search
  chore(fc/auth): internally set authState based on userFlags when set
  feat: categorize emojis and add selection control in garden
  feat(fc): start tip modal at 5 Kin
  ...

Author: bmc08gt

…workflows/build-upload-android-alpha.yml …ows/build-fc-upload-android-internal.yml.github/workflows/build-upload-android-alpha.yml renamed to .github/workflows/build-fc-upload-android-internal.yml .github/workflows/build-upload-android-alpha.yml renamed to .github/workflows/build-fc-upload-android-internal.yml

@@ -1,19 +1,20 @@
-name: Android Build and Deploy (Alpha)
+name: Flipchat Build and Deploy
 
 env:
   # The name of the main module repository
-  main_project_module: app
+  main_project_module: flipchatApp
 
   # The name of the Play Store
-  playstore_name: Code Wallet
+  playstore_name: Flipchat
 
 on:
-  push:
-    tags:
-      - 'v*'
-
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+    inputs:
+      track:
+        description: 'Define PlayStore track name'
+        required: true
+        default: 'internal'
 
 jobs:
   deploy:
@@ -42,8 +43,8 @@ jobs:
         id: google_services_json_file
         with:
           fileName: google-services.json
-          fileDir: ./app/src
-          encodedString: ${{ secrets.GOOGLE_SERVICES_JSON }}
+          fileDir: ./flipchatApp/src
+          encodedString: ${{ secrets.FLIPCHAT_GOOGLE_SERVICES_JSON }}
 
       - name: Decode Service Account Key JSON file
         uses: timheuer/base64-to-file@v1
@@ -63,11 +64,11 @@ jobs:
         uses: timheuer/base64-to-file@v1
         with:
           fileName: key
-          fileDir: ./app/key
+          fileDir: ./flipchatApp/key
           encodedString: ${{ secrets.UPLOAD_KEY_STORE }}
 
       - name: Setup BugSnag API Key
-        run: echo BUGSNAG_API_KEY=\"${{ secrets.BUGSNAG_API_KEY }}\" > ./local.properties
+        run: echo BUGSNAG_API_KEY=\"${{ secrets.FLIPCHAT_BUGSNAG_API_KEY }}\" > ./local.properties
 
       - name: Setup Fingerprint API Key
         run: echo FINGERPRINT_API_KEY=${{ secrets.FINGERPRINT_API_KEY }} >> ./local.properties
@@ -79,22 +80,28 @@ jobs:
         run: echo KADO_API_KEY=\"${{ secrets.KADO_API_KEY }}\" >> ./local.properties
 
       - name: Setup Mixpanel API Key
-        run: echo MIXPANEL_API_KEY=\"${{ secrets.MIXPANEL_API_KEY }}\" >> ./local.properties
+        run: echo MIXPANEL_API_KEY=\"${{ secrets.FLIPCHAT_MIXPANEL_API_KEY }}\" >> ./local.properties
+
+      - name: Setup X (Twitter) OAuth Client ID
+        run: echo X_CLIENT_ID=\"${{ secrets.FLIPCHAT_X_CLIENT_ID }}\" >> ./local.properties
 
       - name: Run tests
-        run: bundle exec fastlane android test
+        run: bundle exec fastlane android fc_tests
 
       - name: Build & deploy Android release
-        run: bundle exec fastlane android deploy_alpha
+        run: bundle exec fastlane android deploy_fc
         env:
           STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS}}
           KEY_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           SERVICE_ACCOUNT_KEY_JSON: ${{ steps.service_account_json_file.outputs.filePath }}
+          PLAYSTORE_TRACK: ${{ github.event.inputs.track }}
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
+        if: always()
         with:
           name: assets
           path: |
-            ${{ github.workspace }}/app/build/outputs/bundle/release
+            ${{ github.workspace }}/flipchatApp/build/outputs/bundle/release
+            ${{ github.workspace }}/flipchatApp/build/outputs/apk/release

.github/workflows/build-upload-android-internal.yml

@@ -1,4 +1,4 @@
-name: Android Build and Deploy (Internal)
+name: Code Build and Deploy (Internal)
 
 env:
   # The name of the main module repository
@@ -78,10 +78,10 @@ jobs:
         run: echo MIXPANEL_API_KEY=\"${{ secrets.MIXPANEL_API_KEY }}\" >> ./local.properties
 
       - name: Run tests
-        run: bundle exec fastlane android test
+        run: bundle exec fastlane android code_tests
 
       - name: Build & deploy Android release
-        run: bundle exec fastlane android deploy_internal
+        run: bundle exec fastlane android deploy_code_internal
         env:
           STORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS}}
@@ -90,6 +90,7 @@ jobs:
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
+        if: always()
         with:
           name: assets
           path: |

.github/workflows/ci.yml

@@ -11,10 +11,9 @@ env:
   JAVA_VERSION: 17
 
 jobs:
-  unit-tests:
-    name: Unit tests
+  code-tests:
+    name: Run Code Tests
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
       - uses: actions/checkout@master
 
@@ -38,7 +37,7 @@ jobs:
           fileName: google-services.json
           fileDir: ./app/src
           encodedString: ${{ secrets.GOOGLE_SERVICES_JSON }}
-          
+
       - name: Setup BugSnag API Key
         run: echo BUGSNAG_API_KEY=\"${{ secrets.BUGSNAG_API_KEY }}\" > ./local.properties
 
@@ -54,5 +53,50 @@ jobs:
       - name: Setup Mixpanel API Key
         run: echo MIXPANEL_API_KEY=\"${{ secrets.MIXPANEL_API_KEY }}\" >> ./local.properties
 
-      - name: Run tests
-        run: bundle exec fastlane android test
+      - name: Run Code tests
+        run: bundle exec fastlane android code_tests
+
+  fc-tests:
+    name: Run Flipchat Tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Setup Java env
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'corretto'
+          cache: 'gradle'
+
+      - name: Setup Ruby env
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+          bundler-cache: true
+
+      - name: Decode Google Services JSON file
+        uses: timheuer/base64-to-file@v1
+        id: google_services_json_file
+        with:
+          fileName: google-services.json
+          fileDir: ./flipchatApp/src
+          encodedString: ${{ secrets.FLIPCHAT_GOOGLE_SERVICES_JSON }}
+
+      - name: Setup BugSnag API Key
+        run: echo BUGSNAG_API_KEY=\"${{ secrets.FLIPCHAT_BUGSNAG_API_KEY }}\" > ./local.properties
+
+      - name: Setup Fingerprint API Key
+        run: echo FINGERPRINT_API_KEY=${{ secrets.FINGERPRINT_API_KEY }} >> ./local.properties
+
+      - name: Setup Google Cloud Project Number
+        run: echo GOOGLE_CLOUD_PROJECT_NUMBER=${{ secrets.GOOGLE_CLOUD_PROJECT_NUMBER }} >> ./local.properties
+
+      - name: Setup Kado API Key
+        run: echo KADO_API_KEY=\"${{ secrets.KADO_API_KEY }}\" >> ./local.properties
+
+      - name: Setup Mixpanel API Key
+        run: echo MIXPANEL_API_KEY=\"${{ secrets.FLIPCHAT_MIXPANEL_API_KEY }}\" >> ./local.properties
+
+      - name: Run Code tests
+        run: bundle exec fastlane android fc_tests

Gemfile

@@ -1,3 +1,6 @@
 source "https://rubygems.org"
 
 gem "fastlane"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

Gemfile.lock

@@ -105,6 +105,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
+    fastlane-plugin-bundletool (1.0.12)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.37.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -209,11 +210,13 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
+  arm64-darwin-24
   universal-darwin-21
   x86_64-linux
 
 DEPENDENCIES
   fastlane
+  fastlane-plugin-bundletool
 
 BUNDLED WITH
    2.2.6