Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
c5deaff
kinda building iOS
diegolmello Mar 17, 2025
32fd371
temp fix header buttons
diegolmello Mar 17, 2025
2fc977d
Merge branch 'develop' into upgrade-rn
diegolmello Mar 18, 2025
2a2209c
pods
diegolmello Mar 18, 2025
7c29a0e
Android is kinda building
diegolmello Mar 21, 2025
f90e17b
Patch https://github.com/software-mansion/react-native-screens/issues…
diegolmello Mar 21, 2025
b60d10d
iOS building once again
diegolmello Mar 25, 2025
43f48bd
Revert "Patch https://github.com/software-mansion/react-native-screen…
diegolmello Mar 25, 2025
8a75e26
Fix pods on old arch
diegolmello Mar 25, 2025
7089a18
Cleanup podfile
diegolmello Mar 25, 2025
843a254
Temp fix lint/ts
diegolmello Mar 25, 2025
b75ca3f
temp remove unit tests on ci
diegolmello Mar 25, 2025
ae3d775
pod old arch on CI
diegolmello Mar 25, 2025
40643e4
Added firebase
diegolmello Mar 25, 2025
6fb30fe
Bitcode is still an issue. Fixed on Podfile again.
diegolmello Mar 26, 2025
f578509
Remove Reactotron
diegolmello Mar 26, 2025
4d3a494
BackHandler fixes
diegolmello Mar 26, 2025
2ea91f6
Fix Android source maps upload
diegolmello Mar 26, 2025
624ab33
Fix push on Android
diegolmello Mar 26, 2025
f4ccf38
Fix lint
diegolmello Mar 26, 2025
d412811
Expo-asset is required for videoconf
diegolmello Apr 2, 2025
94c88d6
Update testing setup and dependencies: mock expo-font in jest setup, …
diegolmello Apr 3, 2025
4e9e564
chore: update Babel configuration to use babel-preset-expo
diegolmello Apr 3, 2025
70f320a
test: refactor MessageComposer tests
diegolmello Apr 3, 2025
e84cca2
test: update ReactionsList and useEndpointData tests
diegolmello Apr 3, 2025
d91bf43
test: enable testing in CircleCI configuration
diegolmello Apr 3, 2025
0bec09f
https://reactnative.dev/blog/2025/01/21/version-0.77#rctappdependency…
diegolmello Apr 4, 2025
3b8c9c5
Fix lint and pods
diegolmello Apr 4, 2025
916ce2a
chore: update detox dependency
diegolmello Apr 4, 2025
4cca385
Remove bottom sheet patch
diegolmello Apr 4, 2025
6a42b8f
Update firebase messaging patch
diegolmello Apr 4, 2025
1d764c2
Remove unnecessary expo patches
diegolmello Apr 4, 2025
d0c960a
Update mmkv patch
diegolmello Apr 4, 2025
ec9a614
Update expo patches
diegolmello Apr 4, 2025
9ce5d13
Webview patch
diegolmello Apr 8, 2025
1b55b6b
Merge branch 'develop' into upgrade-rn
diegolmello Apr 8, 2025
7031663
Clear CI yarn cache
diegolmello Apr 8, 2025
97feb06
Fix lint
diegolmello Apr 8, 2025
2949240
Install pods on the old arch
diegolmello Apr 8, 2025
3ed3962
Remove expo-av patch
diegolmello Apr 8, 2025
ac7c180
Fix header button item badge position
diegolmello Apr 8, 2025
2b3fc8e
patch elements
diegolmello Apr 10, 2025
964f9c1
Fix gemfile ci cache
diegolmello Apr 10, 2025
e47cbed
Fix expo-image patch on Android
diegolmello Apr 10, 2025
13b0554
Try removing deployment param from pod install on CI
diegolmello Apr 10, 2025
178bd74
Fix Header not working properly on Android
diegolmello Apr 10, 2025
b579d77
Fix bundle install not fetching fastlane-plugin-bugsnag
diegolmello Apr 10, 2025
09b438e
Refresh CI cache
diegolmello Apr 10, 2025
66ffd62
Patch headers
diegolmello Apr 14, 2025
4d78547
Build
diegolmello Apr 14, 2025
d0374af
CI cache
diegolmello Apr 14, 2025
9e46849
Remove LogBox
diegolmello Apr 15, 2025
d9d1cb3
Avd point to api 34
diegolmello Apr 15, 2025
465dade
Fix goRoom
diegolmello Apr 15, 2025
af9ce0d
Minor performance upgrade on join public room test
diegolmello Apr 15, 2025
3f27542
Fix post message on e2e tests
diegolmello Apr 15, 2025
6458ce7
Fix more e2e tests
diegolmello Apr 15, 2025
fcff6b8
Cleanup
diegolmello Apr 15, 2025
8015329
Fix lint
diegolmello Apr 15, 2025
267b2d2
Point AVD to API 34 on CI
diegolmello Apr 16, 2025
5237255
More e2e tests fixed
diegolmello Apr 17, 2025
b09930c
Starting the migration
diegolmello Apr 17, 2025
22bed1f
Finishing EmojiPicker
diegolmello Apr 17, 2025
22c0c50
Use reanimated-tab-view instead of react-native-tab-view
diegolmello Apr 22, 2025
3347da8
Move custom emoji category to the end to match web ux
diegolmello Apr 22, 2025
3459166
Remove pager view pods
diegolmello Apr 22, 2025
d2c904d
Refactor and cleanup
diegolmello Apr 22, 2025
e7bdb93
Create TabView component
diegolmello Apr 22, 2025
93a9e51
Use TabView on ReactionsList
diegolmello Apr 23, 2025
7925fe3
Basic test for ReactionsList
diegolmello Apr 23, 2025
80ad508
ReactionsList test
diegolmello Apr 23, 2025
26e77a5
Remove react-native-scrollable-tab-view
diegolmello Apr 23, 2025
751f682
Merge branch 'develop' into chore.tab-view-emoji
diegolmello Apr 23, 2025
800f5fc
Merge branch 'develop' into chore.tab-view-emoji
diegolmello Apr 23, 2025
e17d1b2
Fix e2e tests
diegolmello Apr 23, 2025
86cca81
kinda building iOS
diegolmello Mar 17, 2025
8c652f6
temp fix header buttons
diegolmello Mar 17, 2025
68596f8
pods
diegolmello Mar 18, 2025
8e464f4
Android is kinda building
diegolmello Mar 21, 2025
3aaa9eb
Patch https://github.com/software-mansion/react-native-screens/issues…
diegolmello Mar 21, 2025
c997cc8
iOS building once again
diegolmello Mar 25, 2025
428daa3
Revert "Patch https://github.com/software-mansion/react-native-screen…
diegolmello Mar 25, 2025
1e2c783
Fix pods on old arch
diegolmello Mar 25, 2025
cb895e4
Cleanup podfile
diegolmello Mar 25, 2025
e871e2a
Temp fix lint/ts
diegolmello Mar 25, 2025
ba0d007
temp remove unit tests on ci
diegolmello Mar 25, 2025
2060d0b
pod old arch on CI
diegolmello Mar 25, 2025
b0886cf
Added firebase
diegolmello Mar 25, 2025
10acb8f
Bitcode is still an issue. Fixed on Podfile again.
diegolmello Mar 26, 2025
f7c7597
Remove Reactotron
diegolmello Mar 26, 2025
0d881dc
BackHandler fixes
diegolmello Mar 26, 2025
38d8420
Fix Android source maps upload
diegolmello Mar 26, 2025
b0fa1f9
Fix push on Android
diegolmello Mar 26, 2025
f7358aa
Fix lint
diegolmello Mar 26, 2025
c4ebe8f
Expo-asset is required for videoconf
diegolmello Apr 2, 2025
0d28126
Update testing setup and dependencies: mock expo-font in jest setup, …
diegolmello Apr 3, 2025
9025d51
chore: update Babel configuration to use babel-preset-expo
diegolmello Apr 3, 2025
8cbf49f
test: refactor MessageComposer tests
diegolmello Apr 3, 2025
e623253
test: update ReactionsList and useEndpointData tests
diegolmello Apr 3, 2025
182ffbb
test: enable testing in CircleCI configuration
diegolmello Apr 3, 2025
6291491
https://reactnative.dev/blog/2025/01/21/version-0.77#rctappdependency…
diegolmello Apr 4, 2025
5e1f735
Fix lint and pods
diegolmello Apr 4, 2025
4511c3c
chore: update detox dependency
diegolmello Apr 4, 2025
3dda30a
Remove bottom sheet patch
diegolmello Apr 4, 2025
f8ce177
Update firebase messaging patch
diegolmello Apr 4, 2025
4a8bad8
Remove unnecessary expo patches
diegolmello Apr 4, 2025
4172325
Update mmkv patch
diegolmello Apr 4, 2025
e1d3f0b
Update expo patches
diegolmello Apr 4, 2025
ad43247
Webview patch
diegolmello Apr 8, 2025
63f5301
Clear CI yarn cache
diegolmello Apr 8, 2025
f014d44
Fix lint
diegolmello Apr 8, 2025
ceb0955
Install pods on the old arch
diegolmello Apr 8, 2025
8c9bbf8
Remove expo-av patch
diegolmello Apr 8, 2025
b891b7f
Fix header button item badge position
diegolmello Apr 8, 2025
de849c5
patch elements
diegolmello Apr 10, 2025
85e1039
Fix gemfile ci cache
diegolmello Apr 10, 2025
0e8032d
Fix expo-image patch on Android
diegolmello Apr 10, 2025
9bc9dfd
Try removing deployment param from pod install on CI
diegolmello Apr 10, 2025
5b0401d
Fix Header not working properly on Android
diegolmello Apr 10, 2025
6b515df
Fix bundle install not fetching fastlane-plugin-bugsnag
diegolmello Apr 10, 2025
9a3c9c1
Refresh CI cache
diegolmello Apr 10, 2025
b34b4ff
Patch headers
diegolmello Apr 14, 2025
0701e4f
Build
diegolmello Apr 14, 2025
5d6ab34
CI cache
diegolmello Apr 14, 2025
ffcf433
Remove LogBox
diegolmello Apr 15, 2025
c7f85c7
Avd point to api 34
diegolmello Apr 15, 2025
28d4daf
Fix goRoom
diegolmello Apr 15, 2025
d9d6f45
Minor performance upgrade on join public room test
diegolmello Apr 15, 2025
6e9c132
Fix post message on e2e tests
diegolmello Apr 15, 2025
d81be03
Fix more e2e tests
diegolmello Apr 15, 2025
9c74365
Cleanup
diegolmello Apr 15, 2025
b892008
Fix lint
diegolmello Apr 15, 2025
82e7247
Point AVD to API 34 on CI
diegolmello Apr 16, 2025
f5a1380
Merge branch 'upgrade-rn' of github.com:RocketChat/Rocket.Chat.ReactN…
diegolmello Apr 24, 2025
0291b53
pods
diegolmello Apr 24, 2025
b57ac43
Merge branch 'chore.tab-view-emoji' into upgrade-rn
diegolmello Apr 24, 2025
4cb0644
Fix Navigation.resetTo function
diegolmello Apr 24, 2025
6795186
Fix roominfo tests
diegolmello Apr 24, 2025
5d8c07d
Rollback bottom sheet to v4
diegolmello Apr 25, 2025
6f21538
Remove test timings not working properly on Android. Using by name fo…
diegolmello Apr 25, 2025
5a23418
Split a test that can take more than 120s
diegolmello Apr 25, 2025
123599b
Add sleep for all swipes
diegolmello Apr 25, 2025
8c70943
Make swipe start on the center of the screen to prevent opening the n…
diegolmello Apr 25, 2025
86fa708
Rollback android emulator to SDK 31
diegolmello Apr 25, 2025
a5e0d99
Upgrade to RN 0.77.2
diegolmello Apr 28, 2025
cced27e
Improve pod-install
diegolmello Apr 28, 2025
b961b64
Merge branch 'develop' into upgrade-rn
diegolmello Apr 28, 2025
939d6fd
Fix OpenSSL framework path
diegolmello Apr 28, 2025
9154f26
SSL Pinning on Android
diegolmello Apr 28, 2025
b5ff907
DismissNotification uncomment
diegolmello Apr 28, 2025
ffbbbbc
Cleanup
diegolmello Apr 28, 2025
0b30a36
Revert PrivacyInfo
diegolmello Apr 28, 2025
674d314
Fix push Android
diegolmello Apr 29, 2025
ae46703
Fix Android back button style by rewriting HeaderBackButton
diegolmello Apr 29, 2025
684eb95
Fix ChangeAvatarView e2e tests
diegolmello Apr 30, 2025
6efa44f
Merge branch 'develop' into upgrade-rn
diegolmello Apr 30, 2025
a510e91
Simple redux logger
diegolmello Apr 30, 2025
8b56aca
Try layout animations from reanimated
diegolmello Apr 30, 2025
8250901
Update test
diegolmello Apr 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 7 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ save-npm-cache-mac: &save-npm-cache-mac

restore-gems-cache: &restore-gems-cache
name: Restore gems cache
key: bundle-v1-{{ checksum "ios/Gemfile.lock" }}
key: bundle-v1-{{ checksum "Gemfile.lock" }}

save-gems-cache: &save-gems-cache
name: Save gems cache
key: bundle-v1-{{ checksum "ios/Gemfile.lock" }}
key: bundle-v1-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle

Expand Down Expand Up @@ -113,8 +113,7 @@ commands:
- run:
name: Install pods libs
command: |
bundle exec pod install --deployment
working_directory: ios
yarn pod-install
- save_cache:
name: Save pods specs and pods cache
key: pods-v1-{{ checksum "ios/Podfile.lock" }}
Expand Down Expand Up @@ -196,11 +195,11 @@ commands:
name: Upload sourcemaps/NDK symbols to Bugsnag
command: |
if [[ $CIRCLE_JOB == "android-build-official" ]]; then
yarn bugsnag:upload-android --variant officialRelease
yarn bugsnag:upload-android --variant officialRelease --app-manifest android/app/build/intermediates/merged_manifests/officialRelease/processOfficialReleaseManifest/AndroidManifest.xml
yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/officialRelease/app-official-release.aab
fi
if [[ $CIRCLE_JOB == "android-build-experimental" || "android-automatic-build-experimental" ]]; then
yarn bugsnag:upload-android --variant experimentalRelease
yarn bugsnag:upload-android --variant experimentalRelease --app-manifest android/app/build/intermediates/merged_manifests/experimentalRelease/processExperimentalReleaseManifest/AndroidManifest.xml
yarn bugsnag-cli upload android-aab android/app/build/outputs/bundle/experimentalRelease/app-experimental-release.aab
fi

Expand Down Expand Up @@ -523,7 +522,6 @@ jobs:
- restore_cache: *restore-npm-cache-linux
- run: *install-npm-modules
- save_cache: *save-npm-cache-linux
- run: mkdir ~/junit
- create-e2e-account-file
- android/create-avd:
avd-name: Pixel_API_31_AOSP
Expand All @@ -538,17 +536,10 @@ jobs:
- run:
name: Run Detox Tests
command: |
TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split --split-by=timings)
TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split)
yarn e2e:android-test $TEST
- store_artifacts:
path: artifacts
- run:
command: cp junit.xml ~/junit/
when: always
- store_test_results:
path: ~/junit
- store_artifacts:
path: ~/junit

# iOS builds
ios-build-experimental:
Expand Down Expand Up @@ -613,7 +604,6 @@ jobs:
- restore_cache: *restore-npm-cache-mac
- run: *install-npm-modules
- save_cache: *save-npm-cache-mac
- run: mkdir ~/junit
- run:
name: Configure Detox
command: |
Expand All @@ -624,17 +614,10 @@ jobs:
- run:
name: Run tests
command: |
TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split --split-by=timings)
TEST=$(circleci tests glob "e2e/tests/**/*.ts" | circleci tests split)
yarn e2e:ios-test $TEST
- store_artifacts:
path: artifacts
- run:
command: cp junit.xml ~/junit/
when: always
- store_test_results:
path: ~/junit
- store_artifacts:
path: ~/junit

workflows:
build-and-test:
Expand Down
13 changes: 10 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
ios/.xcode.env.local
**/.xcode.env.local
project.xcworkspace
*.mobileprovision
ios/Pods/
**/Pods/
/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
Expand All @@ -32,6 +32,14 @@ ios/Pods/
# testing
/coverage

# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Android/IntelliJ
#
build/
Expand Down Expand Up @@ -71,6 +79,5 @@ e2e/docker/rc_test_env/docker-compose.yml
e2e/docker/data/db
e2e/e2e_account.js
e2e/e2e_account.ts
junit.xml

*.p8
6 changes: 1 addition & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ yarn

Run the app:
```sh
npx pod-install
yarn pod-install
yarn ios
```

Expand All @@ -34,10 +34,6 @@ At this point, the app should be running on the simulator or on your device!

*Note: npm won't work on this project*

### How to inspect the app

We use [Reactotron](https://github.com/infinitered/reactotron) to inspect logs, redux state, redux-sagas, HTTP requests, etc.

## Issues needing help

Didn't find a bug or want a new feature not already reported? Check out the [help wanted](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%91%8B+help+wanted%22) or the [good first issue](https://github.com/RocketChat/Rocket.Chat.ReactNative/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%8D%AD+good+first+issue%22) labels.
Expand Down
11 changes: 10 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '2.7.7'
gem 'cocoapods', '~> 1.11', '>= 1.11.2'

# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
gem 'concurrent-ruby', '< 1.3.4'

gem 'fastlane'
plugins_path = File.join(File.dirname(__FILE__), 'ios', 'fastlane', 'Pluginfile')
eval_gemfile(plugins_path) if File.exist?(plugins_path)
Loading