Skip to content

Merge 4.26.1 into master#3979

Merged
diegolmello merged 1460 commits intomasterfrom
beta
Mar 29, 2022
Merged

Merge 4.26.1 into master#3979
diegolmello merged 1460 commits intomasterfrom
beta

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 26, 2022 15:35
…nect-v2

Chore: Migrate redux module connect to typescript
* fix build and useless done and async generator

* update snapshot
Co-authored-by: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
…nsview

[NEW] Add Discussions to RoomActionsView
…o-ts

Chore: Migrate redux module server to TypeScript
* chore: migrate redux module share to typescript

* chore: fix types

* chore: update types

* chore: migrate redux module share to typescript

* remove double import

* chore: fix import
* chore: migrate createChannel to ts and add tests

* chore: fix naming

* chore: add more types and remove mapDispatchToProps from components

* remove todo

* update tests

* chore: migrate interface to reducer and fix errors on return

* chore: insert IApplicationState to mapStateToProps state type

* Remove spread

* fix type

* fix import and state type

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* chore: migrate activeUsers reducer and action to TS

* chore: init types folder and set redux and BaseScreen interface

* chore: remove mapDispatchToProps to use dispatch prop and clear some types

* chore: type selectedUsers action and reducer and improvement in the code of other files

* chore: move IUser to base types

* chore: move state props to ISelectedUsersViewProps

* chore: create mocketStore

* chore: remove applyAppStateMiddleware

* test: create activeUser and selectedUser tests

* test: add more selectedUsers tests

* chore: fix action type

* chore: move types to definition folder and fix imports

* chore: remove unused const

* chore: migrate redux tests to reducer folder and add eslint jest plugin

* chore: exprot initial state and then import on tests

* chore: move interfaces to reducer and import on screen

* chore: set eslint-plugin-jest version to 24.7.0

* chore: fix IUser import

* chore: update interfaces and types names

* chore: update definitions

* chore: update IBaseScreen definitions

* chore: init reducer/app migration to ts

* chore: add tests and migrate RootEnum

* wip: migrate fixed consts to RootEnum

* chore: remove redux action inferences

* fix types

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* chore: migrate createDiscussion to ts and add tests

* chore: add TActionCreateDiscussion to TApplicationActions

* fix types

* update types

* fix types

Co-authored-by: Diego Mello <diegolmello@gmail.com>
dnlsilva and others added 28 commits March 21, 2022 16:23
* [FIX] Display added user to team

* tweak when remove members from team too

* update storyshot

Co-authored-by: AlexAlexandre <alexalexandrejr@gmail.com>
Co-authored-by: Diego Mello <diegolmello@gmail.com>
* chore: clean TwoFactor

* minor tweak

* minor refactor

* chore: removing console log
* chore: clear Check component

* chore: update tests
* update `TextInput` component

update: ActivityIndicator

* remove: `any`

* update: `TextInput` on `UIKit`

* Fix returnKeyType

Co-authored-by: Diego Mello <diegolmello@gmail.com>
* Chore: Migrate containers: Passcode to Typescript

* minor tweak

* minor tweak
* update: `Content` component

* update: `Message` snapshots
* update: Audio component
* update: `HeaderButton` components

* update: types

* fix types

* fix lint and update snapshot

Co-authored-by: GleidsonDaniel <gleidson10daniel@hotmail.com>
* Chore: Migrate containers: FormContainer to Typescript

* minor tweak

* theme fix

* fix react.reactelement[]

* minor tweak

Co-authored-by: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
* Chore: Migrate containers: List to Typescript

* minor tweak

* fix storyshot List - item flatlist

* fix IListContainer

* fix type of childrens

* minor tweak
Co-authored-by: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
* Adds a check to see if the collapsed property exists.

* 👀

* update snapshot

* revert

* revert yarn.lock
# Conflicts:
#	android/app/build.gradle
#	app/containers/FormContainer.tsx
#	app/containers/List/ListContainer.tsx
#	app/containers/List/ListHeader.tsx
#	app/containers/List/ListIcon.tsx
#	app/containers/List/ListItem.tsx
#	app/containers/List/ListSection.tsx
#	app/containers/List/ListSeparator.tsx
#	app/containers/RoomHeader/RoomHeader.tsx
#	app/containers/RoomHeader/index.tsx
#	app/containers/RoomTypeIcon.tsx
#	app/containers/Status/Status.tsx
#	app/containers/Status/index.tsx
#	app/containers/markdown/AtMention.tsx
#	app/containers/markdown/BlockQuote.tsx
#	app/containers/markdown/Hashtag.tsx
#	app/containers/markdown/Link.tsx
#	app/containers/markdown/List.tsx
#	app/containers/markdown/ListItem.tsx
#	app/containers/markdown/Preview.tsx
#	app/containers/markdown/Table.tsx
#	app/containers/markdown/TableCell.tsx
#	app/containers/markdown/TableRow.tsx
#	app/containers/markdown/interfaces.ts
#	app/containers/markdown/new/BigEmoji.tsx
#	app/containers/markdown/new/Bold.tsx
#	app/containers/markdown/new/Code.tsx
#	app/containers/markdown/new/CodeLine.tsx
#	app/containers/markdown/new/Emoji.tsx
#	app/containers/markdown/new/Heading.tsx
#	app/containers/markdown/new/Image.tsx
#	app/containers/markdown/new/Inline.tsx
#	app/containers/markdown/new/InlineCode.tsx
#	app/containers/markdown/new/Italic.tsx
#	app/containers/markdown/new/Link.tsx
#	app/containers/markdown/new/OrderedList.tsx
#	app/containers/markdown/new/Paragraph.tsx
#	app/containers/markdown/new/Plain.tsx
#	app/containers/markdown/new/Quote.tsx
#	app/containers/markdown/new/Strike.tsx
#	app/containers/markdown/new/TaskList.tsx
#	app/containers/markdown/new/UnorderedList.tsx
#	app/containers/markdown/new/index.tsx
#	app/containers/message/Attachments.tsx
#	app/definitions/ILoggedUser.ts
#	app/definitions/IUser.ts
#	app/definitions/index.ts
#	app/dimensions.tsx
#	app/lib/rocketchat/rocketchat.js
#	app/lib/rocketchat/services/connect.ts
#	app/presentation/RoomItem/RoomItem.tsx
#	app/presentation/RoomItem/TypeIcon.tsx
#	app/presentation/RoomItem/index.tsx
#	app/reducers/activeUsers.test.ts
#	app/reducers/activeUsers.ts
#	app/reducers/login.test.ts
#	app/reducers/login.ts
#	app/views/AddChannelTeamView.tsx
#	app/views/ForgotPasswordView.tsx
#	app/views/LoginView.tsx
#	app/views/NewServerView/index.tsx
#	app/views/RegisterView.tsx
#	app/views/ScreenLockConfigView.tsx
#	app/views/SendEmailConfirmationView.tsx
#	app/views/SidebarView/index.tsx
#	app/views/StatusView.tsx
#	app/views/ThemeView.tsx
#	app/views/WorkspaceView/index.tsx
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
#	storybook/stories/__snapshots__/List.storyshot
#	storybook/stories/__snapshots__/Message.storyshot
#	storybook/stories/__snapshots__/RoomItem.storyshot
@diegolmello diegolmello merged commit 03e8df6 into master Mar 29, 2022
@diegolmello diegolmello deleted the beta branch March 29, 2022 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

Comments