Skip to content

Merge 4.15.0 into master#2984

Merged
diegolmello merged 783 commits intomasterfrom
beta
Mar 15, 2021
Merged

Merge 4.15.0 into master#2984
diegolmello merged 783 commits intomasterfrom
beta

Conversation

@diegolmello
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

EzequielDeOliveira and others added 30 commits July 24, 2020 16:58
* Set title in header of room actions view items

Signed-off-by: Ezequiel De Oliveira <[email protected]>

* Remove unneeded spaces

Signed-off-by: Ezequiel De Oliveira <[email protected]>

* Set header title on constructor

Signed-off-by: Ezequiel De Oliveira <[email protected]>

* Remove unused navigation options

Signed-off-by: Ezequiel De Oliveira <[email protected]>

Co-authored-by: Diego Mello <[email protected]>
* Stabilise Room Actions test

* Fix Create Room test

* Be more tolerant of slow starting apps in CI

* Be more tolerant of slow running apps in CI

* Switch visibility checks ti stabilise Room Create test in CI

* Move slow simulator readiness waiting to initial navigateToX methods rather than repeatedly in tests without description of purpose
* Initial workflow for iOS detox tests

* Increase timeout

* Parallelise tests and optimise when to build

* Refine GH Actions logic

* Improve Detox App caching

* Upload failed test artifacts

* Rate limiting aware data setup

* Remove detox tests from Circle CI

* Revert "Rate limiting aware data setup"

This reverts commit d115604.

Co-authored-by: Diego Mello <[email protected]>
* [WIP] Notification Service

* [WIP] Android push notification privacy

* [WIP] Retry request when it fails (iOS)

* [WIP] Override notification bundle

* [CHORE] Remove unnecessary import

* [WIP] Check notification Type (iOS)

* [WIP] Change to notification endpoint

* eof

* fix unwrap conditional value

* turn run request synchronous

* fix bundle info

* eof

* remove extra tab

* undo unnecessary change

* remove not working code for a while

* fix notification title

* change endpoint and received/sent data

* message-id-only working properly on android

* notification privacy working on ios

* invalidate circleCI yarn cache

* Fix provisioning profiles

* fix notification service version

* fix unwrap nil

* compatibility older servers android

* show received notification when cant fetch content from server

* undo some android changes

* prevent group & reply fallback notifications

* dont show more than one fallback notification by server

Co-authored-by: Diego Mello <[email protected]>
* New mention colors

* Increase letterSpacing for mentions

* Refactor

* UnreadBadge

* Add migration
* Hide in app notification when focused on JitsiMeetView

* Hide notifications from different rooms

Co-authored-by: Diego Mello <[email protected]>
* Only run Flipper in debug via MainApplication is debug

* ReactNativeFlipper package rename + gradle bump
* Only run Flipper in debug via MainApplication is debug

* ReactNativeFlipper package rename + gradle bump

* Update Flipper to latest 0.51 for Android

Co-authored-by: Diego Mello <[email protected]>
* 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

* track add server, change server and search

* Track SidebarView and refactor to use react-navigation

* Track profile events and handle exceptions

* Track create channel flux

* Track send message to user via NewMessageView

* Track create direct message flux

* Handle failure of create channel and group in the saga

* Track create discussion flux

* Track navigate to directory and its actions

* Track read, favorite and hide a channel, handling its errors

* Track all channels sorting and grouping

* Resolve requests to improve the importing logs and events

* Remove unused events file

* Leave a bugsnag breadcrumb when logging an event

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

* Move all the non-logic-dependent logEvent to the top of code block

* Improve the logging of sidebar events

* Improve events from onboarding and newserver

* Improve events from login and register view, and log enter with apple

* Improve NewMessageView events

* Improve CreateChannel events

* Improve CreateDiscussion and SelectedUsers create group events

* Improve RoomsList events and log trivial events

* Improve ProfileView events

* Remove single line function body for the sidebarNavigate

* Navigate to Status and AdminPanel View using the defined sidebarNavigate method

Co-authored-by: Diego Mello <[email protected]>
* [WIP] Jitsi Deep Links

* [WIP] Add app links

* save uniqueID servers database

* add serverInfoKey of uniqueID

* search server by call url

* open jitsi deeplink poc

* improve jitsi url

* fix

* improve comment

* add missing android scheme

* handle host not found

* Allow app links to be matched on parseDeepLinking

* Fix push notification of a call

* Minor fix

Co-authored-by: Diego Mello <[email protected]>
…2359)

* Add rule when there's no host on the deep link params

* Add fallbackNavigation()

* Fix insecure hosts
* 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

* track add server, change server and search

* Track SidebarView and refactor to use react-navigation

* Track profile events and handle exceptions

* Track create channel flux

* Track send message to user via NewMessageView

* Track create direct message flux

* Handle failure of create channel and group in the saga

* Track create discussion flux

* Track navigate to directory and its actions

* Track read, favorite and hide a channel, handling its errors

* Track all channels sorting and grouping

* Resolve requests to improve the importing logs and events

* Remove unused events file

* Remove unused events file

* log proposed Room events

* Log proposed Message actions events

* Log EditStatus proposed events

* Log Settings proposed events

* Leave a bugsnag breadcrumb when logging an event

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

* Move all the non-logic-dependent logEvent to the top of code block

* Move all non-logic and non-data dependent logEvent to the top of code block

* Improve the logging of sidebar events

* Improve events from onboarding and newserver

* Improve events from login and register view, and log enter with apple

* Improve NewMessageView events

* Improve CreateChannel events

* Improve CreateDiscussion and SelectedUsers create group events

* Improve RoomsList events and log trivial events

* Improve ProfileView events

* Remove single line function body for the sidebarNavigate

* Improve SettingsView events

* Log more events from ScreenLockConfigView

* Navigate to Status and AdminPanel View using the defined sidebarNavigate method

* Improve StatusView events

* Improve RoomView events

Co-authored-by: Diego Mello <[email protected]>
…abled (#2363)

* Split RoomItem into container and component

* Refactor RoomItem

* Fix wrong status

* Tests

* Wrapper
* [WIP] Omnichannel queue

* Request inquiry when login

* Show take inquiry queued room

* Queue List as a Screen

* Poc using unread badge

* Prevent navigation to empty list

* Remove chat from queue when taked

* Fix header status on omnichannel preview room

* Fix room actions view to preview queued chat

* Use isOmnichannelPreview and dont show actions when is preview

* Filter queue chats taken by other people

* Fix room info to omnichannel preview room

* Handle show Queue

* Reset inquiry store when change server

* Improve queue logic

* Disable swipe on RoomItem when is a Queue Item

* Add unreadBadge style

* Move unread badge to presentation folder

* Cleanup inquiry reducers

* Move take saga to rocketchat function

* Remove comments

* Add relevant comments

* Subscribe to public stream if is livechat manager or doesnt have departments

* Add pt-br and improve queue empty message

* Fix take when dont have view-livechat-manager permission

* Add missing events

* Create selector for inquiry queue

* Minor fixes

Co-authored-by: Diego Mello <[email protected]>
* Add new translations to ptBr

Signed-off-by: Ezequiel De Oliveira <[email protected]>

* Fix update language in headers

Signed-off-by: Ezequiel De Oliveira <[email protected]>

Co-authored-by: Diego Mello <[email protected]>
* Change NAVIGATE_TO for GO_TO to reduce event size

* Log RA JitsiMeet events and join / terminate

* Log more RoomView events

* Log slash commands and handle fail

* Log RoomActions events

* Change from GO_TO to just GO

* Log RoomInfoEdit events

* Log InviteUsers and InviteUsersEdit events

* Log AutoTranslate events

* Log NotificationPreferences events

* Log remaining routes from RoomActions

* Log RoomAction toggle block user

* Fix command event

Co-authored-by: Diego Mello <[email protected]>
diegolmello and others added 27 commits February 22, 2021 18:37
…2871)

* Update AttachmentView.js

* Update AttachmentView.js

* Update AttachmentView.js

* Update AttachmentView.js

Co-authored-by: Diego Mello <[email protected]>
* [FIX] Remove typing indicator from thread's header

* remove unnecessary props and change usersTyping condition

Co-authored-by: Diego Mello <[email protected]>
* [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 <[email protected]>
* [FIX] Image descriptions issues

* shorten the condition string

* fix selectedMessage state

Co-authored-by: Diego Mello <[email protected]>
* [FIX] Remove InteractionManager blocks

* Minor fix

Co-authored-by: Diego Mello <[email protected]>
* [FIX] System message of e2e encryption missing

* add new encryption string

* add to stories

* Add pt-BR

* Move stories

Co-authored-by: Diego Mello <[email protected]>
* [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 <[email protected]>
* [CHORE] Add hold step for ios-build-experimental and android-build-experimental

* Android hold step

* add ios hold step

Co-authored-by: Diego Mello <[email protected]>
* 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 <[email protected]>
* [i18n] Add missing Russian strings

* Couple fixes

* Fix Direct_message

Translate Direct_message as already has been translated

Co-authored-by: Diego Mello <[email protected]>
* [FIX] Use List.Separator in all places

* add List.Separator

* change List.Separator

Co-authored-by: Diego Mello <[email protected]>
* Limit query to 50

* Remove observable
* Update mergeSubscriptionsRooms.js

* Update mergeSubscriptionsRooms.js

* Update mergeSubscriptionsRooms.js

* Minor refactor

Co-authored-by: Diego Mello <[email protected]>
* 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
# Conflicts:
#	.circleci/config.yml
#	.eslintrc.js
#	__tests__/__snapshots__/Storyshots.test.js.snap
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	app/actions/actionsTypes.js
#	app/constants/colors.js
#	app/constants/settings.js
#	app/containers/ActionSheet/ActionSheet.js
#	app/containers/Avatar/index.js
#	app/containers/EmojiPicker/index.js
#	app/containers/InAppNotification/index.js
#	app/containers/MessageActions/Header.js
#	app/containers/MessageActions/index.js
#	app/containers/MessageBox/CommandsPreview/index.js
#	app/containers/MessageBox/Mentions/index.js
#	app/containers/MessageBox/ReplyPreview.js
#	app/containers/MessageBox/index.js
#	app/containers/MessageErrorActions.js
#	app/containers/Toast.js
#	app/containers/TwoFactor/index.js
#	app/containers/UIKit/MultiSelect/index.js
#	app/containers/UIKit/MultiSelect/styles.js
#	app/containers/message/Attachments.js
#	app/containers/message/Audio.js
#	app/containers/message/Content.js
#	app/containers/message/Image.js
#	app/containers/message/Message.js
#	app/containers/message/Reply.js
#	app/containers/message/Urls.js
#	app/containers/message/Video.js
#	app/ee/omnichannel/views/QueueListView.js
#	app/i18n/locales/en.js
#	app/i18n/locales/pt-BR.js
#	app/i18n/locales/ru.js
#	app/index.js
#	app/lib/encryption/encryption.js
#	app/lib/encryption/room.js
#	app/lib/methods/callJitsi.js
#	app/lib/methods/canOpenRoom.js
#	app/lib/methods/enterpriseModules.js
#	app/lib/methods/getCustomEmojis.js
#	app/lib/methods/getPermissions.js
#	app/lib/methods/getRoles.js
#	app/lib/methods/getSettings.js
#	app/lib/methods/getSlashCommands.js
#	app/lib/methods/getUsersPresence.js
#	app/lib/methods/helpers/findSubscriptionsRooms.js
#	app/lib/methods/helpers/mergeSubscriptionsRooms.js
#	app/lib/methods/loadMissedMessages.js
#	app/lib/methods/loadThreadMessages.js
#	app/lib/methods/logout.js
#	app/lib/methods/readMessages.js
#	app/lib/methods/sendFileMessage.js
#	app/lib/methods/sendMessage.js
#	app/lib/methods/subscriptions/room.js
#	app/lib/methods/subscriptions/rooms.js
#	app/lib/methods/updateMessages.js
#	app/lib/rocketchat.js
#	app/presentation/RoomItem/LastMessage.js
#	app/reducers/index.js
#	app/sagas/createChannel.js
#	app/sagas/createDiscussion.js
#	app/sagas/deepLinking.js
#	app/sagas/encryption.js
#	app/sagas/init.js
#	app/sagas/login.js
#	app/sagas/messages.js
#	app/sagas/rooms.js
#	app/sagas/selectServer.js
#	app/sagas/state.js
#	app/stacks/InsideStack.js
#	app/utils/isReadOnly.js
#	app/utils/localAuthentication.js
#	app/utils/log/events.js
#	app/views/AttachmentView.js
#	app/views/ChangePasscodeView.js
#	app/views/CreateChannelView.js
#	app/views/CreateDiscussionView/SelectUsers.js
#	app/views/CreateDiscussionView/index.js
#	app/views/DirectoryView/Options.js
#	app/views/DirectoryView/index.js
#	app/views/LanguageView/index.js
#	app/views/LoginView.js
#	app/views/MessagesView/index.js
#	app/views/ModalBlockView.js
#	app/views/NewMessageView.js
#	app/views/NewServerView/index.js
#	app/views/ProfileView/index.js
#	app/views/ReadReceiptView/index.js
#	app/views/RoomActionsView/index.js
#	app/views/RoomInfoEditView/index.js
#	app/views/RoomInfoView/index.js
#	app/views/RoomMembersView/index.js
#	app/views/RoomView/Header/Header.js
#	app/views/RoomView/Header/RightButtons.js
#	app/views/RoomView/Header/index.js
#	app/views/RoomView/List.js
#	app/views/RoomView/ReactionPicker.js
#	app/views/RoomView/index.js
#	app/views/RoomsListView/ServerDropdown.js
#	app/views/RoomsListView/SortDropdown/index.js
#	app/views/RoomsListView/index.js
#	app/views/ScreenLockConfigView.js
#	app/views/ScreenLockedView.js
#	app/views/SearchMessagesView/index.js
#	app/views/SelectServerView.js
#	app/views/SelectedUsersView.js
#	app/views/SettingsView/index.js
#	app/views/ShareListView/index.js
#	app/views/ShareView/Thumbs.js
#	app/views/ShareView/index.js
#	app/views/SidebarView/index.js
#	app/views/ThreadMessagesView/Dropdown/index.js
#	app/views/ThreadMessagesView/index.js
#	ios/NotificationService/Info.plist
#	ios/ReplyNotification.swift
#	ios/RocketChatRN-Bridging-Header.h
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	patches/react-native-webview+10.3.2.patch
#	storybook/stories/Message.js
#	yarn.lock
@diegolmello diegolmello merged commit f5b013f into master Mar 15, 2021
@diegolmello diegolmello deleted the beta branch March 15, 2021 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.