Merge remote-tracking branch 'origin/main' into samuel/emoji-multiplier

* origin/main: (51 commits)
  [🐴] Option to share via chat in post dropdown (#4231)
  [🐴] Record message (#4230)
  [🐴] send record via link in text (Record DMs - base PR) (#4227)
  Use new icons on notifications screen (#4299)
  Composer - fix modals, and other tweaks (#4298)
  Shadows (#4265)
  Change many border widths from `1` to `hairlineWidth` (#4294)
  Add follow button to feed item avatar (#3560)
  Disable non-deterministic flaky test (#4295)
  Don't log downsample warning when unnecessary (#4291)
  [Statsig] Sample noisy events (#4288)
  Bump FontAwesome (#4285)
  Fix scrolling for labeler profiles (#4286)
  Reduce Threadgate button size (#4287)
  put dropdown in fullscreenoverlay on iOS (#4284)
  play haptics before closing modal (#4283)
  match loadmore position to fab (#4280)
  Composer - Use sheet presentation on iOS (#4278)
  don't maintain position whenever there are no parents (#4277)
  Fix native translations on iOS 17.5.1 (#4282)
  ...

.github/workflows/build-submit-android.yml

@@ -119,3 +119,15 @@ jobs:
  env:
  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
  SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+
+ - name: ⬇️ Restore Cache
+ id: get-base-commit
+ uses: actions/cache@v4
+ if: ${{ inputs.profile == 'testflight' }}
+ with:
+ path: most-recent-testflight-commit.txt
+ key: most-recent-testflight-commit
+
+ - name: ✏️ Write commit hash to cache
+ if: ${{ inputs.profile == 'testflight' }}
+ run: echo ${{ github.sha }} > most-recent-testflight-commit.txt

.github/workflows/build-submit-ios.yml

@@ -47,6 +47,10 @@ jobs:
  - name: ⚙️ Install dependencies
  run: yarn install
 
+ - uses: maxim-lobanov/setup-xcode@v1
+ with:
+ xcode-version: '15.3'
+
  - name: ☕️ Setup Cocoapods
  uses: maxim-lobanov/setup-cocoapods@v1
  with:
@@ -76,3 +80,15 @@ jobs:
 
  - name: 🚀 Deploy
  run: eas submit -p ios --non-interactive --path build.ipa
+
+ - name: ⬇️ Restore Cache
+ id: get-base-commit
+ uses: actions/cache@v4
+ if: ${{ inputs.profile == 'testflight' }}
+ with:
+ path: most-recent-testflight-commit.txt
+ key: most-recent-testflight-commit
+
+ - name: ✏️ Write commit hash to cache
+ if: ${{ inputs.profile == 'testflight' }}
+ run: echo ${{ github.sha }} > most-recent-testflight-commit.txt

.github/workflows/bundle-deploy-eas-update.yml

@@ -26,7 +26,7 @@ jobs:
  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-deploy
  cancel-in-progress: true
  outputs:
- fingerprint-is-different: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different }}
+ changes-detected: ${{ steps.fingerprint.outputs.includes-changes }}
 
  steps:
  - name: Check for EXPO_TOKEN
@@ -49,69 +49,22 @@ jobs:
  with:
  fetch-depth: 0
 
- - name: ⬇️ Get last successful deployment commit from the cache
- id: get-base-commit
- uses: actions/cache@v4
- with:
- path: last-successful-commit-hash.txt
- key: last-successful-deployment-commit-${{ github.ref_name }}-${{ github.sha }}
- restore-keys: |
- last-successful-deployment-commit-${{ github.ref_name }}-
-
- - name: Add the last successful deployment commit to the output
- id: last-successful-commit
- run: echo base-commit=$(cat last-successful-commit-hash.txt) >> "$GITHUB_OUTPUT"
-
  - name: ⬇️ Fetch commits from base branch
  if: ${{ github.ref != 'refs/heads/main' }}
  run: git fetch origin main:main --depth 100
 
- # This should get the current production release's commit's hash to see if the update is compatible
- - name: 🕵️ Get the base commit
- id: base-commit
- run: |
- if ${{ inputs.channel == 'production' }}; then
- echo base-commit=$(git show-ref -s ${{ inputs.runtimeVersion }}) >> "$GITHUB_OUTPUT"
- else
- echo base-commit=${{ steps.last-successful-commit.base-commit }} >> "$GITHUB_OUTPUT"
- fi
-
- - name: ✓ Make sure we found a base commit
- run: |
- if [ -z "${{ steps.base-commit.outputs.base-commit }}" && ${{ inputs.channel == 'production' }} ]; then
- echo "Could not find a base commit for this release. Exiting."
- exit 1
- fi
-
  - name: 🔧 Setup Node
  uses: actions/setup-node@v4
  with:
  node-version-file: .nvmrc
  cache: yarn
 
- - name: ⚙️ Install Dependencies
- run: yarn install
-
- # Run the fingerprint
- - name: 📷 Check fingerprint
+ - name: 📷 Check fingerprint and install dependencies
  id: fingerprint
- uses: expo/expo-github-action/fingerprint@main
+ uses: bluesky-social/github-actions/fingerprint-native@main
  with:
- previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
-
- - name: 👀 Debug fingerprint
- id: fingerprint-debug
- run: |
- echo "previousGitCommit=${{ steps.fingerprint.outputs.previous-git-commit }} currentGitCommit=${{ steps.fingerprint.outputs.current-git-commit }}"
- echo "isPreviousFingerprintEmpty=${{ steps.fingerprint.outputs.previous-fingerprint == '' }}"
- 
- fingerprintDiff='$(echo "${{ steps.fingerprint.outputs.fingerprint-diff }}")'
- 
- if [[ $fingerprintDiff =~ "bareRncliAutolinking" || $fingerprintDiff =~ "expoAutolinkingAndroid" || $fingerprintDiff =~ "expoAutolinkingIos" ]]; then
- echo fingerprint-is-different="true" >> "$GITHUB_OUTPUT"
- else
- echo fingerprint-is-different="false" >> "$GITHUB_OUTPUT"
- fi
+ profile: ${{ inputs.channel || 'testflight' }}
+ previous-commit-tag: ${{ inputs.runtimeVersion }}
 
  - name: Lint check
  run: yarn lint
@@ -127,22 +80,22 @@ jobs:
 
  - name: 🔨 Setup EAS
  uses: expo/expo-github-action@v8
- if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
  with:
  expo-version: latest
  eas-version: latest
  token: ${{ secrets.EXPO_TOKEN }}
 
  - name: ⛏️ Setup Expo
- if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
  run: yarn global add eas-cli-local-build-plugin
 
  - name: 🪛 Setup jq
- if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
  uses: dcarbone/install-jq-action@v2
 
  - name: ✏️ Write environment variables
- if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
  run: |
  export json='${{ secrets.GOOGLE_SERVICES_TOKEN }}'
  echo "${{ secrets.ENV_TOKEN }}" > .env
@@ -151,31 +104,40 @@ jobs:
  echo "$json" > google-services.json
 
  - name: 🏗️ Create Bundle
- if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
  run: EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export
 
  - name: 📦 Package Bundle and 🚀 Deploy
- if: ${{ steps.fingerprint-debug.outputs.fingerprint-is-different == 'false'}}
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
  run: yarn use-build-number bash scripts/bundleUpdate.sh
  env:
  DENIS_API_KEY: ${{ secrets.DENIS_API_KEY }}
  RUNTIME_VERSION: ${{ inputs.runtimeVersion }}
  CHANNEL_NAME: ${{ inputs.channel || 'testflight' }}
 
- - name: Save successful deployment commit hash
- run: echo ${{ steps.fingerprint.outputs.current-git-commit }} > last-successful-commit-hash.txt
+ - name: ⬇️ Restore Cache
+ id: get-base-commit
+ uses: actions/cache@v4
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
+ with:
+ path: most-recent-testflight-commit.txt
+ key: most-recent-testflight-commit
+
+ - name: ✏️ Write commit hash to cache
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
+ run: echo ${{ github.sha }} > most-recent-testflight-commit.txt
 
  # GitHub actions are horrible so let's just copy paste this in
  buildIfNecessaryIOS:
  name: Build and Submit iOS
  runs-on: macos-14
  concurrency:
  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}-build-ios
- cancel-in-progress: false
+ cancel-in-progress: true
  needs: [bundleDeploy]
  # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
  # available here
- if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.fingerprint-is-different == 'true' }}
+ if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }}
  steps:
  - name: Check for EXPO_TOKEN
  run: >
@@ -208,6 +170,10 @@ jobs:
  - name: ⚙️ Install dependencies
  run: yarn install
 
+ - uses: maxim-lobanov/setup-xcode@v1
+ with:
+ xcode-version: '15.3'
+
  - name: ☕️ Setup Cocoapods
  uses: maxim-lobanov/setup-cocoapods@v1
  with:
@@ -238,6 +204,18 @@ jobs:
  - name: 🚀 Deploy
  run: eas submit -p ios --non-interactive --path build.ipa
 
+ - name: ⬇️ Restore Cache
+ id: get-base-commit
+ uses: actions/cache@v4
+ if: ${{ inputs.channel == 'testflight' }}
+ with:
+ path: most-recent-testflight-commit.txt
+ key: most-recent-testflight-commit
+
+ - name: ✏️ Write commit hash to cache
+ if: ${{ inputs.channel == 'testflight' }}
+ run: echo ${{ github.sha }} > most-recent-testflight-commit.txt
+
  buildIfNecessaryAndroid:
  name: Build and Submit Android
  runs-on: ubuntu-latest
@@ -247,7 +225,7 @@ jobs:
  needs: [ bundleDeploy ]
  # Gotta check if its NOT '[]' because any md5 hash in the outputs is detected as a possible secret and won't be
  # available here
- if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.fingerprint-is-different == 'true' }}
+ if: ${{ inputs.channel != 'production' && needs.bundleDeploy.outputs.changes-detected }}
 
  steps:
  - name: Check for EXPO_TOKEN
@@ -325,3 +303,15 @@ jobs:
  env:
  SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CLIENT_ALERT_WEBHOOK }}
  SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+
+ - name: ⬇️ Restore Cache
+ id: get-base-commit
+ uses: actions/cache@v4
+ if: ${{ inputs.channel != 'testflight' && inputs.channel != 'production' }}
+ with:
+ path: most-recent-testflight-commit.txt
+ key: most-recent-testflight-commit
+
+ - name: ✏️ Write commit hash to cache
+ if: ${{ inputs.channel != 'testflight' && inputs.channel != 'production' }}
+ run: echo ${{ github.sha }} > most-recent-testflight-commit.txt

.github/workflows/pull-request-commit.yml

@@ -1,7 +1,7 @@
 # Credit for fingerprint action https://github.com/expo/expo
 # https://github.com/expo/expo/blob/main/.github/workflows/pr-labeler.yml
 ---
-name: PR labeler
+name: PR Tests
 
 on:
  push:
@@ -21,7 +21,7 @@ permissions:
 jobs:
  webpack-analyzer:
  runs-on: ubuntu-22.04
- if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
+ if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request'}}
  steps:
  - name: ⬇️ Checkout
  uses: actions/checkout@v4
@@ -94,10 +94,9 @@ jobs:
  | ${{ steps.get-diff.outputs.base_file_string }} | ${{ steps.get-diff.outputs.pr_file_string }} | ${{ steps.get-diff.outputs.diff_file_string }} (${{ steps.get-diff.outputs.percent }}%) |
  ---
 
- test-suite-fingerprint:
+ fingerprint-native:
  runs-on: ubuntu-22.04
- if: ${{ github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push' }}
- concurrency: fingerprint-${{ github.event_name != 'pull_request' && 'main' || github.run_id }}
+ if: ${{ github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request'}}
  steps:
  - name: ⬇️ Checkout
  uses: actions/checkout@v4
@@ -114,35 +113,23 @@ jobs:
  node-version-file: .nvmrc
  cache: yarn
 
- - name: ⚙️ Install Dependencies
- run: yarn install
-
- - name: Get the base commit
- id: base-commit
- run: echo base-commit=$(git log -n 1 main --pretty=format:'%H') >> "$GITHUB_OUTPUT"
-
- - name: 📷 Check fingerprint
+ - name: 📷 Check fingerprint and install dependencies
  id: fingerprint
- uses: expo/expo-github-action/fingerprint@main
+ uses: bluesky-social/github-actions/fingerprint-native@main
  with:
- previous-git-commit: ${{ steps.base-commit.outputs.base-commit }}
-
- - name: 👀 Debug fingerprint
- run: |
- echo "previousGitCommit=${{ steps.fingerprint.outputs.previous-git-commit }} currentGitCommit=${{ steps.fingerprint.outputs.current-git-commit }}"
- echo "isPreviousFingerprintEmpty=${{ steps.fingerprint.outputs.previous-fingerprint == '' }}"
+ profile: pull-request
 
  - name: 💬 Drop a comment
  uses: marocchino/sticky-pull-request-comment@v2
- if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff != '[]' }}
+ if: ${{ steps.fingerprint.outputs.includes-changes }}
  with:
  header: fingerprint-diff
  message: |
- The Pull Request introduced fingerprint changes against the base commit: ${{ steps.fingerprint.outputs.previous-git-commit }}
+ The Pull Request introduced fingerprint changes against the base commit:
  <details><summary>Fingerprint diff</summary>
 
  ```json
- ${{ steps.fingerprint.outputs.fingerprint-diff }}
+ ${{ steps.fingerprint.outputs.diff }}
  ```
 
  </details>
@@ -152,7 +139,7 @@ jobs:
 
  - name: 💬 Delete comment
  uses: marocchino/sticky-pull-request-comment@v2
- if: ${{ github.event_name == 'pull_request' && steps.fingerprint.outputs.fingerprint-diff == '[]' }}
+ if: ${{ !steps.fingerprint.outputs.includes-changes }}
  with:
  header: fingerprint-diff
  delete: true

__tests__/lib/string.test.ts

@@ -142,7 +142,8 @@ describe('makeRecordUri', () => {
  })
 })
 
-describe('ago', () => {
+// FIXME: Reenable after fixing non-deterministic test.
+describe.skip('ago', () => {
  const oneYearDate = new Date(
  new Date().setMonth(new Date().getMonth() - 11),
  ).setDate(new Date().getDate() - 28)

app.config.js

@@ -175,15 +175,14 @@ module.exports = function (config) {
  checkAutomatically: 'NEVER',
  channel: UPDATES_CHANNEL,
  },
- assetBundlePatterns: ['**/*'],
  plugins: [
  'expo-localization',
  Boolean(process.env.SENTRY_AUTH_TOKEN) && 'sentry-expo',
  [
  'expo-build-properties',
  {
  ios: {
- deploymentTarget: '13.4',
+ deploymentTarget: '14.0',
  newArchEnabled: false,
  },
  android: {
@@ -205,6 +204,7 @@ module.exports = function (config) {
  ],
  './plugins/withAndroidManifestPlugin.js',
  './plugins/withAndroidManifestFCMIconPlugin.js',
+ './plugins/withAndroidManifestLaunchModePlugin.js',
  './plugins/withAndroidStylesWindowBackgroundPlugin.js',
  './plugins/withAndroidStylesAccentColorPlugin.js',
  './plugins/withAndroidSplashScreenStatusBarTranslucentPlugin.js',