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.18.0 into single-server #3284

Merged
merged 178 commits into from
Jul 19, 2021
Merged

Merge 4.18.0 into single-server #3284

merged 178 commits into from
Jul 19, 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

gerzonc and others added 30 commits January 7, 2021 11:50
@gerzonc
[FIX] RoomItem using deprecated animated event signature (#2771)
5d2050b
@gerzonc
[FIX] Server autocomplete text breaking line (#2774)
59fd703
@gerzonc @diegolmello
[FIX] ServerDropdown flashing bigger server icon (#2775)
3b4f457 
* [FIX] ServerDropdown flashing bigger server icon

* Remove unused logo and update image path where needed

* Minor tweak

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] Rooms list not being updated on some cases (#2765)
7f0abe1 
* Request subscriptions on RoomsListView.constructor

* Removes opened rooms from last message persisting

* Change server reducer

* Prevent undefined ids causing query error
@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
@gerzonc @diegolmello
[IMPROVEMENT] Check for focused rooms on in-app notifications (#2857)
4d9410a 
* Update InAppNotification and room reducer

* Update InAppNotification

This reverts commit 60330a1.

* Stop subscribing to threads

* Remove ref

* Fix prop-types

Co-authored-by: Diego Mello <diegolmello@gmail.com>
diegolmello and others added 26 commits June 10, 2021 14:32
@diegolmello
[FIX] Crashing on link press (#3204)
303c26f
@reinaldonetof @diegolmello
[FIX] Don't show Block Button inside Group DM Actions (#3195)
3177bc3 
* [FIX] Don't show Block Button inside Group DM Actions

* Use RocketChat.isGroupChat instead of simple if condition

* Add return

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @diegolmello
[TEST] Fixed E2E tests (#3201)
c744672 
* [FIX] Test E2E i18n

* 01-createroom and 02-room fixed

* 03-roomactions and 04-discussions

* 05-threads and 07-markasunread from room

* Test 07-markasunread

* Set notifications 'YES' and delete true in 03-forgotpassword and 04-createuser

* Fixed the data that 02-team uses and changed the message in 07-markasunread

* Added group.alternate to data.docker and commented the test for the fallback language

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[TEST] E2E for Jump to Message (#3202)
a6ded95 
* E2E tests for jump to message

* Fix thread tests

* Remove unnecessary function and uncomment tests

* Minor tweak

* Fix tests and minor tweaks

* Minor tweaks

* Update docker data

* Fix docker

* Fix duplicated testid

* Minor refactor

* Fix jump to old message test

* Fix load on scroll

* Add fab test

* Minor addition

* stash

* almost there

* Final changes

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @gerzonc @diegolmello
[IMPROVE] Subscribe to permissions (#2993)
30487c3 
* [CHORE] Subscribe to permissions

* add redux action for update

* Minor tweaks

Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello @gerzonc
[IMPROVE] Subscribe to roles (#2992)
88191b9 
* [CHORE] Subscribe to Roles

* subscribe to roles-change

* add subscribe for stream-roles

* fixed subscribe roles

* Add componentDidUpdate to RoomMembersView and propType

* Update componentDidUpdate in RoomMembersView, roles reducer,  getRoles method and actionType

* Minor tweaks

* Remove componentDidUpdate

* Fix add role

* Fix initialState and remove role

* Minor try/catch fix

* Fix lint

* Fix offline first

Co-authored-by: Diego Mello <diegolmello@gmail.com>
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
@gerzonc @diegolmello
[IMPROVE] Subscribe to settings (#3222)
d547b61 
* Add action and reducer

* Add streamNotifyAll listener

* Minor tweak

* Minor tweak

* Fix update not taking in consideration other type columnns

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @gerzonc @diegolmello
Chore: Add Lint to E2E tests (#3217)
8517b1f 
* Added eslint plugin dependencie and fixed the eslint.js

* E2E Tests folder Assorted

* Linted all e2e, just e2e/docker that don't changed

* Update 09-jumptomessage.spec.js

* Removed async from describe function

* Remove outdated detox linter lib

* Add overrides to eslintrc

Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @gerzonc @diegolmello
[FIX] App not showing proper alert on team delete (#3219)
4668993 
* [FIX] Rule to delete team's channel

* Fixed Saga and flow to delete team and team's channel

* Adjusted the warning alert as the Figma

Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @gerzonc @diegolmello
[IMPROVE] Add Jitsi button to Teams (#3223)
58d21be 
* [IMPROVE] Add Jitsi button to teams

* Added setting to check is Jitsi is Enable for Channel too

* Fix typo

Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @gerzonc @diegolmello
[FIX] Jump to message from in-app notification (#3225)
300c1f9 
* [FIX] Jump to message by in-app notification

* Bug fix to scroll proper the last message

* Minor tweak

Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[FIX] Google OAuth triggering cookies logic (#3244)
f42c914 
* Remove checkCookiesAndLogout

* Add loginEmailPassword to loginOAuthOrSso

* Add isFromWebView field

* Fix migrations

* Minor tweak

* Fix OAuth for other services

* Fix migrations

* Stop persisting loginEmailPassword

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@lingohub @diegolmello
Language update from LingoHub 🤖 (#3251)
a169441 
Project Name: Rocket.Chat.ReactNative
Project Link: https://translate.lingohub.com/rocketchat/dashboard/rocket-dot-chat-dot-reactnative
User: Robot LingoHub

Easy language translations with LingoHub 🚀

Co-authored-by: Robot LingoHub <robot@lingohub.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello @gerzonc
[IMPROVE] Message body readability on dark themes (#2981)
999f05b 
* [CHORE] Apply auxiliaryText on message body

* change bodyText to uxiliaryText

* Update tests

* Update bodyText color and rollback PR changes

* Update Storyshots.test.js.snap

* Minor tweak

Co-authored-by: Diego Mello <diegolmello@gmail.com>
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
@diegolmello
[FIX] Subscribe to settings making app to hang on login (#3254)
6385dae
@diegolmello
[FIX] Poor performance in messages list on Android 11 (#3260)
3e53a76
@diegolmello
Bump version to 4.18.0 (#3252)
3f172e6
@reinaldonetof @gerzonc @diegolmello
[FIX] Create team crashing the app (#3248)
1908532 
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
Co-authored-by: Gerzon Z <gerzonzcanario@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @diegolmello
[IMPROVE] Convert Team to Channel (#3249)
16fee2a 
* [IMPROVE] Add convert team to a channel

* Action to SelectListView and new words to i18n

* Implemented the post and it's working with selected channels or not

* Fixed the Convert Team Warning at english i18n and changed the function name

* E2E test completed in sequence the convert/move teams

* [IMPROVE] Add convert team to a channel

* Action to SelectListView and new words to i18n

* Implemented the post and it's working with selected channels or not

* Fixed the Convert Team Warning at english i18n and changed the function name

* rebase develop into this branch

* [IMPROVE] Add convert team to a channel

* Action to SelectListView and new words to i18n

* Implemented the post and it's working with selected channels or not

* Fixed the Convert Team Warning at english i18n and changed the function name

* rebase develop into this branch

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc
[IMPROVE] Set black as default dark theme (#3270)
c9d5bc3 
* Update default darkLevel

* Minor tweak
@reinaldonetof @diegolmello
[IMPROVE] Make system default the default browser (#3265)
4882ccd 
* [FIX] use systemdefault: as the default browser, not inApp

* Fix

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@lingohub @diegolmello
Language update from LingoHub 🤖 (#3269)
8a91d0d 
Project Name: Rocket.Chat.ReactNative
Project Link: https://translate.lingohub.com/rocketchat/dashboard/rocket-dot-chat-dot-reactnative
User: Robot LingoHub

Easy language translations with LingoHub 🚀

Co-authored-by: Robot LingoHub <robot@lingohub.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc
[IMPROVE] Remove difference between public/private on "Group by type" (…
e040be0 
…#3271)

* Merge channels and private groups

* Remove i18n
@diegolmello
Regression: Settings pagination not working (#3277)
d1702aa
@gerzonc @diegolmello
Regression: Markdown handlePress not working properly (#3278)
d1f35bb 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
Merge branch 'develop' into single-server-4.18.0
e23c72e 
# Conflicts:
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	app/actions/actionsTypes.js
#	app/actions/permissions.js
#	app/constants/settings.js
#	app/containers/markdown/Link.js
#	app/i18n/locales/ar.json
#	app/i18n/locales/de.json
#	app/i18n/locales/en.json
#	app/i18n/locales/es-ES.json
#	app/i18n/locales/fr.json
#	app/i18n/locales/it.json
#	app/i18n/locales/ja.json
#	app/i18n/locales/nl.json
#	app/i18n/locales/pt-BR.json
#	app/i18n/locales/pt-PT.json
#	app/i18n/locales/ru.json
#	app/i18n/locales/tr.json
#	app/i18n/locales/zh-CN.json
#	app/i18n/locales/zh-TW.json
#	app/lib/methods/getPermissions.js
#	app/lib/methods/getRoles.js
#	app/lib/rocketchat.js
#	app/reducers/index.js
#	app/reducers/permissions.js
#	app/sagas/createChannel.js
#	app/sagas/deepLinking.js
#	app/sagas/init.js
#	app/sagas/login.js
#	app/sagas/room.js
#	app/sagas/selectServer.js
#	app/utils/log/events.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomView/List/NavBottomFAB.js
#	app/views/RoomView/List/index.js
#	app/views/RoomsListView/Header/Header.js
#	app/views/RoomsListView/index.js
#	e2e/data.js
#	e2e/data/data.cloud.js
#	e2e/data/data.docker.js
#	e2e/helpers/app.js
#	e2e/helpers/data_setup.js
#	e2e/tests/assorted/01-e2eencryption.spec.js
#	e2e/tests/assorted/03-profile.spec.js
#	e2e/tests/assorted/04-setting.spec.js
#	e2e/tests/assorted/06-status.spec.js
#	e2e/tests/assorted/07-changeserver.spec.js
#	e2e/tests/assorted/09-joinfromdirectory.spec.js
#	e2e/tests/assorted/10-deleteserver.spec.js
#	e2e/tests/assorted/11-deeplinking.spec.js
#	e2e/tests/assorted/12-i18n.spec.js
#	e2e/tests/onboarding/01-onboarding.spec.js
#	e2e/tests/room/01-createroom.spec.js
#	e2e/tests/room/02-room.spec.js
#	e2e/tests/room/03-roomactions.spec.js
#	e2e/tests/room/04-discussion.spec.js
#	e2e/tests/room/05-threads.spec.js
#	e2e/tests/room/06-createdmgroup.spec.js
#	e2e/tests/room/07-markasunread.spec.js
#	e2e/tests/team/01-createteam.spec.js
#	e2e/tests/team/02-team.spec.js
#	e2e/tests/team/03-moveconvert.spec.js
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
@diegolmello diegolmello merged commit 38615cc into single-server Jul 19, 2021
@diegolmello diegolmello deleted the single-server-4.18.0 branch July 19, 2021 19:31
@lgtm-com
Copy link

lgtm-com bot commented Jul 19, 2021

This pull request introduces 9 alerts and fixes 1 when merging e23c72e into 513dff2 - view on LGTM.com

new alerts:

  • 4 for Assignment to constant
  • 2 for Useless assignment to local variable
  • 2 for Unused variable, import, function or class
  • 1 for Useless conditional

fixed alerts:

  • 1 for Unused variable, import, function or class

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.