Merge branch 'master' into likhith/75850/configure-account-package-fo…

…r-ts-migration

.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.

.github/workflows/generate_and_push_deriv_api_types.yml

@@ -105,11 +105,12 @@ jobs:
             git push --set-upstream origin "$package_name" -f
 
             # Get the diff and use this as the PRs body.
-            pr_body=$(curl "https://diff.intrinsic.com/$package_name/$safe_old_version/$new_version.diff")
+            diff_url="https://diff.intrinsic.com/$package_name/$safe_old_version/$new_version.diff"
+            pr_body=$(curl $diff_url)
 
             # 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"
+            gh pr create --title "Bump $package_name from $safe_old_version to $new_version" --body "Diff url: $diff_url\n \`\`\`diff ${pr_body:0:5000} \`\`\`" --base "master" --head "binary-com:$package_name"
           fi

.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.

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$'],

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",

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'),
+        },
+    },
 };

packages/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,
         });

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 {',

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';

packages/cashier/src/components/cashier-container/virtual/virtual.tsx

@@ -6,7 +6,7 @@ import { Text } from '@deriv/components';
 import { isMobile } from '@deriv/shared';
 import { Localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
-import { TRootStore } from 'Types';
+import { RootStore } from 'Types';
 import './virtual.scss';
 
 type TVirtualProps = RouteComponentProps & {
@@ -51,7 +51,7 @@ const Virtual = ({ is_dark_mode_on, toggleAccountsDialog }: TVirtualProps) => {
     );
 };
 
-export default connect(({ ui }: TRootStore) => ({
+export default connect(({ ui }: RootStore) => ({
     is_dark_mode_on: ui.is_dark_mode_on,
     toggleAccountsDialog: ui.toggleAccountsDialog,
 }))(withRouter(Virtual));

packages/cashier/src/components/cashier-locked/cashier-locked.tsx

@@ -4,7 +4,7 @@ import { Icon, Text } from '@deriv/components';
 import { localize, Localize } from '@deriv/translations';
 import { formatDate } from '@deriv/shared';
 import { connect } from 'Stores/connect';
-import { TRootStore } from 'Types';
+import { RootStore } from 'Types';
 
 type TAccount = NonNullable<Authorize['account_list']>[0];
 
@@ -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.'
     );
 
@@ -292,7 +292,7 @@ const CashierLocked = ({
     );
 };
 
-export default connect(({ client, modules }: TRootStore) => ({
+export default connect(({ client, modules }: RootStore) => ({
     account_status: client.account_status,
     accounts: client.accounts,
     current_currency_type: client.current_currency_type,

packages/cashier/src/components/crypto-fiat-converter/crypto-fiat-converter.tsx

@@ -4,7 +4,7 @@ import { DesktopWrapper, Input, Icon, MobileWrapper, Text, useInterval } from '@
 import { getCurrencyDisplayCode } from '@deriv/shared';
 import { localize, Localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
-import { TRootStore, TReactChangeEvent, TReactChildren } from 'Types';
+import { RootStore, TReactChangeEvent, TReactChildren } from 'Types';
 import './crypto-fiat-converter.scss';
 
 type TTimerProps = {
@@ -170,7 +170,7 @@ const CryptoFiatConverter = ({
     );
 };
 
-export default connect(({ modules }: TRootStore) => ({
+export default connect(({ modules }: RootStore) => ({
     converter_from_amount: modules.cashier.crypto_fiat_converter.converter_from_amount,
     converter_from_error: modules.cashier.crypto_fiat_converter.converter_from_error,
     converter_to_error: modules.cashier.crypto_fiat_converter.converter_to_error,

packages/cashier/src/components/crypto-transactions-history/crypto-transactions-cancel-modal.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Button, Modal } from '@deriv/components';
 import { localize, Localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
-import { TRootStore } from 'Types';
+import { RootStore } from 'Types';
 
 type TCryptoTransactionsCancelModalProps = {
     cancelCryptoTransaction: (selected_crypto_transaction_id: string) => void;
@@ -45,7 +45,7 @@ const CryptoTransactionsCancelModal = ({
     );
 };
 
-export default connect(({ modules }: TRootStore) => ({
+export default connect(({ modules }: RootStore) => ({
     cancelCryptoTransaction: modules.cashier.transaction_history.cancelCryptoTransaction,
     hideCryptoTransactionsCancelModal: modules.cashier.transaction_history.hideCryptoTransactionsCancelModal,
     is_cancel_modal_visible: modules.cashier.transaction_history.is_crypto_transactions_cancel_modal_visible,

packages/cashier/src/components/crypto-transactions-history/crypto-transactions-history.tsx

@@ -3,7 +3,7 @@ import { DataList, Icon, Loading, MobileWrapper, Table, Text } from '@deriv/comp
 import { isDesktop, isMobile, routes } from '@deriv/shared';
 import { localize, Localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
-import { TRootStore, TCryptoTransactionDetails } from 'Types';
+import { RootStore, TCryptoTransactionDetails } from 'Types';
 import CryptoTransactionsCancelModal from './crypto-transactions-cancel-modal';
 import CryptoTransactionsStatusModal from './crypto-transactions-status-modal';
 import CryptoTransactionsRenderer from './crypto-transactions-renderer';
@@ -102,7 +102,7 @@ const CryptoTransactionsHistory = ({
     );
 };
 
-export default connect(({ client, modules }: TRootStore) => ({
+export default connect(({ client, modules }: RootStore) => ({
     crypto_transactions: modules.cashier.transaction_history.crypto_transactions,
     currency: client.currency,
     is_loading: modules.cashier.transaction_history.is_loading,

packages/cashier/src/components/crypto-transactions-history/crypto-transactions-renderer.tsx

@@ -5,7 +5,7 @@ import { epochToMoment, formatMoney, isMobile } from '@deriv/shared';
 import { localize, Localize } from '@deriv/translations';
 import { getStatus } from 'Constants/transaction-status';
 import { connect } from 'Stores/connect';
-import { TRootStore, TCryptoTransactionDetails } from 'Types';
+import { RootStore, TCryptoTransactionDetails } from 'Types';
 
 type TCryptoTransactionsRendererProps = {
     row: TCryptoTransactionDetails;
@@ -304,7 +304,7 @@ const CryptoTransactionsRenderer = ({
     );
 };
 
-export default connect(({ client, modules }: TRootStore) => ({
+export default connect(({ client, modules }: RootStore) => ({
     currency: client.currency,
     cancelCryptoTransaction: modules.cashier.transaction_history.cancelCryptoTransaction,
     showCryptoTransactionsCancelModal: modules.cashier.transaction_history.showCryptoTransactionsCancelModal,

packages/cashier/src/components/crypto-transactions-history/crypto-transactions-status-modal.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Button, Modal } from '@deriv/components';
 import { localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
-import { TReactMouseEvent, TRootStore } from 'Types';
+import { TReactMouseEvent, RootStore } from 'Types';
 
 type TCryptoTransactionsStatusModalProps = {
     hideCryptoTransactionsStatusModal: (e: TReactMouseEvent) => void;
@@ -34,7 +34,7 @@ const CryptoTransactionsStatusModal = ({
     );
 };
 
-export default connect(({ modules }: TRootStore) => ({
+export default connect(({ modules }: RootStore) => ({
     hideCryptoTransactionsStatusModal: modules.cashier.transaction_history.hideCryptoTransactionsStatusModal,
     is_status_modal_visible: modules.cashier.transaction_history.is_crypto_transactions_status_modal_visible,
     selected_crypto_status: modules.cashier.transaction_history.selected_crypto_status,