From c6c37cbc01fb8db4f6052039f1004e7e005a5e33 Mon Sep 17 00:00:00 2001
From: akanshaaaa19 <asakhre2002@gmail.com>
Date: Fri, 31 May 2024 12:10:59 +0530
Subject: [PATCH 1/2] changed position of translate button

---
 .../images/icons/LanguageTranslation.svg      |  2 +-
 src/components/floweditor/FlowEditor.tsx      | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/assets/images/icons/LanguageTranslation.svg b/src/assets/images/icons/LanguageTranslation.svg
index dea08db0f..434f727c8 100644
--- a/src/assets/images/icons/LanguageTranslation.svg
+++ b/src/assets/images/icons/LanguageTranslation.svg
@@ -1,3 +1,3 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.7917 9H14.2917C14.0928 9 13.902 9.07902 13.7614 9.21968C13.6207 9.36033 13.5417 9.55109 13.5417 9.75C13.5417 9.94892 13.6207 10.1397 13.7614 10.2803C13.902 10.421 14.0928 10.5 14.2917 10.5V12H13.4035C13.4924 11.7598 13.5392 11.5061 13.5417 11.25C13.5418 10.7547 13.3784 10.2732 13.0769 9.88023C12.7754 9.48726 12.3526 9.20478 11.8742 9.07661C11.3957 8.94844 10.8884 8.98176 10.4308 9.17139C9.97321 9.36101 9.591 9.69635 9.34347 10.1254C9.29375 10.2107 9.26137 10.305 9.24821 10.4029C9.23504 10.5008 9.24133 10.6003 9.26673 10.6958C9.29213 10.7912 9.33613 10.8807 9.39621 10.9591C9.45629 11.0375 9.53126 11.1032 9.61682 11.1526C9.70238 11.2019 9.79684 11.2339 9.89478 11.2466C9.99273 11.2593 10.0922 11.2526 10.1875 11.2268C10.2829 11.2009 10.3722 11.1565 10.4503 11.0961C10.5284 11.0357 10.5938 10.9604 10.6428 10.8746C10.7087 10.7608 10.8033 10.6663 10.9172 10.6006C11.0311 10.5348 11.1602 10.5001 11.2917 10.5C11.4906 10.5 11.6814 10.579 11.822 10.7197C11.9627 10.8603 12.0417 11.0511 12.0417 11.25C12.0417 11.4489 11.9627 11.6397 11.822 11.7803C11.6814 11.921 11.4906 12 11.2917 12C11.0928 12 10.902 12.079 10.7614 12.2197C10.6207 12.3603 10.5417 12.5511 10.5417 12.75C10.5417 12.9489 10.6207 13.1397 10.7614 13.2803C10.902 13.421 11.0928 13.5 11.2917 13.5C11.4906 13.5 11.6814 13.579 11.822 13.7197C11.9627 13.8603 12.0417 14.0511 12.0417 14.25C12.0417 14.4489 11.9627 14.6397 11.822 14.7803C11.6814 14.921 11.4906 15 11.2917 15C11.1602 14.9999 11.0311 14.9652 10.9172 14.8994C10.8033 14.8337 10.7087 14.7392 10.6428 14.6254C10.5938 14.5396 10.5284 14.4643 10.4503 14.4039C10.3722 14.3435 10.2829 14.2991 10.1876 14.2732C10.0922 14.2474 9.99273 14.2407 9.89479 14.2534C9.79685 14.2661 9.70239 14.2981 9.61683 14.3474C9.53127 14.3968 9.4563 14.4625 9.39622 14.5409C9.33614 14.6193 9.29214 14.7088 9.26674 14.8042C9.24134 14.8997 9.23504 14.9992 9.24821 15.0971C9.26138 15.195 9.29375 15.2893 9.34347 15.3746C9.59101 15.8036 9.97321 16.139 10.4308 16.3286C10.8884 16.5182 11.3957 16.5515 11.8742 16.4234C12.3526 16.2952 12.7754 16.0127 13.0769 15.6198C13.3784 15.2268 13.5418 14.7453 13.5417 14.25C13.5392 13.9939 13.4924 13.7402 13.4035 13.5H14.2917V15.75C14.2917 15.9489 14.3707 16.1397 14.5114 16.2803C14.652 16.421 14.8428 16.5 15.0417 16.5C15.2406 16.5 15.4314 16.421 15.572 16.2803C15.7127 16.1397 15.7917 15.9489 15.7917 15.75V10.5C15.9906 10.5 16.1814 10.421 16.322 10.2803C16.4627 10.1397 16.5417 9.94892 16.5417 9.75C16.5417 9.55109 16.4627 9.36033 16.322 9.21968C16.1814 9.07902 15.9906 9 15.7917 9ZM6.81442 8.43201C6.8627 8.6249 6.98562 8.79072 7.15614 8.89298C7.24058 8.94361 7.33416 8.97712 7.43155 8.99159C7.52893 9.00606 7.62822 9.0012 7.72373 8.9773C7.81924 8.9534 7.9091 8.91092 7.98819 8.85228C8.06729 8.79365 8.13406 8.72002 8.18469 8.63558C8.23533 8.55114 8.26883 8.45756 8.2833 8.36017C8.29777 8.26279 8.29291 8.1635 8.26901 8.068L6.95138 2.79566C6.8589 2.42559 6.64535 2.09705 6.3447 1.86228C6.04404 1.62752 5.67354 1.5 5.29208 1.5C4.91063 1.5 4.54012 1.62752 4.23946 1.86228C3.93881 2.09705 3.72526 2.42559 3.63278 2.79566L2.31442 8.068C2.26615 8.26089 2.29648 8.46505 2.39874 8.63558C2.501 8.80611 2.66682 8.92903 2.85971 8.9773C3.0526 9.02557 3.25676 8.99524 3.42729 8.89298C3.59782 8.79072 3.72074 8.6249 3.76901 8.43201L4.1896 6.75H6.39406L6.81442 8.43201ZM4.56469 5.25L5.08737 3.15967C5.10321 3.11822 5.13127 3.08256 5.16782 3.0574C5.20438 3.03225 5.24771 3.01878 5.29208 3.01878C5.33645 3.01878 5.37978 3.03225 5.41634 3.0574C5.45289 3.08256 5.48095 3.11822 5.49679 3.15967L6.01919 5.25H4.56469ZM10.5417 5.25H11.2917C11.4906 5.2502 11.6812 5.32928 11.8218 5.46989C11.9624 5.6105 12.0415 5.80115 12.0417 6V6.75C12.0417 6.94892 12.1207 7.13968 12.2614 7.28033C12.402 7.42099 12.5928 7.5 12.7917 7.5C12.9906 7.5 13.1814 7.42099 13.322 7.28033C13.4627 7.13968 13.5417 6.94892 13.5417 6.75V6C13.5411 5.40347 13.3038 4.83155 12.882 4.40973C12.4602 3.98792 11.8882 3.75066 11.2917 3.75H10.5417C10.3428 3.75 10.152 3.82902 10.0114 3.96967C9.87073 4.11033 9.79171 4.30109 9.79171 4.5C9.79171 4.69892 9.87073 4.88968 10.0114 5.03033C10.152 5.17099 10.3428 5.25 10.5417 5.25ZM7.54171 12H6.79171C6.59286 11.9998 6.40221 11.9207 6.2616 11.7801C6.12099 11.6395 6.04191 11.4489 6.04171 11.25V10.5C6.04171 10.3011 5.9627 10.1103 5.82204 9.96968C5.68139 9.82902 5.49063 9.75 5.29171 9.75C5.0928 9.75 4.90204 9.82902 4.76138 9.96968C4.62073 10.1103 4.54171 10.3011 4.54171 10.5V11.25C4.54236 11.8465 4.77963 12.4185 5.20144 12.8403C5.62326 13.2621 6.19518 13.4994 6.79171 13.5H7.54171C7.74063 13.5 7.93139 13.421 8.07204 13.2803C8.2127 13.1397 8.29171 12.9489 8.29171 12.75C8.29171 12.5511 8.2127 12.3603 8.07204 12.2197C7.93139 12.079 7.74063 12 7.54171 12Z" fill="#777777"/>
+<path d="M15.7917 9H14.2917C14.0928 9 13.902 9.07902 13.7614 9.21968C13.6207 9.36033 13.5417 9.55109 13.5417 9.75C13.5417 9.94892 13.6207 10.1397 13.7614 10.2803C13.902 10.421 14.0928 10.5 14.2917 10.5V12H13.4035C13.4924 11.7598 13.5392 11.5061 13.5417 11.25C13.5418 10.7547 13.3784 10.2732 13.0769 9.88023C12.7754 9.48726 12.3526 9.20478 11.8742 9.07661C11.3957 8.94844 10.8884 8.98176 10.4308 9.17139C9.97321 9.36101 9.591 9.69635 9.34347 10.1254C9.29375 10.2107 9.26137 10.305 9.24821 10.4029C9.23504 10.5008 9.24133 10.6003 9.26673 10.6958C9.29213 10.7912 9.33613 10.8807 9.39621 10.9591C9.45629 11.0375 9.53126 11.1032 9.61682 11.1526C9.70238 11.2019 9.79684 11.2339 9.89478 11.2466C9.99273 11.2593 10.0922 11.2526 10.1875 11.2268C10.2829 11.2009 10.3722 11.1565 10.4503 11.0961C10.5284 11.0357 10.5938 10.9604 10.6428 10.8746C10.7087 10.7608 10.8033 10.6663 10.9172 10.6006C11.0311 10.5348 11.1602 10.5001 11.2917 10.5C11.4906 10.5 11.6814 10.579 11.822 10.7197C11.9627 10.8603 12.0417 11.0511 12.0417 11.25C12.0417 11.4489 11.9627 11.6397 11.822 11.7803C11.6814 11.921 11.4906 12 11.2917 12C11.0928 12 10.902 12.079 10.7614 12.2197C10.6207 12.3603 10.5417 12.5511 10.5417 12.75C10.5417 12.9489 10.6207 13.1397 10.7614 13.2803C10.902 13.421 11.0928 13.5 11.2917 13.5C11.4906 13.5 11.6814 13.579 11.822 13.7197C11.9627 13.8603 12.0417 14.0511 12.0417 14.25C12.0417 14.4489 11.9627 14.6397 11.822 14.7803C11.6814 14.921 11.4906 15 11.2917 15C11.1602 14.9999 11.0311 14.9652 10.9172 14.8994C10.8033 14.8337 10.7087 14.7392 10.6428 14.6254C10.5938 14.5396 10.5284 14.4643 10.4503 14.4039C10.3722 14.3435 10.2829 14.2991 10.1876 14.2732C10.0922 14.2474 9.99273 14.2407 9.89479 14.2534C9.79685 14.2661 9.70239 14.2981 9.61683 14.3474C9.53127 14.3968 9.4563 14.4625 9.39622 14.5409C9.33614 14.6193 9.29214 14.7088 9.26674 14.8042C9.24134 14.8997 9.23504 14.9992 9.24821 15.0971C9.26138 15.195 9.29375 15.2893 9.34347 15.3746C9.59101 15.8036 9.97321 16.139 10.4308 16.3286C10.8884 16.5182 11.3957 16.5515 11.8742 16.4234C12.3526 16.2952 12.7754 16.0127 13.0769 15.6198C13.3784 15.2268 13.5418 14.7453 13.5417 14.25C13.5392 13.9939 13.4924 13.7402 13.4035 13.5H14.2917V15.75C14.2917 15.9489 14.3707 16.1397 14.5114 16.2803C14.652 16.421 14.8428 16.5 15.0417 16.5C15.2406 16.5 15.4314 16.421 15.572 16.2803C15.7127 16.1397 15.7917 15.9489 15.7917 15.75V10.5C15.9906 10.5 16.1814 10.421 16.322 10.2803C16.4627 10.1397 16.5417 9.94892 16.5417 9.75C16.5417 9.55109 16.4627 9.36033 16.322 9.21968C16.1814 9.07902 15.9906 9 15.7917 9ZM6.81442 8.43201C6.8627 8.6249 6.98562 8.79072 7.15614 8.89298C7.24058 8.94361 7.33416 8.97712 7.43155 8.99159C7.52893 9.00606 7.62822 9.0012 7.72373 8.9773C7.81924 8.9534 7.9091 8.91092 7.98819 8.85228C8.06729 8.79365 8.13406 8.72002 8.18469 8.63558C8.23533 8.55114 8.26883 8.45756 8.2833 8.36017C8.29777 8.26279 8.29291 8.1635 8.26901 8.068L6.95138 2.79566C6.8589 2.42559 6.64535 2.09705 6.3447 1.86228C6.04404 1.62752 5.67354 1.5 5.29208 1.5C4.91063 1.5 4.54012 1.62752 4.23946 1.86228C3.93881 2.09705 3.72526 2.42559 3.63278 2.79566L2.31442 8.068C2.26615 8.26089 2.29648 8.46505 2.39874 8.63558C2.501 8.80611 2.66682 8.92903 2.85971 8.9773C3.0526 9.02557 3.25676 8.99524 3.42729 8.89298C3.59782 8.79072 3.72074 8.6249 3.76901 8.43201L4.1896 6.75H6.39406L6.81442 8.43201ZM4.56469 5.25L5.08737 3.15967C5.10321 3.11822 5.13127 3.08256 5.16782 3.0574C5.20438 3.03225 5.24771 3.01878 5.29208 3.01878C5.33645 3.01878 5.37978 3.03225 5.41634 3.0574C5.45289 3.08256 5.48095 3.11822 5.49679 3.15967L6.01919 5.25H4.56469ZM10.5417 5.25H11.2917C11.4906 5.2502 11.6812 5.32928 11.8218 5.46989C11.9624 5.6105 12.0415 5.80115 12.0417 6V6.75C12.0417 6.94892 12.1207 7.13968 12.2614 7.28033C12.402 7.42099 12.5928 7.5 12.7917 7.5C12.9906 7.5 13.1814 7.42099 13.322 7.28033C13.4627 7.13968 13.5417 6.94892 13.5417 6.75V6C13.5411 5.40347 13.3038 4.83155 12.882 4.40973C12.4602 3.98792 11.8882 3.75066 11.2917 3.75H10.5417C10.3428 3.75 10.152 3.82902 10.0114 3.96967C9.87073 4.11033 9.79171 4.30109 9.79171 4.5C9.79171 4.69892 9.87073 4.88968 10.0114 5.03033C10.152 5.17099 10.3428 5.25 10.5417 5.25ZM7.54171 12H6.79171C6.59286 11.9998 6.40221 11.9207 6.2616 11.7801C6.12099 11.6395 6.04191 11.4489 6.04171 11.25V10.5C6.04171 10.3011 5.9627 10.1103 5.82204 9.96968C5.68139 9.82902 5.49063 9.75 5.29171 9.75C5.0928 9.75 4.90204 9.82902 4.76138 9.96968C4.62073 10.1103 4.54171 10.3011 4.54171 10.5V11.25C4.54236 11.8465 4.77963 12.4185 5.20144 12.8403C5.62326 13.2621 6.19518 13.4994 6.79171 13.5H7.54171C7.74063 13.5 7.93139 13.421 8.07204 13.2803C8.2127 13.1397 8.29171 12.9489 8.29171 12.75C8.29171 12.5511 8.2127 12.3603 8.07204 12.2197C7.93139 12.079 7.74063 12 7.54171 12Z" fill="#119656"/>
 </svg>
diff --git a/src/components/floweditor/FlowEditor.tsx b/src/components/floweditor/FlowEditor.tsx
index e7fae7436..7e1557459 100644
--- a/src/components/floweditor/FlowEditor.tsx
+++ b/src/components/floweditor/FlowEditor.tsx
@@ -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';
@@ -55,7 +56,7 @@ export const FlowEditor = () => {
     setAnchorEl(null);
   };
 
-  const isTranslationEnabled = getOrganizationServices('autoTranslationEnabled');
+  const isTranslationEnabled = !getOrganizationServices('autoTranslationEnabled');
 
   let modal = null;
   let dialog = null;
@@ -401,17 +402,6 @@ export const FlowEditor = () => {
             >
               Reset flow count
             </MenuItem>
-            {isTranslationEnabled && (
-              <MenuItem
-                onClick={() => {
-                  setShowTranslateFlowModal(true);
-                  handleClose();
-                }}
-                disableRipple
-              >
-                Translate
-              </MenuItem>
-            )}
           </Menu>
 
           <Button
@@ -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"

From 869b44432419939306d2e5fa61bb7646c8398a14 Mon Sep 17 00:00:00 2001
From: akanshaaaa19 <asakhre2002@gmail.com>
Date: Fri, 31 May 2024 12:11:24 +0530
Subject: [PATCH 2/2] changed position of translate button

---
 src/components/floweditor/FlowEditor.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/floweditor/FlowEditor.tsx b/src/components/floweditor/FlowEditor.tsx
index 7e1557459..f9dbde80b 100644
--- a/src/components/floweditor/FlowEditor.tsx
+++ b/src/components/floweditor/FlowEditor.tsx
@@ -56,7 +56,7 @@ export const FlowEditor = () => {
     setAnchorEl(null);
   };
 
-  const isTranslationEnabled = !getOrganizationServices('autoTranslationEnabled');
+  const isTranslationEnabled = getOrganizationServices('autoTranslationEnabled');
 
   let modal = null;
   let dialog = null;