Skip to content

[FIX] Cancel button and success toast at Leave Team modal #22373

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

Merged
tassoevan merged 6 commits into from
Jun 21, 2021
Merged

[FIX] Cancel button and success toast at Leave Team modal #22373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a8cb53
Add cancel button and toast
gabriellsh Jun 16, 2021
c2e7ecb
Merge branch 'develop' into fix/modal_review
gabriellsh Jun 16, 2021
cab385f
Merge branch 'develop' into fix/modal_review
tassoevan Jun 18, 2021
d819dc4
Merge branch 'develop' into fix/modal_review
tassoevan Jun 20, 2021
088fe39
Merge branch 'develop' into fix/modal_review
tassoevan Jun 20, 2021
33f59f3
Merge branch 'develop' into fix/modal_review
tassoevan Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/views/teams/contextualBar/info/Leave/StepTwo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export const StepTwo = ({ onConfirm, onCancel, onClose }) => {
variant='danger'
title={t('Confirmation')}
onConfirm={onConfirm}
onCancel={onCancel}
onCancel={onCancel || onClose}
onClose={onClose}
confirmText={t('Leave')}
cancelText={t('Back')}
cancelText={onCancel ? t('Back') : t('Cancel')}
>
{t('Teams_leaving_team')}
</GenericModal>
Expand Down
1 change: 1 addition & 0 deletions client/views/teams/contextualBar/info/TeamsInfoWithLogic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ function TeamsInfoWithLogic({ room, openEditing }) {

try {
await leaveTeam({ teamId: room.teamId, rooms });
dispatchToastMessage({ type: 'success', message: t('Teams_left_team_successfully') });
router.push({});
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
Expand Down
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3914,6 +3914,7 @@
"Teams_kept__username__channels": "You did not select the following Channels so __username__ will be kept on them:",
"Teams_leave_channels": "Select the Team’s Channels you would like to leave.",
"Teams_leave": "Leave Team",
"Teams_left_team_successfully": "Left the Team successfully",
"Teams_members": "Teams Members",
"Teams_New_Add_members_Label": "Add Members",
"Teams_New_Broadcast_Description": "Only authorized users can write new messages, but the other users will be able to reply",
Expand Down