Skip to content

Commit

Permalink
Merge pull request #44657 from bernhardoj/fix/42668-ws-invite-msg-sho…
Browse files Browse the repository at this point in the history
…ws-html-briefly

Fix WS invite message shows html message briefly
  • Loading branch information
roryabraham authored Jul 17, 2024
2 parents 9c509a0 + c27688c commit 52b8fdd
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/pages/workspace/WorkspaceInviteMessagePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import Parser from '@libs/Parser';
import * as PolicyUtils from '@libs/PolicyUtils';
import updateMultilineInputRange from '@libs/updateMultilineInputRange';
import type {SettingsNavigatorParamList} from '@navigation/types';
Expand Down Expand Up @@ -85,15 +84,13 @@ function WorkspaceInviteMessagePage({
// policy?.description can be an empty string
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
policy?.description ||
Parser.replace(
translate('workspace.common.welcomeNote', {
workspaceName: policy?.name ?? '',
}),
);
translate('workspace.common.welcomeNote', {
workspaceName: policy?.name ?? '',
});

useEffect(() => {
if (!isEmptyObject(invitedEmailsToAccountIDsDraft)) {
setWelcomeNote(Parser.htmlToMarkdown(getDefaultWelcomeNote()));
setWelcomeNote(getDefaultWelcomeNote());
return;
}
Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID), true);
Expand Down

0 comments on commit 52b8fdd

Please sign in to comment.