Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 4.14.1 into master #2891

Merged
merged 748 commits into from
Feb 10, 2021
Merged

Merge 4.14.1 into master #2891

merged 748 commits into from
Feb 10, 2021

Conversation

diegolmello
Copy link
Member

Proposed changes

Issue(s)

How to test or reproduce

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Documentation update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Further comments

diegolmello and others added 30 commits July 9, 2020 10:33
@diegolmello
[FIX] getSettings not catching errors (#2271)
f3b02a6
@djorkaeffalexandre
[REGRESSION] Jitsi Call doesn't send message link (#2277)
146babc
[FIX] Messages hidden behind MessageBox (#2281)
d3ab125
@snyk-bot @diegolmello
fix: package.json & yarn.lock to reduce vulnerabilities (#2275)
ab9b0b0 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-JPEGJS-570039
- https://snyk.io/vuln/SNYK-JS-LODASH-567746

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@phriedrich @diegolmello
[i18n] Add missing german strings (#2278)
7275314 
* cleaned mixed usage of "du" and "Sie"

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@Fishbowler @diegolmello
[CHORE] CircleCI Upgrades (#2269)
6436199 
* Upgrade nvm

* Upgrade XCode

* Use nvm's default installed version of node (LTS)

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello @djorkaeffalexandre
[NEW] Sign in with Apple (#2282)
8a24eb0 
* Add expo-apple-authentication

* Button

* Create new provisioning profiles

* Login with Apple

* Change provisioning profile

* Button color based on theme

Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
@diegolmello
[FIX] MessageBox not being shown on ShareView when Preview is a video (…
bbe15b7 
…#2283)

* Wrap video preview with ScrollView so Messagebox is shown properly

* Fix border color
@Fishbowler
[TESTS] Test in docker (#2290)
3f83daa 
* Add docker env with orchestration

* Update detox, update mocha config format

* One simulator at a time - mocha won't run parallel

* Docker runner, with test changes to match RC data

* Better error trapping in infrastructure control script

* Swap user provisioning from Mongo to RC API to work against existing servers

* Add docker to e2e readme

* Stop using example.com for emails

* Default detox to the tests directory

* Add working configs for both run scenarios

* Add some optional forcing of data.js version for Docker
@Fishbowler @diegolmello
[CHORE] Consistent Rocket.Chat Branding (#2293)
97cd223 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@djorkaeffalexandre
Bump version to 4.10.0 (#2305)
fa6897f
@djorkaeffalexandre @diegolmello
[FIX] Room Info actions doesn't check permissions/settings enabled (#…
c6401a2 
…2292)

* [FIX] Show Call Button only when Jitsi Enabled (RoomInfoView)

* [FIX] Show user info

* [FIX] Show message button only if it's possible

* [FIX] Create direct only when needed

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@phriedrich @djorkaeffalexandre @diegolmello
[FIX] Read receipts on tablet (#2297)
812535d 
* fixes not working read receipts on tablet (#2295)

* fixing last commit it to make it work on both tablet and phone

* fix missing close button on tablet's modal view

* Update app/views/ReadReceiptView/index.js

* remove unnecessary param

Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@djorkaeffalexandre @diegolmello
[IMPROVEMENT] Clear image cache when clear cache (#2300)
cbe51e2 
* [IMPROVEMENT] Clear image cache when clear cache

* use fork instead

* react-native-fast-image -> @rocket.chat/react-native-fast-image

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] In-app notification tap when deep in the stack not redirecting …
9b71a78 
…to the room (#2302)
@djorkaeffalexandre @diegolmello
[FIX] Markdown preview causes app stuck (#2303)
45cc350 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@djorkaeffalexandre @diegolmello
[CHORE] Update commonmark libs (#2306)
ff8899c 
* [CHORE] Update commonmark fork and relateds

* [CHORE] Update commonmark.js

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@dependabot
Bump lodash from 4.17.16 to 4.17.19 (#2310)
52b82e5 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.16 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.16...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@refactor-droidyy @djorkaeffalexandre
[FIX] MessagesView duplicating content (#2307)
42df5dd 
* Fix Pagination duplicacy

* Fix MessageView Duplicate Content

* [FIX] Return fetch func

Co-authored-by: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
@diegolmello
Update dependencies (#2301)
9882ace 
* Update RN to 0.63.0-rc.1

* Updating

* Fix keyboard

* Fix native stuff on Messagebox

* Update to RN 0.63.1

* Update pods

* Update patches

* Update minors

* Majors

* Remove base-64 in favour of js-base64

* others

* Pods

* Flipper

* Yarn

* Fix setInput
@diegolmello
[IMPROVEMENT] Native sort and limit queries (#2249)
9dbe10b 
* Update WatermelonDB to 0.18.0

* Low onEndReachedThreshold

* Query experiment

* QUERY_SIZE

* Query or fetch data

* Reorder class functions

* Reset variables

* Hide system messages

* Change this.count behaviour

* Starting on RoomsListView

* unsubscribeQuery

* onEndReached

* Separate queries

* Reusable where clause

* Refactoring

* Refactor RoomItem to accept item as prop

* Comment RoomItem tests just so jest passes

* Fix alert and status

* onPress

* Unnecessary diff

* react-fast-compare

* Native limit on ShareListView

* Tweak item description

* Lint

* Fix on foreground crash

* Suggested changes
@diegolmello
[FIX] Style not being applied on RoomsListView header subtitle (#2319)
7a5a92f
@regalstreak @diegolmello
[IMPROVEMENT] Improve our PR Template (#1893)
a4b43e9 
* [IMPROVEMENT] Improve our PR Template

* Few changes

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
Revert "[CHORE] Update commonmark.js " (#2331)
a5c81b2
@Fishbowler @diegolmello
[TESTS] Idempotence for e2e tests (#2308)
df6c2c5 
* Idempotence for Assorted

* Idempotence for Onboarding

* Idempotence for Rooms

* Remove redundant expects

* Fixes and improvements

* Remove unneeded sleeps

* Make stable following merge

* Try solving early taps without long sleep

Try solving early taps without long sleep (cont)

Temporary CircleCI hack for quicker testing

Add screenshots to CircleCI for failed tests

Try solving early taps without long sleep (cont. 2)

Revert "Temporary CircleCI hack for quicker testing"

This reverts commit 4abef3a.

* Fix flaky test with a fluent wait on the tap

* Add some new sleeps to workaround #2324

* Add test artifacts to gitignore

* More longpress for dodgy taps, wait for pin response

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@youssef-md @diegolmello
[NEW] Log events from Onboarding, NewServer, Login and Register scree…
fc324ed 
…ns (#2169)

* Create method to track user event to isolate the logic to improve future refactoring

* Track Onboarding view

* Track NewServer view

* Refactor track method due to firebase already send the current screen

* Track default login and all the oAuth options

* Track default sign up in RegisterView

* Change trackUserEvent signature and update all the files

* Track the remaining login services

* Resolve requests to improve the importing logs and events

* Leave a bugsnag breadcrumb when logging an event

* Move all logEvent to the top of code block and log remaining fail events

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@youssef-md @diegolmello
[FIX] Keyboard not focusing on TwoFactor component (#2314)
8c8062a 
* Improve 2fa visual hierarchy

* Show 2fa keyboard by scheduling focus method after all interactions

* Remove unrelated styling improvements

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@youssef-md @diegolmello
[IMPROVEMENT] TwoFactor component styling (#2328)
95e228e 
* Improve 2fa visual hierarchy

* Show 2fa keyboard by scheduling focus method after all interactions

* Remove unrelated styling improvements

* Improve 2fa component title hierarchy

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@djorkaeffalexandre @diegolmello
[FIX] Admin panel not logging in automatically (#2330)
17b4084 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@dependabot @diegolmello
Bump codecov from 3.6.5 to 3.7.1 (#2323)
7491df6 
Bumps [codecov](https://github.com/codecov/codecov-node) from 3.6.5 to 3.7.1.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Commits](codecov/codecov-node@v3.6.5...v3.7.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
diegolmello and others added 25 commits January 13, 2021 17:22
@diegolmello
[FIX] Share Extension hitting memory limit on iOS (#2788)
32b1b36 
* [FIX] Disallow swipe to dismiss on share extension

* Limit query to 20 and clean up props

* Remove rn-extension-share branch pointer

* Test new branch

* Remove branch
@djorkaeffalexandre @diegolmello
[IMPROVEMENT] Threads layout tweaks (#2686)
4d13689 
* improvement: Thread Details

* fix: re-render Thread Messages Item

* fix: update snapshots

* improve: thread details component

* fix: cast replies length

* improvement: format date of threads

* improvement: thread details styles

* fix: wrap text

* tests: update snapshot

* improvement: use same date format for all dates

* Icon size 24

* Remove date

* Remove prop drill

* Badge position

* Badge container tweak

* Fix inline style

* Move ThreadDetails to containers

* Update stories

* Fix lint

* Remove wrong prop

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[CHORE] Remove some migrations (#2792)
6457546 
* Remove force rooms refresh

* Remove MMKV migration
@diegolmello
Bump version to 4.14.0 (#2797)
0330219
@diegolmello
[FIX] Messagebox tracking lost on pop gesture navigation (#2799)
b77603c 
* Use setTimeout instead of InteractionManager

* Update tracking lib
@diegolmello
[FIX] Back button closing activity when on root stack screen (#2804)
a51a985 
* Make hardware back button to behave as home button on root screens

* Remove unnecessary code

* Remove handleBackPress from OnboardingView

* Fix lint
@phriedrich @diegolmello
[i18n] Add missing German strings (#2715)
a1bd97f 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[NEW] Encrypted Discussions (#2813)
db5074a 
* I18n key fix

* Add encrypted switch

* Remove unused i18n keys

* Add enabled to encryption reducer

* Show encrypted option on CreateDiscussionView only when e2e encryption is properly set

* Add localSearch and use it on search

* Use encrypted from parent channel

* Fix method calls as rest api with 2fa enabled

* Fix logout after reset keys

* Use encryption reducer instead of lib directly to check render

* Check for room type logic to display encryption option on create discussion

* Check toggle-room-e2e-encryption permission on RoomActionsView

* Check for encryption status instead of setting on server

* Fix

* Disable switch instead of hide it

* Fix spotlight for DMs

* Fix server test
@yash-rajpal @diegolmello
[FIX] Messagebox missing style for text color (#2786)
4b96d30 
* Changing auxilaryTintColor

* Changed Placeholder color to BodyText color

* added color prop

* eslint changes

* used array for styles

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@faziloub @diegolmello
[I18N] Update arabic (#2696)
54f3fb9 
* Update ar.js

* Update ar.js

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@sumukhah @diegolmello
[FIX] Workspace input without i18n (#2689)
61bc2a4 
* [FIX] Translation of strings in Login page

* Strings are added for translation.

fixes: #2620

* Add pt-BR

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[FIX] Spotlight returning duplicated entries (#2805)
d83631d 
* Update rocketchat.js

* Updated search function

* Minor improvements

* Remove atIndex

* Add remove logic to remove duplicate data from response

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[CHORE] Refactor ServerItem (#2778)
8d1dd27 
* Updated ServerDropdown and ServerItem

* Added ServerItem stories

* Update ServerDropdown.js

* Updated ServerItem stories

* Updated ServerItem stories and ServerItem component

* Updated SelectServerView, ServerItem and ServerItem stories

* Updated ServerItem stories

* Updated ServerItem stories

* Update tests

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@yash-rajpal @diegolmello
[DOCS] Updated Quick Start docs link in e2e/readme (#2802)
af34e5a 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@mukerremyilmaz @diegolmello
[I18N] Add Turkish (#2793)
8abc3a8 
* Turkish language support added

* Update tr.js

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] Lint on #2793 (#2818)
94d94cf
@phriedrich
[I18N] Add missing german strings (#2689) (#2820)
e2d0a00
@aenonGit
[I18N] Add missing italian strings (#2817)
f0046f6
@diegolmello
[FIX] Server version becoming null on server change (#2821)
0fdb8f2
@gerzonc @diegolmello
[FIX] Wrong styling on E2E encryption banner (#2767)
bd09cd3 
* [FIX] Wrong styling on E2E encryption banner

* [FIX] Wrong styling on E2E encryption banner

* [FIX] Wrong styling on E2E encryption banner

* [FIX] Wrong styling on E2E encryption banner (#2767)

* Updated SortDropdown, ListHeader, ListItem and added stories for List.Item

* Updated SortDropdown

* Removed unused component

* Updated List.Item and stories

* Reverted unnecessary changes and updated ListItem stories

* Fix minor indentation

* Stop breaking Touch's default underlay color

* Fix indentation

* Remove falsy comparison from render

* Fix left icon

* Use List.Item on OmnichannelStatus

* Add missing separator

* Lint

* Fix sort dropdown

* Remove unnecessary styles

* Fix detox

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] App Store using Experimental's app id (#2826)
b10c5db
@diegolmello
[FIX] Wrong username on push notifications (#2825)
cf59644
@diegolmello
[FIX] Share extension memory issues on iOS (#2845)
acd5f04 
* Remove unnecessary class prop

* Stop rendering servers when there's only one

* Map and alloc only necessary columns from query

* Fetch servers count instead of all servers records

* Fetch only needed servers

* Separators

* Remove renderContent

* Minor fix

* Refactor query

* Smaller avatars in memory

* Fix getItemLayout

* Add topic

* Load less pods

* tests

* Import only used functions from lodash

* Fix pods

* Import only used functions from semver

* Fix media sharing

* Update pods

* Disables preview and thumb on iOS

* Update expo-video-thumbnail

* Unnecessary change
@ARKEOLOGIST @diegolmello
[FIX] Logout from other locations not prompting confirmation option (#…
bdc495d 
…2854)

* Fixed logout toast bug for the iOS

* Removing callToAction and replacing with confirmationText

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
Bump version to 4.14.1 (#2859)
d42dab1
@diegolmello
Merge branch 'master' into beta
1d97517 
# Conflicts:
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	app/containers/Passcode/Base/Dots.js
#	app/containers/Passcode/Base/index.js
#	app/containers/TwoFactor/index.js
#	app/lib/methods/enterpriseModules.js
#	app/lib/methods/getCustomEmojis.js
#	app/lib/methods/getPermissions.js
#	app/lib/methods/getUsersPresence.js
#	app/lib/rocketchat.js
#	app/sagas/selectServer.js
#	app/selectors/login.js
#	app/utils/avatar.js
#	app/views/ChangePasscodeView.js
#	app/views/NewMessageView.js
#	app/views/ProfileView/index.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/ScreenLockedView.js
#	app/views/SelectServerView.js
#	app/views/SelectedUsersView.js
#	app/views/ShareListView/index.js
#	app/views/ShareView/Preview.js
#	app/views/ShareView/Thumbs.js
#	app/views/ShareView/index.js
#	ios/Podfile
#	ios/Podfile.lock
#	ios/Pods/Local Podspecs/EXVideoThumbnails.podspec.json
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-resources.sh
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	yarn.lock
@diegolmello diegolmello merged commit 197b78e into master Feb 10, 2021
@diegolmello diegolmello deleted the beta branch February 10, 2021 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
💎 release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.