Skip to content

Commit 022467c

Browse files
authored
chore: Merge 4.59.0 into master (#6284)
2 parents 357fcdb + ac1de22 commit 022467c

File tree

275 files changed

+4944
-2889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

275 files changed

+4944
-2889
lines changed

.circleci/config.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ orbs:
1212

1313
macos: &macos
1414
macos:
15-
xcode: "15.2.0"
15+
xcode: "16.2.0"
1616
resource_class: macos.m1.medium.gen1
1717

1818
bash-env: &bash-env
@@ -182,26 +182,26 @@ commands:
182182
name: Build App
183183
command: |
184184
if [[ $CIRCLE_JOB == "android-build-official" ]]; then
185-
./gradlew bundleOfficialPlayRelease
185+
./gradlew bundleOfficialRelease
186186
fi
187187
if [[ $CIRCLE_JOB == "android-build-experimental" || "android-automatic-build-experimental" ]]; then
188-
./gradlew bundleExperimentalPlayRelease
188+
./gradlew bundleExperimentalRelease
189189
fi
190190
if [[ ! $GOOGLE_SERVICES_ANDROID ]]; then
191-
./gradlew assembleExperimentalPlayDebug
191+
./gradlew assembleExperimentalDebug
192192
fi
193193
working_directory: android
194194

195195
- run:
196196
name: Upload sourcemaps/NDK symbols to Bugsnag
197197
command: |
198198
if [[ $CIRCLE_JOB == "android-build-official" ]]; then
199-
yarn bugsnag:upload-android --variant officialPlayRelease
200-
yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/officialPlayRelease/app-official-play-release.aab
199+
yarn bugsnag:upload-android --variant officialRelease
200+
yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/officialRelease/app-official-release.aab
201201
fi
202202
if [[ $CIRCLE_JOB == "android-build-experimental" || "android-automatic-build-experimental" ]]; then
203-
yarn bugsnag:upload-android --variant experimentalPlayRelease
204-
yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/experimentalPlayRelease/app-experimental-play-release.aab
203+
yarn bugsnag:upload-android --variant experimentalRelease
204+
yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/experimentalRelease/app-experimental-release.aab
205205
fi
206206
207207
- store_artifacts:
@@ -501,9 +501,9 @@ jobs:
501501
yarn e2e:android-build
502502
- save_cache: *save-gradle-cache
503503
- store_artifacts:
504-
path: android/app/build/outputs/apk/experimentalPlay/release/app-experimental-play-release.apk
504+
path: android/app/build/outputs/apk/experimental/release/app-experimental-release.apk
505505
- store_artifacts:
506-
path: android/app/build/outputs/apk/androidTest/experimentalPlay/release/app-experimental-play-release-androidTest.apk
506+
path: android/app/build/outputs/apk/androidTest/experimental/release/app-experimental-release-androidTest.apk
507507
- persist_to_workspace:
508508
root: /home/circleci/repo
509509
paths:

.detoxrc.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,32 @@ module.exports = {
1919
type: 'ios.app',
2020
binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/Rocket.Chat Experimental.app',
2121
build:
22-
'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -destination \'generic/platform=iphonesimulator\' -derivedDataPath ios/build'
22+
"xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Debug -destination 'generic/platform=iphonesimulator' -derivedDataPath ios/build"
2323
},
2424
'ios.release': {
2525
type: 'ios.app',
2626
binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/Rocket.Chat Experimental.app',
2727
build:
28-
'xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -destination \'generic/platform=iphonesimulator\' -derivedDataPath ios/build'
28+
"xcodebuild -workspace ios/RocketChatRN.xcworkspace -scheme RocketChatRN -configuration Release -destination 'generic/platform=iphonesimulator' -derivedDataPath ios/build"
2929
},
3030
'android.debug': {
3131
type: 'android.apk',
32-
binaryPath: 'android/app/build/outputs/apk/experimentalPlay/debug/app-experimental-play-debug.apk',
33-
build:
34-
'cd android ; ./gradlew assembleExperimentalPlayDebug assembleExperimentalPlayDebugAndroidTest -DtestBuildType=debug ; cd -',
32+
binaryPath: 'android/app/build/outputs/apk/experimental/debug/app-experimental-debug.apk',
33+
build: 'cd android ; ./gradlew assembleExperimentalDebug assembleExperimentalDebugAndroidTest -DtestBuildType=debug ; cd -',
3534
reversePorts: [8081]
3635
},
3736
'android.release': {
3837
type: 'android.apk',
39-
binaryPath: 'android/app/build/outputs/apk/experimentalPlay/release/app-experimental-play-release.apk',
38+
binaryPath: 'android/app/build/outputs/apk/experimental/release/app-experimental-release.apk',
4039
build:
41-
'cd android ; ./gradlew assembleExperimentalPlayRelease assembleExperimentalPlayReleaseAndroidTest -DtestBuildType=release ; cd -'
40+
'cd android ; ./gradlew assembleExperimentalRelease assembleExperimentalReleaseAndroidTest -DtestBuildType=release ; cd -'
4241
}
4342
},
4443
devices: {
4544
simulator: {
4645
type: 'ios.simulator',
4746
device: {
48-
type: 'iPhone 14'
47+
type: 'iPhone 16'
4948
}
5049
},
5150
attached: {
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
name: "Bug Report"
2+
description: "Report a bug to help us improve."
3+
title: "bug: "
4+
labels: ["🐛 bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
## Thank you for taking the time to report this bug!
10+
Before submitting, please check if a similar issue exists.
11+
12+
- type: textarea
13+
id: description
14+
attributes:
15+
label: "Describe the Bug"
16+
description: "A clear and concise description of the issue."
17+
placeholder: "A bug happened!"
18+
validations:
19+
required: true
20+
21+
- type: textarea
22+
id: steps
23+
attributes:
24+
label: "Steps to Reproduce"
25+
description: "List the steps to reproduce the issue."
26+
placeholder: |
27+
1. Go to '...'
28+
2. Click on '...'
29+
3. Observe the issue
30+
validations:
31+
required: true
32+
33+
- type: textarea
34+
id: expected-behavior
35+
attributes:
36+
label: "Expected Behavior"
37+
description: "What should have happened?"
38+
placeholder: "Describe the expected outcome."
39+
40+
- type: textarea
41+
id: actual-behavior
42+
attributes:
43+
label: "Actual Behavior"
44+
description: "What actually happened?"
45+
placeholder: "Describe what actually happens."
46+
47+
- type: input
48+
id: server-version
49+
attributes:
50+
label: "Rocket.Chat Server Version"
51+
placeholder: "Enter the server version"
52+
validations:
53+
required: true
54+
55+
- type: input
56+
id: app-version
57+
attributes:
58+
label: "Rocket.Chat App Version"
59+
placeholder: "Enter the app version"
60+
validations:
61+
required: true
62+
63+
- type: input
64+
id: device-name
65+
attributes:
66+
label: "Device Name"
67+
placeholder: "e.g., iPhone 13, Samsung Galaxy S22"
68+
validations:
69+
required: true
70+
71+
- type: input
72+
id: os-version
73+
attributes:
74+
label: "OS Version"
75+
placeholder: "e.g., iOS 17, Android 14"
76+
validations:
77+
required: true
78+
79+
- type: textarea
80+
id: additional-context
81+
attributes:
82+
label: "Additional Context"
83+
description: "Provide any other relevant information about the problem."
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: "Feature Suggestion"
2+
description: "Suggest a new feature to improve our mobile application."
3+
title: "feature request: "
4+
labels: ["🎉 feature"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
## Thank you for suggesting a new feature for our mobile application!
10+
Please provide as much detail as possible below so we can evaluate your idea.
11+
12+
- type: textarea
13+
id: feature-description
14+
attributes:
15+
label: "Feature Description"
16+
description: "A clear and concise description of the proposed feature."
17+
placeholder: "Describe the feature you are proposing..."
18+
validations:
19+
required: true
20+
21+
- type: textarea
22+
id: motivation
23+
attributes:
24+
label: "Motivation and Use Case"
25+
description: "Explain why this feature would improve the mobile experience and describe any specific use cases or issues it addresses."
26+
placeholder: "Explain the benefits and use case for the feature..."
27+
validations:
28+
required: true
29+
30+
- type: textarea
31+
id: implementation-ideas
32+
attributes:
33+
label: "Implementation Ideas"
34+
description: "Share any thoughts on how this feature might be implemented."
35+
placeholder: "Share your ideas or potential solutions..."
36+
validations:
37+
required: false
38+
39+
- type: dropdown
40+
id: existing-feature
41+
attributes:
42+
label: "Is this feature available in the API or web version?"
43+
description: "Select an option if this feature is already present elsewhere."
44+
options:
45+
- "Available in API"
46+
- "Available in Web Version"
47+
- "Not available"
48+
- "Not sure"
49+
validations:
50+
required: true
51+
52+
- type: input
53+
id: server-version
54+
attributes:
55+
label: "Rocket.Chat Server Version"
56+
placeholder: "Enter the server version"
57+
validations:
58+
required: false
59+
60+
- type: input
61+
id: app-version
62+
attributes:
63+
label: "Rocket.Chat App Version"
64+
placeholder: "Enter the app version"
65+
validations:
66+
required: false
67+
68+
- type: input
69+
id: device-name
70+
attributes:
71+
label: "Device Name"
72+
placeholder: "e.g., iPhone 13, Samsung Galaxy S22"
73+
validations:
74+
required: false
75+
76+
- type: input
77+
id: os-version
78+
attributes:
79+
label: "OS Version"
80+
placeholder: "e.g., iOS 17, Android 14"
81+
validations:
82+
required: false
83+
84+
- type: textarea
85+
id: additional-context
86+
attributes:
87+
label: "Additional Context"
88+
description: "Any additional information or context to help us better understand your suggestion."

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Community Support
4+
url: https://open.rocket.chat/channel/react-native
5+
about: Please ask and answer questions here.

.github/workflows/organize_translations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Get changed files
2525
id: git-check
26-
uses: tj-actions/changed-files@v42
26+
uses: step-security/changed-files@3dbe17c78367e7d60f00d78ae6781a35be47b4a1 # v45.0.1
2727
with:
2828
files: |
2929
**.json

.github/workflows/prettier.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Format Code with Prettier
2+
3+
on:
4+
push:
5+
branches:
6+
- '*'
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
format:
14+
if: ${{ github.repository != 'RocketChat/Rocket.Chat.ReactNative' || (github.ref != 'refs/heads/master' && github.ref != 'refs/heads/develop' && github.ref != 'refs/heads/single-server') }}
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
23+
- name: Set up Node.js
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: '22'
27+
cache: 'yarn'
28+
29+
- name: Cache node_modules
30+
uses: actions/cache@v4
31+
with:
32+
path: node_modules
33+
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
34+
restore-keys: |
35+
${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
36+
37+
- name: Install dependencies
38+
run: yarn install
39+
40+
- name: Run Prettier
41+
run: yarn prettier --write .
42+
43+
- name: Check for changes
44+
id: check_changes
45+
run: |
46+
if git diff --quiet; then
47+
echo "No code format changes detected"
48+
echo "changes=false" >> $GITHUB_OUTPUT
49+
else
50+
echo "Code format changes detected"
51+
echo "changes=true" >> $GITHUB_OUTPUT
52+
fi
53+
54+
- name: Commit and push changes
55+
if: env.changes == 'true'
56+
run: |
57+
git config user.name "${{ github.actor }}"
58+
git config user.email "${{ github.actor }}@users.noreply.github.com"
59+
git add .
60+
git commit -m "chore: format code with Prettier [skip ci]"
61+
git push origin ${{ github.ref_name }}

0 commit comments

Comments
 (0)