Skip to content

Commit 8128bc3

Browse files
committed
fix: incorporated review comments
1 parent 9cb6dc4 commit 8128bc3

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

packages/account/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@deriv-com/quill-ui": "1.16.18",
3939
"@deriv/components": "^1.0.0",
4040
"@deriv/hooks": "^1.0.0",
41-
"@deriv/quill-icons": "1.23.3",
41+
"@deriv/quill-icons": "2.1.0",
4242
"@deriv/shared": "^1.0.0",
4343
"@deriv/stores": "^1.0.0",
4444
"@deriv/translations": "^1.0.0",

packages/account/src/Containers/employment-tax-details-container/employment-tax-details-container.tsx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
} from '../../Components/forms/form-fields';
88
import { isFieldImmutable } from '../../Helpers/utils';
99
import { Checkbox, useOnClickOutside } from '@deriv/components';
10-
import { useTranslations } from '@deriv-com/translations';
10+
import { Localize } from '@deriv-com/translations';
1111
import { getLegalEntityName } from '@deriv/shared';
1212
import { useDevice } from '@deriv-com/ui';
1313
import { useResidenceList } from '@deriv/hooks';
@@ -35,7 +35,6 @@ const EmploymentTaxDetailsContainer = observer(
3535
const { values, setFieldValue, touched, errors, setValues } = useFormikContext<FormikValues>();
3636
const { isDesktop } = useDevice();
3737
const { data: residence_list } = useResidenceList();
38-
const { localize } = useTranslations();
3938
const { client } = useStore();
4039

4140
const [is_tax_residence_popover_open, setIsTaxResidencePopoverOpen] = useState(false);
@@ -151,7 +150,7 @@ const EmploymentTaxDetailsContainer = observer(
151150
);
152151
}}
153152
value={values.tin_skipped}
154-
label={localize('I do not have tax information')}
153+
label={<Localize i18n_default_text='I do not have tax information' />}
155154
withTabIndex={0}
156155
data-testid='tin_skipped'
157156
label_font_size={!isDesktop ? 'xxs' : 'xs'}
@@ -186,14 +185,16 @@ const EmploymentTaxDetailsContainer = observer(
186185
}
187186
value={values.tax_identification_confirm}
188187
label={
189-
should_display_long_message
190-
? localize(
191-
'I hereby confirm that the tax information provided is true and complete. I will also inform {{legal_entity_name}} about any changes to this information.',
192-
{
193-
legal_entity_name: getLegalEntityName('maltainvest'),
194-
}
195-
)
196-
: localize('I confirm that my tax information is accurate and complete.')
188+
should_display_long_message ? (
189+
<Localize
190+
i18n_default_text='I hereby confirm that the tax information provided is true and complete. I will also inform {{legal_entity_name}} about any changes to this information.'
191+
values={{
192+
legal_entity_name: getLegalEntityName('maltainvest'),
193+
}}
194+
/>
195+
) : (
196+
<Localize i18n_default_text='I confirm that my tax information is accurate and complete.' />
197+
)
197198
}
198199
withTabIndex={0}
199200
data-testid='tax_identification_confirm'

packages/account/src/Helpers/utils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export const isDocumentTypeValid = (document_type: FormikValues) => {
157157
export const isAdditionalDocumentValid = (document_type: FormikValues, additional_document_value?: string) => {
158158
const error_message = documentAdditionalError(additional_document_value, document_type?.additional);
159159
if (error_message) {
160-
return localize(error_message) + getExampleFormat(document_type?.additional?.example_format);
160+
return error_message + getExampleFormat(document_type?.additional?.example_format);
161161
}
162162
return undefined;
163163
};

packages/account/src/Sections/Profile/PersonalDetails/__tests__/personal-details-form.spec.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ describe('<PersonalDetailsForm />', () => {
4444
place_of_birth: 'Thailand',
4545
citizen: 'Thailand',
4646
email_consent: 1,
47-
last_name: 'Doe',
4847
},
4948
},
5049
});

packages/bot-web-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@deriv/shared": "^1.0.0",
8282
"@deriv/stores": "^1.0.0",
8383
"@deriv/translations": "^1.0.0",
84-
"@deriv/quill-icons": "1.23.3",
84+
"@deriv/quill-icons": "2.1.0",
8585
"blockly": "^10.4.3",
8686
"@testing-library/user-event": "^13.5.0",
8787
"@types/react-router-dom": "^5.1.6",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"@deriv/hooks": "^1.0.0",
115115
"@deriv/p2p": "^0.7.3",
116116
"@deriv/quill-design": "^1.3.2",
117-
"@deriv/quill-icons": "1.23.3",
117+
"@deriv/quill-icons": "2.1.0",
118118
"@deriv/reports": "^1.0.0",
119119
"@deriv/shared": "^1.0.0",
120120
"@deriv/stores": "^1.0.0",

packages/core/src/sass/app/_common/components/account-common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,6 +1037,6 @@
10371037
}
10381038

10391039
.focus-field {
1040-
border-radius: 4px;
1040+
border-radius: $BORDER_RADIUS;
10411041
border: 1px solid var(--text-prominent);
10421042
}

packages/shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
},
4848
"dependencies": {
4949
"@deriv-com/analytics": "1.14.0",
50-
"@deriv/quill-icons": "1.23.3",
50+
"@deriv/quill-icons": "2.1.0",
5151
"@deriv/api-types": "1.0.172",
5252
"@deriv/translations": "^1.0.0",
5353
"@deriv-com/utils": "^0.0.34",

packages/trader/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"@deriv/stores": "^1.0.0",
103103
"@deriv/translations": "^1.0.0",
104104
"@deriv/utils": "^1.0.0",
105-
"@deriv/quill-icons": "1.23.3",
105+
"@deriv/quill-icons": "2.1.0",
106106
"@lottiefiles/dotlottie-react": "0.7.2",
107107
"@types/react-loadable": "^5.5.6",
108108
"classnames": "^2.2.6",

packages/wallets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@deriv-com/ui": "1.35.0",
2020
"@deriv-com/utils": "^0.0.34",
2121
"@deriv/api-v2": "^1.0.0",
22-
"@deriv/quill-icons": "1.23.3",
22+
"@deriv/quill-icons": "2.1.0",
2323
"@deriv/utils": "^1.0.0",
2424
"@tanstack/react-table": "^8.10.3",
2525
"@zxcvbn-ts/core": "^3.0.4",

0 commit comments

Comments
 (0)