chore: Merge 4.47.0 into master (#5611)

.circleci/config.yml

@@ -6,7 +6,7 @@ orbs:
 
 macos: &macos
   macos:
-    xcode: "14.2.0"
+    xcode: "15.2.0"
   resource_class: macos.m1.medium.gen1
 
 bash-env: &bash-env
@@ -19,7 +19,9 @@ android-env: &android-env
 
 install-npm-modules: &install-npm-modules
   name: Install NPM modules
-  command: yarn
+  command: |
+    yarn global add node-gyp
+    yarn
 
 restore-npm-cache-linux: &restore-npm-cache-linux
   name: Restore NPM cache
@@ -54,15 +56,13 @@ save-gems-cache: &save-gems-cache
 update-fastlane-ios: &update-fastlane-ios
   name: Update Fastlane
   command: |
-    echo "ruby-2.7.7" > ~/.ruby-version
     bundle install
   working_directory: ios
 
 update-fastlane-android: &update-fastlane-android
   name: Update Fastlane
   command: |
-    echo "ruby-2.7.7" > ~/.ruby-version
-    bundle install
+    bundle install --path gems
   working_directory: android
 
 save-gradle-cache: &save-gradle-cache
@@ -78,6 +78,27 @@ restore_cache: &restore-gradle-cache
 # COMMANDS
 commands:
 
+  manage-ruby:
+    description: "Manage ruby version"
+    steps:
+      - restore_cache:
+          name: Restore ruby
+          key: ruby-v2-{{ checksum ".ruby-version" }}
+      - run:
+          name: Install ruby
+          command: |
+            echo "ruby-2.7.7" > ~/.ruby-version
+            if [ -d ~/.rbenv/versions/2.7.7 ]; then
+              echo "Ruby already installed"
+            else
+              rbenv install 2.7.7
+            fi
+      - save_cache:
+          name: Save ruby cache
+          key: ruby-v2-{{ checksum ".ruby-version" }}
+          paths:
+            - ~/.rbenv/versions/2.7.7
+
   manage-pods:
     description: "Restore/Get/Save cache of pods libs"
     steps:
@@ -204,6 +225,7 @@ commands:
       - checkout
       - restore_cache: *restore-gems-cache
       - restore_cache: *restore-npm-cache-mac
+      - manage-ruby
       - run: *install-npm-modules
       - run: *update-fastlane-ios
       - manage-pods
@@ -328,6 +350,7 @@ commands:
           at: ios
       - restore_cache: *restore-gems-cache
       - restore_cache: *restore-npm-cache-mac
+      - manage-ruby
       - run: *install-npm-modules
       - run: *update-fastlane-ios
       - manage-pods
@@ -381,7 +404,7 @@ jobs:
       - run:
           name: Test
           command: |
-            yarn test -w 8
+            yarn test --runInBand
 
       - run:
           name: Codecov
@@ -394,7 +417,7 @@ jobs:
   android-build-experimental:
     <<: *defaults
     docker:
-      - image: cimg/android:2022.03.1-node
+      - image: cimg/android:2023.11-node
     environment:
       <<: *android-env
       <<: *bash-env
@@ -406,7 +429,7 @@ jobs:
   android-automatic-build-experimental:
     <<: *defaults
     docker:
-      - image: circleci/android:api-29-node
+      - image: cimg/android:2023.11-node
     environment:
       <<: *android-env
       <<: *bash-env
@@ -417,7 +440,7 @@ jobs:
   android-build-official:
     <<: *defaults
     docker:
-      - image: cimg/android:2022.03.1-node
+      - image: cimg/android:2023.11-node
     environment:
       <<: *android-env
       <<: *bash-env
@@ -428,15 +451,15 @@ jobs:
   android-internal-app-sharing-experimental:
     <<: *defaults
     docker:
-      - image: cimg/android:2022.03.1-node
+      - image: cimg/android:2023.11-node
 
     steps:
       - upload-to-internal-app-sharing
 
   android-google-play-beta-experimental:
     <<: *defaults
     docker:
-      - image: cimg/android:2022.03.1-node
+      - image: cimg/android:2023.11-node
 
     steps:
       - upload-to-google-play-beta:
@@ -445,14 +468,14 @@ jobs:
   android-google-play-production-experimental:
     <<: *defaults
     docker:
-      - image: cimg/android:2022.03.1-node
+      - image: cimg/android:2023.11-node
     steps:
       - upload-to-google-play-production
 
   android-google-play-beta-official:
     <<: *defaults
     docker:
-      - image: cimg/android:2022.03.1-node
+      - image: cimg/android:2023.11-node
 
     steps:
       - upload-to-google-play-beta:
@@ -575,6 +598,7 @@ jobs:
       - checkout
       - restore_cache: *restore-gems-cache
       - restore_cache: *restore-npm-cache-mac
+      - manage-ruby
       - run: *install-npm-modules
       - run: *update-fastlane-ios
       - save_cache: *save-npm-cache-mac

.github/workflows/organize_translations.yml

@@ -0,0 +1,44 @@
+name: organize translations
+
+on:
+  push:
+    paths:
+      - 'app/i18n/locales/**.json'
+
+jobs:
+  organize-and-commit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18 
+
+    - name: Run script to organize JSON keys
+      run: node scripts/organize-translations.js
+
+    - name: Get changed files
+      id: git-check
+      uses: tj-actions/changed-files@v42
+      with:  
+        files: |
+              **.json
+
+    - name: List all changed files
+      if: steps.git-check.outputs.any_changed == 'true'
+      env:
+        ALL_CHANGED_FILES: ${{ steps.git-check.outputs.all_changed_files }}
+      run: |
+        for file in ${ALL_CHANGED_FILES}; do
+          echo "$file was changed"
+        done
+
+    - name: Commit and push if changes
+      if: steps.git-check.outputs.any_changed == 'true'
+      uses: EndBug/add-and-commit@v9
+      with:
+        message: 'action: organized translations'

.storybook/storybook.requires.js

@@ -23,13 +23,13 @@ const getStories = () => {
     require("../app/containers/BackgroundContainer/index.stories.tsx"),
     require("../app/containers/Button/Button.stories.tsx"),
     require("../app/containers/Chip/Chip.stories.tsx"),
+    require("../app/containers/CollapsibleText/CollapsibleText.stories.tsx"),
     require("../app/containers/HeaderButton/HeaderButtons.stories.tsx"),
     require("../app/containers/List/List.stories.tsx"),
     require("../app/containers/LoginServices/LoginServices.stories.tsx"),
     require("../app/containers/markdown/Markdown.stories.tsx"),
     require("../app/containers/markdown/new/NewMarkdown.stories.tsx"),
     require("../app/containers/message/Components/CollapsibleQuote/CollapsibleQuote.stories.tsx"),
-    require("../app/containers/CollapsibleText/CollapsibleText.stories.tsx"),
     require("../app/containers/message/Message.stories.tsx"),
     require("../app/containers/ReactionsList/ReactionsList.stories.tsx"),
     require("../app/containers/RoomHeader/RoomHeader.stories.tsx"),

__mocks__/react-native-image-crop-picker.js

@@ -0,0 +1,3 @@
+export default {
+	openPicker: jest.fn().mockImplementation(() => Promise.resolve())
+};

__mocks__/react-native-mmkv-storage.js

@@ -1,6 +1,7 @@
 export class MMKVLoader {
+	// eslint-disable-next-line no-useless-constructor
 	constructor() {
-		console.log('MMKVLoader constructor mock');
+		// console.log('MMKVLoader constructor mock');
 	}
 
 	setProcessingMode = jest.fn().mockImplementation(() => ({