resolve conflicts

.eslintrc.js

@@ -80,7 +80,6 @@ module.exports = {
         'import/prefer-default-export': 0,
         'import/extensions': [0, { jsx: 'always', json: 'always' }],
         'no-sequences': ['warn'],
-        'react/no-unknown-property': 1,
         'import/no-unresolved': [2, { ignore: ['@deriv/components', '@deriv/shared'] }],
 
         // react rules

.github/workflows/generate_app_id.yml

@@ -45,7 +45,7 @@ jobs:
 
                       - **PR**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
                       - **URLs**:
-                          - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=frontend.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
+                          - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
                           - **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
                       - **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
 
@@ -55,14 +55,14 @@ jobs:
                         ```
                         - **PR**: [${{ steps.generate_app_id.outputs.pr_url }}](${{ steps.generate_app_id.outputs.pr_url }})
                         - **URLs**:
-                            - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=frontend.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
+                            - **w/ App ID + Server**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}
                             - **Original**: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
                         - **App ID**: `${{ steps.generate_app_id.outputs.app_id }}`
                         ```
                       </details>
 
             - name: Store generated URL in artifact
-              run: echo "HOME_URL=${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=frontend.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}" >> ${{ github.workspace }}/url.txt
+              run: echo "HOME_URL=${{ steps.vercel_preview_url.outputs.vercel_preview_url }}?qa_server=red.binaryws.com&app_id=${{ steps.generate_app_id.outputs.app_id }}" >> ${{ github.workspace }}/url.txt
             - name: Upload artifact
               uses: actions/upload-artifact@master
               with:

package.json

@@ -83,7 +83,7 @@
         "build:storybook": "cd packages/components && build-storybook --output-dir .out",
         "build:gh-pages": "f () { nx run-many --target=build projects=@deriv/components,@deriv/p2p && nx run-many --target=build --projects=@deriv/cashier,@deriv/account,@deriv/cfd,@deriv/reports && npm run build:local $1 ;}; f",
         "clean": "echo \"Remove $(git rev-parse --show-toplevel)/node_modules\" && lerna clean && rm -rf \"$(git rev-parse --show-toplevel)/node_modules\"",
-        "deploy": "f () { npm run build:travis && npm run build:local && lerna exec --scope @deriv/core -- npm run deploy $@ ;}; f",
+        "deploy": "f () { export NODE_ENV=staging && npm run build:all && lerna exec --scope @deriv/core -- npm run deploy $@ && export NODE_ENV= ;}; f",
         "deploy:clean": "f () { npm run build:travis && npm run build:local && lerna exec --scope @deriv/core -- npm run deploy:clean $@ ;}; f",
         "deploy:folder": "f () { export NODE_ENV=staging && npm run build:gh-pages $1 && lerna exec --scope @deriv/core -- npm run deploy:folder $@ && export NODE_ENV= ;}; f",
         "install:qa": "npm --prefix ./e2e_tests ci && echo \"IMPORTANT: copy .env.example to .env and update the values for development.\"",

packages/account/build/webpack.config.js

@@ -28,6 +28,7 @@ module.exports = function (env) {
             'form-body': 'Components/form-body',
             'form-footer': 'Components/form-footer',
             'form-sub-header': 'Components/form-sub-header',
+            'get-status-badge-config': 'Configs/get-status-badge-config',
             'icon-message-content': 'Components/icon-message-content',
             'leave-confirm': 'Components/leave-confirm',
             'load-error-message': 'Components/load-error-message',

packages/account/package.json

@@ -28,7 +28,7 @@
     },
     "dependencies": {
         "@binary-com/binary-document-uploader": "^2.4.7",
-        "@deriv/api-types": "^1.0.54",
+        "@deriv/api-types": "^1.0.94",
         "@deriv/components": "^1.0.0",
         "@deriv/shared": "^1.0.0",
         "@deriv/translations": "^1.0.0",

packages/account/src/Components/Routes/binary-routes.tsx

@@ -7,7 +7,6 @@ import { TBinaryRoutes, TPlatformContext, TRoute } from 'Types';
 import RouteWithSubRoutes from './route-with-sub-routes';
 
 const BinaryRoutes = (props: TBinaryRoutes) => {
-    const { is_pre_appstore } = props;
     const { is_appstore } = React.useContext<TPlatformContext>(PlatformContext);
 
     return (
@@ -19,7 +18,7 @@ const BinaryRoutes = (props: TBinaryRoutes) => {
             }
         >
             <Switch>
-                {getRoutesConfig({ is_appstore, is_pre_appstore }).map((route: TRoute, idx: number) => (
+                {getRoutesConfig({ is_appstore }).map((route: TRoute, idx: number) => (
                     <RouteWithSubRoutes key={idx} {...route} {...props} />
                 ))}
             </Switch>

packages/account/src/Components/account-limits/__tests__/account-limits.spec.js

@@ -179,13 +179,13 @@ describe('<AccountLimits/>', () => {
         expect(screen.queryByText('/account limits/i')).not.toBeInTheDocument();
     });
 
-    it('should render Trading limits - Item table and its contents properly', () => {
+    it('should render Trading limits table and its trading limits contents properly', () => {
         render(<AccountLimits {...props} />);
         expect(screen.queryByTestId('account_limits_data')).toBeInTheDocument();
 
         expect(
             screen.getByRole('columnheader', {
-                name: /trading limits \- item/i,
+                name: /trading limits/i,
             })
         ).toBeInTheDocument();
         expect(
@@ -221,12 +221,12 @@ describe('<AccountLimits/>', () => {
         expect(formatMoney).toHaveBeenCalledWith(props.currency, account_balance, true);
     });
 
-    it('should render Trading limits - Item table and its contents properly', () => {
+    it('should render Trading limits table and its maximum daily turnover contents properly', () => {
         render(<AccountLimits {...props} />);
         expect(screen.queryByTestId('trading_daily_turnover_table')).toBeInTheDocument();
         expect(
             screen.getByRole('columnheader', {
-                name: /trading limits \- maximum daily turnover/i,
+                name: /maximum daily turnover/i,
             })
         ).toBeInTheDocument();
         expect(

packages/account/src/Components/account-limits/account-limits-table-header.tsx

@@ -25,7 +25,7 @@ const AccountLimitsTableHeader = ({
                     align={align}
                     as='p'
                     color='prominent'
-                    size='xxs'
+                    size='xs'
                     line_height='m'
                     weight='bold'
                     data-testid='account_limit_table_header_text'

packages/account/src/Components/account-limits/account-limits.jsx

@@ -128,7 +128,7 @@ const AccountLimits = ({
                                 <thead>
                                     <tr>
                                         <AccountLimitsTableHeader>
-                                            <Localize i18n_default_text='Trading limits - Item' />
+                                            <Localize i18n_default_text='Trading limits' />
                                         </AccountLimitsTableHeader>
                                         <AccountLimitsTableHeader align='right'>
                                             <Localize i18n_default_text='Limit' />
@@ -207,7 +207,7 @@ const AccountLimits = ({
                                                 />
                                             )}
                                         >
-                                            <Localize i18n_default_text='Trading limits - Maximum daily turnover' />
+                                            <Localize i18n_default_text='Maximum daily turnover' />
                                         </AccountLimitsTableHeader>
                                         <AccountLimitsTableHeader align='right'>
                                             <Localize i18n_default_text='Limit' />

packages/account/src/Components/address-details/__tests__/address-details.spec.js

@@ -55,6 +55,7 @@ describe('<AddressDetails/>', () => {
             address_state: 'Default test state',
         },
         validate: jest.fn(),
+        disabled_items: [],
     };
 
     const svgCommonRenderCheck = () => {
@@ -262,4 +263,19 @@ describe('<AddressDetails/>', () => {
             expect(address_state_input.value).toBe('State 1');
         });
     });
+
+    it('should disable the field if it is immuatble from BE', async () => {
+        mock_props.disabled_items = ['address_line_1', 'address_line_2'];
+        mock_props.value.address_state = '';
+
+        render(<AddressDetails {...mock_props} />);
+
+        expect(screen.getByPlaceholderText(address_line_1)).toBeDisabled();
+        expect(screen.getByPlaceholderText(address_line_2)).toBeDisabled();
+        await waitFor(() => {
+            expect(screen.getByRole('textbox', { name: 'State/Province' })).toBeEnabled();
+        });
+        expect(screen.getByPlaceholderText(address_town)).toBeEnabled();
+        expect(screen.getByPlaceholderText(address_postcode)).toBeEnabled();
+    });
 });

packages/account/src/Components/address-details/address-details.jsx

@@ -51,6 +51,7 @@ const AddressDetails = ({
     is_gb_residence,
     onSubmitEnabledChange,
     selected_step_ref,
+    disabled_items,
     has_real_account,
     ...props
 }) => {
@@ -159,7 +160,10 @@ const AddressDetails = ({
                                             }
                                             maxLength={255}
                                             placeholder={localize('First line of address')}
-                                            disabled={props.value?.address_line_1 && has_real_account}
+                                            disabled={
+                                                disabled_items.includes('address_line_1') ||
+                                                (props.value?.address_line_1 && has_real_account)
+                                            }
                                         />
                                         <InputField
                                             name='address_line_2'
@@ -171,7 +175,10 @@ const AddressDetails = ({
                                             }
                                             maxLength={255}
                                             placeholder={localize('Second line of address')}
-                                            disabled={props.value?.address_line_2 && has_real_account}
+                                            disabled={
+                                                disabled_items.includes('address_line_2') ||
+                                                (props.value?.address_line_2 && has_real_account)
+                                            }
                                         />
                                         <InputField
                                             name='address_city'
@@ -182,7 +189,10 @@ const AddressDetails = ({
                                                     : localize('Town/City')
                                             }
                                             placeholder={localize('Town/City')}
-                                            disabled={props.value?.address_city && has_real_account}
+                                            disabled={
+                                                disabled_items.includes('address_city') ||
+                                                (props.value?.address_city && has_real_account)
+                                            }
                                         />
                                         {!has_fetched_states_list && (
                                             <div className='details-form__loader'>
@@ -214,7 +224,8 @@ const AddressDetails = ({
                                                                 }}
                                                                 list_portal_id={is_appstore ? '' : 'modal_root'}
                                                                 disabled={
-                                                                    props.value?.address_state && has_real_account
+                                                                    disabled_items.includes('address_state') ||
+                                                                    (props.value?.address_state && has_real_account)
                                                                 }
                                                             />
                                                         </DesktopWrapper>
@@ -234,7 +245,8 @@ const AddressDetails = ({
                                                                     setAddressStateToDisplay('');
                                                                 }}
                                                                 disabled={
-                                                                    props.value?.address_state && has_real_account
+                                                                    disabled_items.includes('address_state') ||
+                                                                    (props.value?.address_state && has_real_account)
                                                                 }
                                                             />
                                                         </MobileWrapper>
@@ -247,7 +259,10 @@ const AddressDetails = ({
                                                 name='address_state'
                                                 label={localize('State/Province')}
                                                 placeholder={localize('State/Province')}
-                                                disabled={props.value?.address_state && has_real_account}
+                                                disabled={
+                                                    disabled_items.includes('address_state') ||
+                                                    (props.value?.address_state && has_real_account)
+                                                }
                                             />
                                         )}
                                         <InputField
@@ -261,7 +276,10 @@ const AddressDetails = ({
                                                 setFieldTouched('address_postcode', true);
                                                 handleChange(e);
                                             }}
-                                            disabled={props.value?.address_postcode && has_real_account}
+                                            disabled={
+                                                disabled_items.includes('address_postcode') ||
+                                                (props.value?.address_postcode && has_real_account)
+                                            }
                                         />
                                     </div>
                                 </ThemedScrollbars>