Skip to content

Akmal / feat: language fixes #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Oct 29, 2025
Merged

Akmal / feat: language fixes #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1697170
refactor: enhance PositionsDrawer for translation handling and testin…
akmal-deriv Oct 27, 2025
f738c82
Merge branch 'master' into b-language-issues-3
akmal-deriv Oct 27, 2025
4804e20
Reapply "Akmal / refactor: restore language switcher functionality in…
akmal-deriv Oct 27, 2025
8adf8fc
Reapply "fix: adjust icon positioning in guide component styles (#391…
akmal-deriv Oct 27, 2025
b550722
Reapply "Akmal / refactor: replace localization with hardcoded string…
akmal-deriv Oct 27, 2025
be3c379
fix: restore localized error messages for various error subcodes
akmal-deriv Oct 28, 2025
e22166b
fix: update supported languages list in documentation
akmal-deriv Oct 28, 2025
4a067aa
refactor: update code_args type to use Array syntax and remove unused…
akmal-deriv Oct 28, 2025
b429bfd
refactor: remove unused key from details in ErrorObject interface
akmal-deriv Oct 28, 2025
277697e
refactor: add index signature to details in ErrorObject interface
akmal-deriv Oct 28, 2025
ce228a6
fix: remove redundant condition check for accumulator in processNewVa…
akmal-deriv Oct 28, 2025
1885273
fix: update message handling in PurchaseFieldset and getProposalInfo …
akmal-deriv Oct 28, 2025
55e1d38
Merge branch 'master' into b-language-issues-4
akmal-deriv Oct 28, 2025
4daa360
test: remove redundant test for rendering ContractInfo component with…
akmal-deriv Oct 29, 2025
678bf6c
Merge branch 'b-language-issues-4' of https://github.com/deriv-com/de…
akmal-deriv Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/trader/src/Modules/Trading/Components/Elements/purchase-fieldset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const PurchaseFieldset = ({
alignment='left'
is_bubble_hover_enabled
margin={8}
message={info.message}
message={info.has_error ? info.message : undefined}
relative_render
>
{purchase_button}
Expand Down
5 changes: 0 additions & 5 deletions ...ages/trader/src/Modules/Trading/Components/Form/Purchase/__tests__/contract-info.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ jest.mock('@deriv-com/ui', () => ({
}));

describe('<ContractInfo />', () => {
it('should render component with children', () => {
render(<ContractInfo {...default_mock_props} />);

expect(screen.getByText(test_message)).toBeInTheDocument();
});
it('should render specific components if is_multiplier === true', () => {
(useDevice as jest.Mock).mockReturnValueOnce({ isMobile: true });
render(<ContractInfo {...default_mock_props} is_multiplier />);
Expand Down
4 changes: 3 additions & 1 deletion packages/trader/src/Modules/Trading/Components/Form/Purchase/contract-info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ const ContractInfo = ({
)
)}
</div>
{!is_multiplier && !is_accumulator && !isMobile && (
{/* TODO: revise this longcode after decision is made */}
{/* {!is_multiplier && !is_accumulator && !isMobile && ( */}
{is_vanilla && (
<Popover
alignment='left'
icon='info'
Expand Down
4 changes: 3 additions & 1 deletion packages/trader/src/Stores/Modules/Trading/Helpers/proposal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ export const getProposalInfo = (
error_code: response?.error?.code,
error_field: response?.error?.details?.field,
limit_order: proposal.limit_order,
message: proposal.longcode || mapErrorMessage(response?.error || {}),
// TODO: decide on longcode for accumulator and multiplier
// message: proposal.longcode || mapErrorMessage(response?.error || {}),
message: mapErrorMessage(response?.error || {}),
obj_contract_basis,
payout: proposal.payout,
profit: profit.toFixed(getDecimalPlaces(store.currency)),
Expand Down
2 changes: 1 addition & 1 deletion packages/trader/src/Stores/Modules/Trading/trade-store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1947,7 +1947,7 @@ export default class TradeStore extends BaseStore {
this.resetErrorServices();
await this.setContractTypes();
runInAction(async () => {
if (!this.is_dtrader_v2 && !this.is_accumulator) {
if (!this.is_dtrader_v2) {
await this.processNewValuesAsync(
{ currency: this.root_store.client.currency || this.root_store.client.default_currency },
true,
Expand Down
Loading