Skip to content

Merge 4.22.0 into single-server#3524

Merged
diegolmello merged 289 commits into
single-serverfrom
single-server-4.22.0
Nov 25, 2021
Merged

Merge 4.22.0 into single-server#3524
diegolmello merged 289 commits into
single-serverfrom
single-server-4.22.0

Conversation

@diegolmello

@diegolmello diegolmello commented Nov 25, 2021

Copy link
Copy Markdown
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 February 22, 2021 18:53
@gerzonc @diegolmello
[FIX] Temp attachment files not being flushed after saved to gallery (#…
7551de7 
…2871)

* Update AttachmentView.js

* Update AttachmentView.js

* Update AttachmentView.js

* Update AttachmentView.js

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[CHORE] Update iOS profiles for Experimental app (#2933)
1f6385c
@aKn1ghtOut @diegolmello
[IMPROVE] Deleted thread reply redirects to thread (#2840)
cecffdb 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[FIX] Thread showing typing indicator from main room (#2869)
dbd8c94 
* [FIX] Remove typing indicator from thread's header

* remove unnecessary props and change usersTyping condition

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[FIX] DM rooms show typing status from last group room (#2878)
450aca4 
* [FIX] DM rooms show typing status from last group room

* Undo changes

* Check if current typing is from focused room before dispatching to redux

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[FIX] Can't copy or edit media's description (#2885)
5b518b4 
* [FIX] Image descriptions issues

* shorten the condition string

* fix selectedMessage state

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[FIX] RightButtonsContainer re-render check not returning default val…
120f50d 
…ue (#2899)

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[CHORE] Remove InteractionManager blocks (#2906)
3a95054 
* [FIX] Remove InteractionManager blocks

* Minor fix

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[FIX] App not sending second argument for EventEmitter.removeListener…
09843aa 
… on some places (#2909)

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[FIX] Temp message ignoring real name (#2919)
ef00edc 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[FIX] System message of e2e encryption is missing (#2888)
6e32a15 
* [FIX] System message of e2e encryption missing

* add new encryption string

* add to stories

* Add pt-BR

* Move stories

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[CHORE] Add permissions to Redux (#2914)
e981165 
* [FIX] Add permissions to Redux store

* add only permissions being used in the app

* add clear permissions reducer

* call RocketChat.hasPermission from reducer

* add server version comparison on getPermissions

* refactor hasPermission function

* refactor hasPermission function

* remove uncomment code

* use Q.experimentalSortBy()

* add coerce function

* Change Rocketchat.hasPermission

* Apply on isReadOnly

* Apply to RoomInfoEditView

* Apply to RoomInfoView and RoomInfoEditView

* canAutoTranslate

* Unnecessary clear permissions

* Revert getUpdatedSince

* Naming fix

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[CHORE] Add hold step for ios and android build experimental (#2943)
0957671 
* [CHORE] Add hold step for ios-build-experimental and android-build-experimental

* Android hold step

* add ios hold step

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[IMPROVEMENT] Remove lodash.isEqual (#2893)
d6da866 
* Added dequal and react-fast-compare as substitutes to lodash.isEqual

* Update ReplyPreview.js

* Remove react-fast-compare

* Removed deep-equal and upgrade babel-eslint dev dependency

* Fix avatar

* Fix Messagebox

* Fix CreateDiscussionView

* ModalBlockView

* NewMessageView

* ProfileView

* RoomInfoEditView

* ServerDropdown

* Return local search as object instead of observable

* SelectedUsersView

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@ankar84 @diegolmello
[I18N] Add missing Russian strings (#2946)
a1c9fdf 
* [i18n] Add missing Russian strings

* Couple fixes

* Fix Direct_message

Translate Direct_message as already has been translated

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[CHORE] Use shortcut syntax for get collections (#2932)
98890df 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[FIX] Use List.Separator in all places (#2931)
bc8d6b7 
* [FIX] Use List.Separator in all places

* add List.Separator

* change List.Separator

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] Limit new message list query size to 50 (#2947)
5d3776d 
* Limit query to 50

* Remove observable
@gerzonc @diegolmello
[FIX] Support chats order for older versions of the server (#2934)
99a3247 
* Update mergeSubscriptionsRooms.js

* Update mergeSubscriptionsRooms.js

* Update mergeSubscriptionsRooms.js

* Minor refactor

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[FIX] Reactions modal's backdrop color too light (#2949)
3e8d223 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
Bump version to 4.15.0 (#2950)
eedea40
@diegolmello
[FIX] Share extension not working correctly on Official app (#2963)
e35f7fe
@kresnaputra @diegolmello
[FIX] Cannot read property 'some' of undefined on hasPermission (#2966)
40c075d 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] Deep linking and other connectivity issues (#2894)
cc8dc6a 
* Navigate from push notification only if necessary

* Use JS SDK branch

* Stop reconnecting if it's already connected

* Fix RoomsListView forever loading after tapping push notification of another server

* Execute fewer operations on app/index

* Remove roomsRequest call from onForeground

* Apply check and reopen

* Stop opening in-app notification when the app is on backgorund

* Connecting tweaks

* Fix deep linking not working if the app is on background

* Force reset yarn cache

* Upgrade JS SDK

* Remove listener on unmount

* Fix resume on Android after back button is pressed

* Fix local authentication resume

* Fix back button android

* Change JS SDK branch
@diegolmello
[FIX] Messagebox's placeholder color is too bright (#2968)
a56dade
@gerzonc @diegolmello
[IMPROVEMENT] Message attachment colors (#2860)
b2c200a 
* Added convertStrToHex function and updated Reply component

* Removed convertStrtToHex function and added attachmentBackground

* Added color2k, removed transparent view and applied transparentize to backgroundColor

* Added stories

* Update Reply stories

* Update Reply stories

* Fix lint

* Update Reply stories

* Fix props

* Move tests to Message stories

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@gerzonc @diegolmello
[FIX] App forgetting workspace when server is not finished added (#2798)
1ff6530 
* [FIX] App forgetting workspace

* Added e2e tests

* Update login.js

* Update logout.js

* Reverted changes on login and share, updated init

* Update 08-persistantworkspace.spec.js

* Revert unnecessary changes

* Revert line change

* Update share.js

* Tweak tests

* Use wm shorthand

* Remove irrelevant calls to RocketChat.TOKEN_KEY

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[TESTS] Add E2E tests to draft message (#2960)
e164b64 
* [E2E TEST] Draft message

* Fix tests

Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[TESTS] Add E2E tests to group DM (#2961)
ec5840c 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@kresnaputra @diegolmello
[TESTS] Add E2E tests to directory (#2964)
45d0d4a 
* [E2E TEST] Directory

* Fix tests

Co-authored-by: Diego Mello <diegolmello@gmail.com>
reinaldonetof and others added 21 commits November 10, 2021 17:41
@reinaldonetof
Chore: Migrate AddExistingChannelView to Typescript (#3474)
8b4e39d
@reinaldonetof
Chore: Migrate ChangePasscodeView to Typescript (#3482)
138f0ab
@reinaldonetof @AlexAlexandre @diegolmello
Chore: Migrate CreateChannelView to Typescript (#3486)
3249c54 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@AlexAlexandre @diegolmello
[NEW] Preview or download attachments (#3470)
c216544 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@AlexAlexandre
[IMPROVE] Open Jitsi call even if server isn't found (#3442)
251b42c
@AlexAlexandre @gerzonc
Chore: Migrate MessagesView to Typescript (#3447)
b223a71 
Co-authored-by: Gerzon Z <gerzonc@icloud.com>
@reinaldonetof @AlexAlexandre
Chore: Migrate UserNotificationPreferencesView to Typescript (#3469)
8e55032 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
@reinaldonetof
Chore: Migrate ShareView to Typescript (#3481)
2b3542d
@reinaldonetof @AlexAlexandre
Chore: Migrate DefaultBrowserView to Typescript (#3488)
ccd1b65 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
@reinaldonetof @diegolmello
Chore: Migrate PickerView to Typescript (#3501)
bf2cad0 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @AlexAlexandre @diegolmello
Chore: Migrate AttachmentView to Typescript (#3483)
afdc915 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @diegolmello
Chore: Migrate MarkdownTableView to Typescript (#3500)
945fe23 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @AlexAlexandre @diegolmello
Chore: Migrate E2EEncryptionSecurityView to Typescript (#3489)
a22e959 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @AlexAlexandre @diegolmello
Chore: Migrate E2EEnterYourPasswordView to Typescript (#3490)
c93e442 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @diegolmello
Chore: Migrate E2EHowItWorksView to Typescript (#3492)
4ef0cfe 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @AlexAlexandre @diegolmello
Chore: Migrate E2ESaveYourPasswordView to Typescript (#3493)
049e3f1 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @diegolmello
Chore: Migrate ForgotPasswordView to Typescript (#3496)
da21f58 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @AlexAlexandre @diegolmello
Chore: Migrate ForwardLivechatView to Typescript (#3497)
7715f93 
Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@reinaldonetof @diegolmello
Chore: Migrate JitsiMeetView to Typescript (#3498)
cedca3f 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@matheusbsilva137 @diegolmello
[FIX] Push notifications user preference not syncing correctly (#3494)
1ec4046 
Co-authored-by: Diego Mello <diegolmello@gmail.com>
@diegolmello
[FIX] Display prefs showing wrong header icon on tablet (#3510)
010d885
@lgtm-com

lgtm-com Bot commented Nov 25, 2021

Copy link
Copy Markdown

This pull request introduces 2 alerts and fixes 3 when merging 51d0767 into 85d4ec0 - view on LGTM.com

new alerts:

  • 1 for Direct state mutation
  • 1 for Unused variable, import, function or class

fixed alerts:

  • 2 for Unused variable, import, function or class
  • 1 for Direct state mutation

@diegolmello
Merge branch 'develop' into single-server-4.22.0
f4321fa 
# Conflicts:
#	.eslintrc.js
#	android/app/build.gradle
#	android/gradle.properties
#	app.json
#	app/constants/colors.ts
#	app/containers/ActionSheet/Provider.tsx
#	app/containers/Avatar/interfaces.ts
#	app/containers/FormContainer.tsx
#	app/containers/Passcode/PasscodeChoose.tsx
#	app/containers/Status/Status.tsx
#	app/containers/TextInput.tsx
#	app/containers/UIKit/MultiSelect/Input.tsx
#	app/containers/message/Reply.tsx
#	app/containers/message/Video.tsx
#	app/containers/message/interfaces.ts
#	app/externalModules.d.ts
#	app/i18n/locales/en.json
#	app/i18n/locales/pt-BR.json
#	app/index.tsx
#	app/lib/methods/callJitsi.js
#	app/lib/rocketchat.js
#	app/presentation/ImageViewer/ImageComponent.ts
#	app/presentation/ImageViewer/index.ts
#	app/presentation/KeyboardView.tsx
#	app/presentation/UserItem.tsx
#	app/sagas/init.js
#	app/sagas/login.js
#	app/stacks/OutsideStack.js
#	app/views/AttachmentView.js
#	app/views/ChangePasscodeView.js
#	app/views/CreateChannelView.js
#	app/views/CreateDiscussionView/index.tsx
#	app/views/DefaultBrowserView.js
#	app/views/DisplayPrefsView.js
#	app/views/E2EEncryptionSecurityView.js
#	app/views/E2EEnterYourPasswordView.js
#	app/views/E2EHowItWorksView.js
#	app/views/E2ESaveYourPasswordView.js
#	app/views/ForgotPasswordView.js
#	app/views/ForwardLivechatView.js
#	app/views/InviteUsersEditView/index.js
#	app/views/InviteUsersEditView/styles.js
#	app/views/JitsiMeetView.js
#	app/views/LanguageView/index.js
#	app/views/MarkdownTableView.js
#	app/views/MessagesView/index.js
#	app/views/NewMessageView.js
#	app/views/NotificationPreferencesView/index.js
#	app/views/NotificationPreferencesView/options.js
#	app/views/PickerView.js
#	app/views/ProfileView/index.js
#	app/views/ReadReceiptView/index.js
#	app/views/ReadReceiptView/styles.js
#	app/views/RoomsListView/Header/Header.js
#	app/views/SearchMessagesView/index.js
#	app/views/ShareView/Header.js
#	app/views/ShareView/Preview.js
#	app/views/ShareView/Thumbs.js
#	app/views/ShareView/index.js
#	app/views/SidebarView/SidebarItem.js
#	app/views/SidebarView/index.js
#	app/views/SidebarView/styles.js
#	app/views/UserNotificationPreferencesView/index.js
#	app/views/UserNotificationPreferencesView/options.js
#	app/views/UserPreferencesView/index.js
#	ios/Podfile.lock
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	yarn.lock
gerzonc
gerzonc approved these changes Nov 25, 2021
View reviewed changes

@gerzonc gerzonc left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lgtm-com

lgtm-com Bot commented Nov 25, 2021

Copy link
Copy Markdown

This pull request introduces 1 alert and fixes 2 when merging f4321fa into 85d4ec0 - view on LGTM.com

new alerts:

  • 1 for Direct state mutation

fixed alerts:

  • 1 for Direct state mutation
  • 1 for Unused variable, import, function or class

@diegolmello diegolmello merged commit b564edd into single-server Nov 25, 2021
@diegolmello diegolmello deleted the single-server-4.22.0 branch November 25, 2021 14:25
ivnxyz pushed a commit to NextiaDev/Rocket.Chat.ReactNative that referenced this pull request May 26, 2023
@diegolmello
Merge 4.22.0 into single-server (RocketChat#3524)
18e899e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@gerzonc gerzonc gerzonc approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

💎 release

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.