Skip to content

Commit 78602f3

Browse files
Merge branch 'RocketChat:develop' into develop
2 parents 24f617f + 0b93f25 commit 78602f3

File tree

10 files changed

+22
-30
lines changed

10 files changed

+22
-30
lines changed

.github/actions/build-ios/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ runs:
5353
- name: Set up Xcode
5454
uses: maxim-lobanov/setup-xcode@v1
5555
with:
56-
xcode-version: '16.4'
56+
xcode-version: '26.2.0'
5757

5858
- name: Set up Ruby
5959
uses: ruby/setup-ruby@v1

.github/actions/upload-ios/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ runs:
9191
- name: Set up Xcode
9292
uses: maxim-lobanov/setup-xcode@v1
9393
with:
94-
xcode-version: '16.2'
94+
xcode-version: '26.2.0'
9595

9696
- name: Set up Ruby
9797
uses: ruby/setup-ruby@v1

.github/workflows/build-ios.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
build-ios:
2424
name: Build
25-
runs-on: macos-15
25+
runs-on: macos-26
2626
needs: [build-hold]
2727
if: ${{ inputs.type == 'experimental' && (always() && (needs.build-hold.result == 'success' || needs.build-hold.result == 'skipped')) }}
2828
steps:
@@ -62,7 +62,7 @@ jobs:
6262

6363
upload-ios:
6464
name: Upload
65-
runs-on: macos-15
65+
runs-on: macos-26
6666
needs: [build-ios]
6767
if: ${{ inputs.type == 'experimental' && (always() && (needs.build-ios.result == 'success')) }}
6868
steps:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
build-ios:
2424
name: Build
25-
runs-on: macos-15
25+
runs-on: macos-26
2626
needs: [build-hold]
2727
if: ${{ inputs.type == 'official' && (always() && (needs.build-hold.result == 'success' || needs.build-hold.result == 'skipped')) }}
2828
steps:
@@ -72,7 +72,7 @@ jobs:
7272

7373
upload-ios:
7474
name: Upload
75-
runs-on: macos-15
75+
runs-on: macos-26
7676
needs: [upload-hold]
7777
if: ${{ inputs.type == 'official' && (always() && (needs.upload-hold.result == 'success' || needs.upload-hold.result == 'skipped')) }}
7878
steps:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ on:
2222

2323
jobs:
2424
ios-build:
25-
runs-on: macos-15
25+
runs-on: macos-26
2626

2727
steps:
2828
- name: Checkout repository
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Xcode
3535
uses: maxim-lobanov/setup-xcode@v1
3636
with:
37-
xcode-version: '16.4'
37+
xcode-version: '26.2.0'
3838

3939
- name: Set up Ruby
4040
uses: ruby/setup-ruby@v1

.maestro/helpers/login-with-deeplink.yaml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ tags:
1010
true: CLEAR_STATE
1111
commands:
1212
- clearState: chat.rocket.reactnative
13+
- setPermissions:
14+
permissions:
15+
all: allow
1316
- evalScript: ${output.login = output.utils.login(USERNAME, PASSWORD)}
1417
- runFlow:
1518
file: 'open-deeplink.yaml'
@@ -24,24 +27,6 @@ tags:
2427
visible: '.*Pixel Launcher.*'
2528
commands:
2629
- tapOn: 'Close App'
27-
- extendedWaitUntil:
28-
visible:
29-
text: '.*Allow.*'
30-
timeout: 30000
31-
optional: true
32-
- tapOn:
33-
text: '.*Allow.*'
34-
optional: true
35-
- assertNotVisible:
36-
text: '.*Allow.*'
37-
optional: true
38-
- runFlow:
39-
when:
40-
visible: '.*Would like to send you notifications.*'
41-
platform: iOS
42-
commands:
43-
- tapOn:
44-
point: 65%,60%
4530
- extendedWaitUntil:
4631
visible:
4732
id: 'rooms-list-view'

.maestro/tests/room/ignoreuser.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ tags:
8989
id: 'username-header-${output.otherUser.username}'
9090
timeout: 60000
9191
- tapOn:
92-
id: 'username-header-${output.otherUser.username}'
92+
text: ${output.otherUser.username}
93+
index: 1
9394
retryTapIfNoChange: true
9495
- extendedWaitUntil:
9596
visible:
@@ -210,7 +211,9 @@ tags:
210211
visible:
211212
text: ${output.otherUser.username}
212213
timeout: 60000
213-
- tapOn: ${output.otherUser.username}
214+
- tapOn:
215+
text: ${output.otherUser.username}
216+
index: 1
214217
- extendedWaitUntil:
215218
visible:
216219
id: 'room-info-view'

app/containers/message/Components/Attachments/Image/Image.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ export const MessageImage = React.memo(({ uri, status, encrypted = false, imageP
2828
Image.loadAsync(uri, {
2929
onError: e => {
3030
log(e);
31-
}
31+
},
32+
maxHeight: 1000,
33+
maxWidth: 1000
3234
}).then(image => {
3335
setImageDimensions({ width: image.width, height: image.height });
3436
});

app/containers/message/Components/Attachments/Quote.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const isQuoteAttachment = (file?: IAttachment): boolean => {
1818
return false;
1919
}
2020

21-
if (!file.color && !file.text && (file.image_url || file.audio_url || file.video_url || file.collapsed)) {
21+
if (!file.color && !file.text && (file.image_url || file.audio_url || file.video_url)) {
2222
return false;
2323
}
2424

ios/RocketChatRN/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@
108108
</array>
109109
<key>UIViewControllerBasedStatusBarAppearance</key>
110110
<false/>
111+
<key>UIDesignRequiresCompatibility</key>
112+
<true/>
111113
<key>NSUserActivityTypes</key>
112114
<array>
113115
<string>INSendMessageIntent</string>

0 commit comments

Comments
 (0)