Merge branch 'master' of github.com:binary-com/deriv-app into bug-743…

…62-feedback-button-does-nothing
binary-com · Sep 15, 2022 · aaeac4a · aaeac4a
2 parents d57ed78 + a9995ce
commit aaeac4a
Show file tree

Hide file tree

Showing 47 changed files with 659 additions and 523 deletions.
diff --git a/.github/workflows/generate_and_push_deriv_api_types.md b/.github/workflows/generate_and_push_deriv_api_types.md
@@ -11,4 +11,3 @@ After a new version has been published the action will automatically create a PR
 Required GitHub secrets:
 
 -   `NPM_ACCESS_TOKEN`: To allow for automatic publishing of new version of `@deriv/api-types`
--   `PERSONAL_ACCESS_TOKEN`: (GitHub PAT) To allow the action to authenticate with Git for git operations.
diff --git a/.github/workflows/generate_and_push_deriv_api_types.yml b/.github/workflows/generate_and_push_deriv_api_types.yml
@@ -109,7 +109,7 @@ jobs:
 
             # Use "gh" to create a PR from the CLI.
             sudo apt install gh
-            gh auth login --with-token <<< ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+            gh auth login --with-token <<< ${{ github.token }}
             gh pr close "$package_name" || true
             gh pr create --title "Bump $package_name from $safe_old_version to $new_version" --body "\`\`\`diff $pr_body \`\`\`" --base "master" --head "binary-com:$package_name"
           fi
diff --git a/.github/workflows/push_and_pull_crowdin_translations.md b/.github/workflows/push_and_pull_crowdin_translations.md
@@ -5,5 +5,4 @@ This action will automatically extract strings from the Deriv.app repo and uploa
 Required GitHub secrets:
 
 -   `NPM_ACCESS_TOKEN`: To allow for automatic publishing of new version of `@deriv/api-types`
--   `PERSONAL_ACCESS_TOKEN`: (GitHub PAT) To allow the action to authenticate with Git for git operations.
 -   `CROWDIN_API_TOKEN`: To allow us to download and upload new language files to and from Crowdin.
diff --git a/jest.config.js b/jest.config.js
@@ -8,6 +8,7 @@ module.exports = {
     transform: {
         '^.+\\.jsx?$': 'babel-jest',
         '^.+/es/^.+$': 'babel-jest',
+        '^.+\\.(ts|tsx)?$': 'ts-jest',
     },
     testRegex: ['__tests__', '.*.spec.js'],
     transformIgnorePatterns: ['/node_modules/(?!react-virtualized).+\\.js$'],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,6 +27,7 @@
         "@types/react-router-dom": "^5.1.6",
         "@typescript-eslint/eslint-plugin": "^5.8.0",
         "@typescript-eslint/parser": "^5.8.0",
+        "ts-jest": "^26.4.2",
         "babel-polyfill": "^6.26.0",
         "chai": "^4.2.0",
         "eslint": "^7.18.0",

diff --git a/packages/account/src/Components/poi/idv-document-submit/utils.js b/packages/account/src/Components/poi/idv-document-submit/utils.js
@@ -140,4 +140,11 @@ const idv_document_data = {
             sample_image: '',
         },
     },
+    zw: {
+        national_id: {
+            new_display_name: 'National ID',
+            example_format: '081234567F53',
+            sample_image: getImageLocation('zw_national_identity_card.png'),
+        },
+    },
 };
diff --git a/.../bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_contracttype.js b/.../bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_contracttype.js
@@ -16,6 +16,9 @@ Blockly.Blocks.trade_definition_contracttype = {
             colour: Blockly.Colours.Special1.colour,
             colourSecondary: Blockly.Colours.Special1.colourSecondary,
             colourTertiary: Blockly.Colours.Special1.colourTertiary,
+            tooltip: localize(
+                'If the contract type is “Both”, then the Purchase Conditions should include both Rise and Fall using the “Conditional Block"'
+            ),
             previousStatement: null,
             nextStatement: null,
         });

diff --git a/packages/bot-skeleton/src/scratch/hooks/css.js b/packages/bot-skeleton/src/scratch/hooks/css.js
@@ -222,7 +222,7 @@ Blockly.Css.CONTENT = [
     'margin: 4px;',
     'border-radius: 4px;',
     'background: $colour_numPadBackground;',
-    'color: $colour_numPadText;',
+    'color: var(--text-general);',
     'outline: none;',
     'border: 1px solid $colour_numPadBorder;',
     'cursor: pointer;',
@@ -235,6 +235,7 @@ Blockly.Css.CONTENT = [
     'margin-top: 10%;',
     'width: 80%;',
     'height: 80%;',
+    'filter: invert(1);',
     '}',
 
     '.blocklyNumPadButton:active {',

diff --git a/packages/cashier/globals.d.ts b/packages/cashier/globals.d.ts
@@ -1,4 +1,2 @@
 declare module '@deriv/components';
-declare module '@deriv/p2p';
-declare module '@deriv/translations';
 declare module '@deriv/shared';
diff --git a/packages/cashier/src/components/cashier-locked/cashier-locked.tsx b/packages/cashier/src/components/cashier-locked/cashier-locked.tsx
@@ -54,7 +54,7 @@ const CashierLocked = ({
 
     let icon = 'IcCashierLocked';
     let title = localize('Cashier is locked');
-    let message = localize(
+    let message: string | JSX.Element = localize(
         'Your cashier is currently locked. Please contact us via live chat to find out how to unlock it.'
     );
 

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import React from 'react';
 import { Field, FieldProps, Formik, Form } from 'formik';
-import { Button, Dropdown, Icon, Input, Loading, Money, MobileWrapper, Text } from '@deriv/components';
+import { Button, Dropdown, Icon, Input, Loading, Money, Text } from '@deriv/components';
 import {
     getDecimalPlaces,
     getCurrencyDisplayCode,
@@ -170,7 +170,7 @@ const AccountTransferForm = ({
 }: TAccountTransferFormProps) => {
     const [from_accounts, setFromAccounts] = React.useState({});
     const [to_accounts, setToAccounts] = React.useState({});
-    const [transfer_to_hint, setTransferToHint] = React.useState();
+    const [transfer_to_hint, setTransferToHint] = React.useState<string>();
 
     const { daily_transfers } = account_limits;
     const mt5_remaining_transfers = daily_transfers?.mt5;
@@ -202,6 +202,10 @@ const AccountTransferForm = ({
         return undefined;
     };
 
+    const shouldShowTransferButton = (amount: string) => {
+        return selected_from.currency === selected_to.currency ? !amount : !converter_from_amount;
+    };
+
     const getAccounts = (type: string, { is_mt, is_dxtrade }: TAccount) => {
         if (type === 'from') {
             if (is_mt) return mt_accounts_from;
@@ -376,7 +380,7 @@ const AccountTransferForm = ({
                 validateOnBlur={false}
                 enableReinitialize
             >
-                {({ errors, handleChange, isSubmitting, touched, setFieldValue, setFieldTouched, setFieldError }) => (
+                {({ errors, handleChange, isSubmitting, setFieldValue, setFieldError, values }) => (
                     <React.Fragment>
                         {isSubmitting || accounts_list.length === 0 ? (
                             <div className='cashier__loader-wrapper' data-testid='dt_cashier_loader_wrapper'>
@@ -406,8 +410,7 @@ const AccountTransferForm = ({
                                             onChangeTransferFrom(e);
                                             handleChange(e);
                                             setFieldValue('amount', '');
-                                            setFieldError('amount', '');
-                                            setFieldTouched('amount', false);
+                                            setTimeout(() => setFieldError('amount', ''));
                                         }}
                                         error={selected_from.error}
                                     />
@@ -429,8 +432,7 @@ const AccountTransferForm = ({
                                         onChange={(e: TReactChangeEvent) => {
                                             onChangeTransferTo(e);
                                             setFieldValue('amount', '');
-                                            setFieldError('amount', '');
-                                            setFieldTouched('amount', false);
+                                            setTimeout(() => setFieldError('amount', ''));
                                         }}
                                         hint={transfer_to_hint}
                                         error={selected_to.error}
@@ -445,15 +447,14 @@ const AccountTransferForm = ({
                                                     setErrorMessage('');
                                                     handleChange(e);
                                                     setAccountTransferAmount(e.target.value);
-                                                    setFieldTouched('amount', true, false);
                                                 }}
                                                 className='cashier__input dc-input--no-placeholder account-transfer-form__input'
                                                 classNameHint='account-transfer-form__hint'
                                                 data-testid='dt_account_transfer_form_input'
                                                 name='amount'
                                                 type='text'
                                                 label={localize('Amount')}
-                                                error={touched.amount && errors.amount ? errors.amount : ''}
+                                                error={errors.amount ? errors.amount : ''}
                                                 required
                                                 trailing_icon={
                                                     selected_from.currency ? (
@@ -556,7 +557,9 @@ const AccountTransferForm = ({
                                             !!selected_to.error ||
                                             !+selected_from.balance ||
                                             !!converter_from_error ||
-                                            !!converter_to_error
+                                            !!converter_to_error ||
+                                            !!errors.amount ||
+                                            shouldShowTransferButton(values.amount)
                                         }
                                         primary
                                         large

diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-receipt/payment-agent-receipt.scss b/packages/cashier/src/pages/payment-agent/payment-agent-receipt/payment-agent-receipt.scss
@@ -38,24 +38,21 @@
                 padding-left: 0;
             }
         }
+        .cashier__form-submit {
+            row-gap: 1rem;
+        }
     }
 
     & .cashier__form-submit {
-        text-align: center;
+        display: flex;
         justify-content: center;
-        flex-flow: row;
+        align-items: center;
+        column-gap: 0.8rem;
         margin: 2.4rem 0 3.2rem;
 
         &-button {
             margin: 0;
             max-width: 18rem;
-
-            &:first-child {
-                margin-right: 0.4rem;
-            }
-            &:last-child {
-                margin-left: 0.4rem;
-            }
         }
     }
     &__transferred-contact {