Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Commit

Permalink
feat: master merge and fix sonarcloud error
Browse files Browse the repository at this point in the history
  • Loading branch information
konstantinosG-deriv committed Feb 27, 2024
2 parents 5f7f068 + 8cbf22d commit d0be745
Show file tree
Hide file tree
Showing 23 changed files with 4,888 additions and 4,831 deletions.
4 changes: 2 additions & 2 deletions crowdin/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
"256942335": "Multiple income opportunities and generous commissions",
"256966056": "To manage your funds, please click the button below.",
"257449963": "Follow these steps to see your earnings:",
"258090508": "The above information is updated monthly and, therefore, may not reflect current trading conditions. Certain offerings and specifications may vary depending on your country of residence, regulated jurisdiction, and individual trading circumstances.",
"258310842": "Workspace",
"259593484": "real account",
"260003723": "Example 2",
Expand Down Expand Up @@ -1113,6 +1112,7 @@
"1054141122": "Careers",
"1055232026": "You can't reactivate your Deriv MT5 account. Instead, you can create a new one on your <0>Deriv MT5 dashboard</0>.",
"1055401343": "Trade forex, stocks & indices, cryptocurrencies, commodities, and derived.",
"1055984750": "Information is updated monthly and may not represent today's trading conditions. Offerings can differ by location, jurisdiction, and trade scenario.",
"1056824072": "How can I become a Deriv P2P user?",
"1057239639": "Set optional parameters for your trade",
"1061987610": "Join great trading minds at Deriv in Singapore and build your career in developing online trading solutions, particularly for CFD trading.",
Expand Down Expand Up @@ -3325,8 +3325,8 @@
"-519772806": "Smart and friendly support, 7 days a week",
"-2015932855": "smart and friendly support",
"-1690667791": "Why trade ETFs on Deriv",
"-844197189": "Controlled Risk",
"-232157320": "Fast-paced action with durations up to 230 ticks.",
"-844197189": "Controlled Risk",
"-467264818": "Hone your strategies risk-free with a demo account.",
"-360691661": "Looking for a fast-paced, strategic and potentially explosive way to trade?",
"-1627820643": "Move fast,<br/>when the market doesn’t",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react'
import { Hero } from '@deriv-com/blocks'
// eslint-disable-next-line import/no-unresolved
import { LabelPairedGrid2CaptionBoldIcon } from '@deriv/quill-icons/LabelPaired'
import { v4 as uuidv4 } from 'uuid'
import { Text, Heading, Button } from '@deriv/quill-design'
import { Localize } from 'components/localization'
import { handleRedirectToTradersHub } from 'components/custom/utils'
Expand Down Expand Up @@ -33,7 +34,7 @@ const WhatAreDigitalOptions = ({
const isRealDevice = isBrowser()
const renderSignupButton = isRealDevice && !is_logged_in
const renderTradershubButton = isRealDevice && is_logged_in
const uniq = `navbuttons_uniq_class_${Math.random().toString(36).substr(2, 9)}`
const uniq = `navbuttons_uniq_class_${uuidv4()}`

return (
<div className="max-w-[816px] mx-auto px-800">
Expand Down
2 changes: 0 additions & 2 deletions src/features/components/templates/options-layout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import React, { ReactNode } from 'react'
import MainRowNavigation from '../navigation/main-nav'
import Layout from 'features/components/templates/layout'
import MainFooter from 'features/components/templates/footer'
import StartTrading from 'features/components/templates/start-trading'
import WhyTradeOptions from 'features/components/templates/why-trade-options'
import { TString } from 'types/generics'
import OptionsTopTab from 'features/components/organisms/options-top-tab'
import WhatAreDigitalOptions from 'features/components/organisms/what-are-digital-options'
Expand Down
13 changes: 7 additions & 6 deletions src/features/pages/options/accumulator/data.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ import { OptionsFAQDataItem } from 'features/components/templates/options-conten
export const accumulatorCards: CardContent[] = [
{
id: 1,
header: <Localize translate_text="_t_Controlled Risk_t_" />,
header: <Localize translate_text="_t_1-5% growth rate_t_" />,
description: (
<Localize translate_text="_t_Potential loss is limited to the initial amount you decide to trade._t_" />
<Localize translate_text="_t_Choose your growth rate to tailor risk/reward. _t_" />
),
icon: <IllustrativePayoutIcon width="48" height="48" />,
icon: <IllustrativeMinimalCapitalIcon width="48" height="48" />,
color: 'gray',
align: 'start',
size: 'md',
},

{
id: 2,
header: <Localize translate_text="_t_45-230 tick duration_t_" />,
Expand All @@ -37,11 +38,11 @@ export const accumulatorCards: CardContent[] = [
},
{
id: 3,
header: <Localize translate_text="_t_1-5% growth rate_t_" />,
header: <Localize translate_text="_t_Controlled Risk_t_" />,
description: (
<Localize translate_text="_t_Choose your growth rate to tailor risk/reward. _t_" />
<Localize translate_text="_t_Potential loss is limited to the initial amount you decide to trade._t_" />
),
icon: <IllustrativeMinimalCapitalIcon width="48" height="48" />,
icon: <IllustrativePayoutIcon width="48" height="48" />,
color: 'gray',
align: 'start',
size: 'md',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export type TLiveMarketTableProps = {
const forex_note: TString =
'_t_<0>Note:</0> There is a daily break during weekdays between 21:00-21:05 (GMT)_t_'
const row_disclaimer: TString =
'_t_The above information is updated monthly and, therefore, may not reflect current trading conditions. Certain offerings and specifications may vary depending on your country of residence, regulated jurisdiction, and individual trading circumstances._t_'
"_t_Information is updated monthly and may not represent today's trading conditions. Offerings can differ by location, jurisdiction, and trade scenario._t_"
const eu_disclaimer: TString =
'_t_The above information is updated monthly and, therefore, may not reflect current trading conditions._t_'

Expand Down
Loading

0 comments on commit d0be745

Please sign in to comment.