Merge branch 'nested-list-issue' of github.com:sara-fs/deriv-app into…

… nested-list-issue
binary-com · Apr 23, 2022 · 1525829 · 1525829
2 parents 74ac9de + bb92cd1
commit 1525829
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/generate_app_id.yml b/.github/workflows/generate_app_id.yml
@@ -11,7 +11,7 @@ jobs:
         steps:
             - name: Capture Vercel preview URL
               id: vercel_preview_url
-              uses: binary-com/vercel-preview-url-action@v1.0.1
+              uses: binary-com/vercel-preview-url-action@v1.0.5
               with:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - name: Generate Deriv App ID for deployment Preview URL

diff --git a/...ages/account/src/Components/reset-trading-password-modal/reset-trading-password-modal.jsx b/...ages/account/src/Components/reset-trading-password-modal/reset-trading-password-modal.jsx
@@ -206,7 +206,7 @@ const ResetTradingPasswordModal = ({
     const [dialog_title, setDialogTitle] = React.useState('');
     const history = useHistory();
     React.useEffect(() => {
-        if (is_visible) {
+        if (is_visible && history.location.search !== '') {
             history.replace({
                 search: '',
                 hash: location.hash,

diff --git a/packages/cfd/src/Containers/cfd-reset-password-modal.tsx b/packages/cfd/src/Containers/cfd-reset-password-modal.tsx
@@ -84,7 +84,9 @@ const CFDResetPasswordModal = ({
         localStorage.removeItem('cfd_reset_password_intent');
         localStorage.removeItem('cfd_reset_password_type');
         localStorage.removeItem('cfd_reset_password_code');
-        history.push(`${routes.mt5}`);
+        if (history.location.pathname !== routes.mt5) {
+            history.push(`${routes.mt5}`);
+        }
     };
     const validatePassword = (values: { new_password: string }) => {
         const errors: { new_password?: string } = {};

diff --git a/packages/cfd/src/sass/cfd.scss b/packages/cfd/src/sass/cfd.scss
@@ -325,7 +325,7 @@
         margin-top: 2.4rem;
     }
     &__success {
-        width: 38.4rem;
+        min-width: 38.4rem;
         height: 28.4rem;
         display: flex;
         flex-direction: column;