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.

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

chore: Merge 4.47.0 into master #5611

Merged
merged 45 commits into from
Mar 12, 2024
Merged

chore: Merge 4.47.0 into master #5611

merged 45 commits into from
Mar 12, 2024

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 January 25, 2024 10:45
* create redux for inAppFeedback

* add the clear inAppFeedback, haptic feedback to room view

* added haptics feedback to room view

* add the user preference to in app vibration and the value

* minor tweak

* yarn prettier-lint
* Revert "feat: Send native calculated keyboard and tracking view height to TS (#5514)"

This reverts commit cedd0b9.

* better height calculation
* fix: remove blocks when updating an old message

* minior tweak, add to threadMessagesToUpdate

* remove the comments
* take new photo added for avatar

* code optimization

* Update app/views/ChangeAvatarView/index.tsx

Co-authored-by: Gleidson Daniel Silva <[email protected]>

* improvements

* Update .detoxrc.js

* Update jest.config.js

---------

Co-authored-by: Gleidson Daniel Silva <[email protected]>
* merged conflicts

* test cases fixed

* test case fixed

* comments addressed

* test update

* checkbox package removed

* test case fixed

* podfile updated

* podlock file fixed

* fix test

* comments addressed

---------

Co-authored-by: Gleidson Daniel Silva <[email protected]>
* chore: update detox

* chore: improve mocks

* chore: add testId

* chore: add e2e tests

* add more time

* Fix tests

* fxi tests

* update yarn lock

* fix import

* wip

* test

* Fix deep linking tests

---------

Co-authored-by: Diego Mello <[email protected]>
* fix: open self profile from messages

* fix the inAppFeedback reducer function name

* add e2e test to open profile by username

* update tests

---------

Co-authored-by: Gleidson Daniel Silva <[email protected]>
* jest.fn issue

* Working on tests

* Add quotes test

* Audio

* Mock search

* Fix some act errors from jest

---------

Co-authored-by: Gleidson Daniel Silva <[email protected]>
Co-authored-by: Sathurshan <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
* chore: remove alignSelf Styles.ts

* chore: apply alignSelf style only on LastMessage

* test: update snapshot
* chore: add script to organize translations

* chore: organize translations alphabetically

* chore: add workflow to organize translations and commit changes

* chore: naming

* chore: update action

* test action

* wip

* updated translations

* chore: finish action

* action: organized translations

* Shuffle 🤪

* action: organized translations

---------

Co-authored-by: GleidsonDaniel <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: diegolmello <[email protected]>
* fix: commonmark code_block

* update the style of code blocks

* fix: bump commonmark and remove patch

---------

Co-authored-by: Gleidson Daniel Silva <[email protected]>
* chore: add hideUnreadStatus to unreadsCount logic

* fix: sets the value of unreadStatus when it does not come from the backend
reinaldonetof and others added 15 commits February 22, 2024 16:56
* fix: the download's key for files with the same filename

* refactor the functions to sanitize the strings

* chore: remove useless change

---------

Co-authored-by: GleidsonDaniel <[email protected]>
Before the fix emoji could be found only by a subsctring from a string start. 

For example, we have two emojis
1) foo
2) bar_foo

When you perform a search by keyword 'foo' only the first one will be found.

Now, both will be found.

Co-authored-by: Gleidson Daniel Silva <[email protected]>
* feat: improve login error message

* action: organized translations

* Update app/i18n/locales/en.json

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

* Update app/i18n/locales/en.json

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

* wip

* action: organized translations

---------

Co-authored-by: GleidsonDaniel <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
* chore: move draftMessage to helpers

* fix: set draft when the message is sent
)

* feat: show toast on direct msg not allowed members view

* fix: use permission msg

* refactor some code
* feat: display language icon for auto translated msgs

* add translate icon to stoybook

	modified:   app/containers/message/Message.stories.tsx

* fix test

* refactor: use colors straightly without finding them with theme

* refactor some code

* fix test storyshot

* fix test issue
* feat: troubleshoot notification (#5198)

* navigation done

* create the icon inside roomslistview, navigation to push troubleshot and layout push troubleshoot

* custom header

* fix the rooms list view header icon

* layout done

* update the pt-br i18n

* tweak on colors

* feat: create notification in room view (#5250)

* button and simple navigation done, missing master detail

* navigation

* add withTheme and colors to rightuttons

* fix e2e test

* feat: add troubleshooting to notifications pages (#5276)

* feat: add troubleshooting to notifications pages

* fix e2e test

* feat: device notification settings (#5277)

* iOS go to device notification setting to change the configuration

* go to notification settings with android

* add notifee

* add the reducer and action

* saga request done

* add the setInAlert action

* tweak at name and add focus to dispatch the request

* use the foreground inside pushTroubleShoot to request the notification and fix the icon color

* add the request at roomslistview didmount

* remove the notification modulo from android

* add patch

* minor tweak

* feat: test push notification (#5329)

* feat: test push notification

* restApi and definition

* push.info and change properly the troubleshootingNotification

* use the finally at try/catch

* minor tweak

* alert and push.info just for 6.6

* fix the react-native.config

* minor tweaks

* minor tweak

* push.test as rest api

* change the name from inAlertNotification to highlightTroubleshooting

* feat: push quota

* refactor the percentage state

* removed the push quota feature

* minor tweaks

* update the link to push notification

* the notification icon in the room header will appear if notifications are disabled or highlight troubleshoot is true

* remove push quota texts

* updated some of the push quota texts

* chore: rename highlightTroubleshooting

* chore: better prop naming

* wip

* chore: fix function name

* chore: fix colors

* fix: copy

* chore: 💅

* chore: use fork

* chore: naming

* chore: fix init

* chore: naming

* chore: naming

* Comment CE code

* Use put on troubleshooting saga

* Add db column

* fix: check notification payload

* action: organized translations

* fix: push init

---------

Co-authored-by: GleidsonDaniel <[email protected]>
Co-authored-by: Diego Mello <[email protected]>
Co-authored-by: GleidsonDaniel <[email protected]>
# Conflicts:
#	android/app/build.gradle
#	app/i18n/locales/en.json
#	app/i18n/locales/pt-BR.json
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	package.json
@diegolmello diegolmello merged commit d34ff3d into master Mar 12, 2024
4 of 9 checks passed
@diegolmello diegolmello deleted the 4.47.0-master branch March 12, 2024 13:45
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.

8 participants