Skip to content

Commit

Permalink
Merge branch 'master' into feature/terms-and-conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
kurund authored May 31, 2024
2 parents d9b1edc + 542e1c6 commit ce03457
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/assets/images/icons/LanguageTranslation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 15 additions & 11 deletions src/components/floweditor/FlowEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Menu, MenuItem, Typography } from '@mui/material';
import BackIconFlow from 'assets/images/icons/BackIconFlow.svg?react';
import WarningIcon from 'assets/images/icons/Warning.svg?react';
import PreviewIcon from 'assets/images/icons/PreviewIcon.svg?react';
import TranslateIcon from 'assets/images/icons/LanguageTranslation.svg?react';
import PublishIcon from 'assets/images/icons/PublishIcon.svg?react';
import { Button } from 'components/UI/Form/Button/Button';
import { APP_NAME } from 'config/index';
Expand Down Expand Up @@ -401,17 +402,6 @@ export const FlowEditor = () => {
>
Reset flow count
</MenuItem>
{isTranslationEnabled && (
<MenuItem
onClick={() => {
setShowTranslateFlowModal(true);
handleClose();
}}
disableRipple
>
Translate
</MenuItem>
)}
</Menu>

<Button
Expand All @@ -423,6 +413,20 @@ export const FlowEditor = () => {
<PreviewIcon className={styles.Icon} />
Preview
</Button>
{isTranslationEnabled && (
<Button
variant="outlined"
color="primary"
data-testid="previewButton"
onClick={() => {
setShowTranslateFlowModal(true);
handleClose();
}}
>
<TranslateIcon className={styles.Icon} />
Translate
</Button>
)}
<Button
variant="contained"
color="primary"
Expand Down

0 comments on commit ce03457

Please sign in to comment.