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

Commit

Permalink
Eduard/DPROD-3367/Social icons override based on language (#7055)
Browse files Browse the repository at this point in the history
* Update beta.yml

* DPROD-3065/New Homepage for deriv.com (#6986)

* chore: added quick translations

* chore: update ts to tsx

* chore: test trigger

* chore: revert test

* chore: added strings from data

* chore: updated strings

* Michio/setup migration branch beta (#6039)

* chore: added quill-desgin and blocks to homepage

* chore: updated deriv-com libs

* chore: added more section and block usage

* chore: updated images format and imports

* Update tsconfig.json

* chore: added base navigation for row

* chore: added base home hero

---------

Co-authored-by: Mohsen Hajibeigloo <[email protected]>
Co-authored-by: Habib Deriv <[email protected]>

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Prince/update homepage theme (#6058)

* Fix gtm partytown integration (#6038)

* chore: fix gtm partytown integration

* chore: remove defer

Downloading the script asynchronously is enough

* chore: default theme to light

---------

Co-authored-by: Habib Deriv <[email protected]>

* chore: home v2 hero (#6059)

* chore: home v2 hero image

* chore: overflow hidden

* empty: 🚀 to redeploy and trigger build

* chore: added @parcel/watcher

---------

Co-authored-by: Michio <[email protected]>

* Fasih: updated stats component (#6060)

* chore: updated stats component

* chore: added chore value

---------

Co-authored-by: Fasih Ali <[email protected]>

* chore: removed tailwind merge package (#6062)

Co-authored-by: Fasih Ali <[email protected]>

* Jia/add footer cta block (#6061)

* feat: update footer cta

* chore: update footer cta

* chore: update latest

* chore: update footer cta

* Jia/footer cta fix (#6063)

* feat: added the start trading steps (#6069)

* nuzhy/update navigation and footer, illustrations (#6078)

* chore: update latest navigation

fixed the footer responsive issue

updated the illustrations

* chore: update navigation links in header navigation, footer

updated quill-design, quill-icons, deriv-com-libs

* Hasan/Translation 375 live pricing block (#6092)

* chore: added live market blocks

* chore: fixed description

* chore: updated package

* chore: implemented tabs for user friendly section (#6095)

Co-authored-by: meenu-deriv <[email protected]>

* chore: integrate language switcher (#6109)

* chore: platform section (#6108)

* chore: platform section

* chore: remove fragment

---------

Co-authored-by: Michio <[email protected]>

* Jia/fix button desktop only (#6093)

* feat: update footer cta

* chore: update latest

* fix: cta button only show on desktop size

* chore: uncomment

* chore: remove unwanted image

* chore: solve livemarket issue

* chore: clean code

* fix: hide button for mobile and tablet

* chore: fix package-lock

* fix: footer download images, paddings (#6114)

* chore: fixed tab blocks (#6116)

* chore: language switch based on selection (#6120)

* Jia/trade type options (#6119)

* feat: update footer cta

* chore: update latest

* fix: trade type option background colour and icon size

* chore: remove img

* Jia/fasih: / fast payment section DPROD-378 (#6088)

* feat: update footer cta

* chore: update latest

* feat: fast payment section

* chore: nothing

* chore: added data for infinte carousel

* fix: removed unused code

* fix: removed bg image

---------

Co-authored-by: jia-deriv <[email protected]>
Co-authored-by: Fasih Ali <[email protected]>

* Jia/remove darkmode toggle (#6122)

* feat: update footer cta

* chore: update latest

* chore: remove theme toggle

* chore: cleanup code

* nuzhy/added language direction change (#6123)

* chore: added language direction change

* fix: added comment to remove preview domain in future

* fix: added localize text for translation (#6127)

Co-authored-by: Michio <[email protected]>

* Prince/added trustpilot section (#6137)

* chore: truspilot rendering

* chore: update package versions

* chore: added translation for trustpilot texts

* chore: temp static data

* Nuzhy/footer fixes (#6142)

* chore: update deriv-com-libs

fix: deriv-go banner font issues

* fix: start trading card title font sizes

* Fasih/Update eu content (#6139)

* chore: added EU data also need to fix some issues

* fix: fixed package-lock file

* fix: fixed object position for cta section

---------

Co-authored-by: Fasih Ali <[email protected]>

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* chore: removed lmdb

* chore: updated cards data (#6168)

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: updated the navigation, footer texts for translation (#6178)

* Hasan/Translation 00 fix market and platforms (#6180)

* chore: updated live market bottom data

* chore: udpated packages and platform data

* chore: fixed designers suggestions for hero content (#6174)

* chore: fixed designers suggestions for hero content

* chore: fixed hero height for tablet and desktop

* chore: fixed hero height for tablet and desktop

* chore: fixed hero image height

* chore: fixed hero image height for mobile

* chore: updated header button text

* chore: updated years data

* chore: updated years data

* chore: updated gap between hero content and award image

* chore: updated gap between hero content and award image

* chore: updated award images alt text

* chore: inprogress of adding link (#6159)

* chore: inprogress of adding link

* chore: fixed link component issue

* chore: added keys for new tab redirection

* chore: updated key

* chore: updated nav data for UE

* chore: updated footer and header nav

* chore: added target blank condition

* chore: chore updated target blank in data

---------

Co-authored-by: Fasih Ali <[email protected]>

* fix: text for trustpilot (#6181)

* chore: added live pricing logic (#6183)

* chore: updated all localize component (#6187)

* chore: cta setup (#6188)

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Hasan/Translation 00 hero fix 3 (#6192)

* chore: added format and loading in all hero images

* chore: removed hero bg eu image

* chore: updated hero subject image eu

* chore: fixed company background (#6196)

* chore: fixed item position (#6194)

Co-authored-by: Fasih Ali <[email protected]>

* fix: navigation subtasks (#6198)

* fix: remove the testlink added for temporary (#6211)

* fix: description changes (#6210)

* Fasih/: added updated changes of blocks (#6225)

* chore: added updated pull

* chore: added speed

---------

Co-authored-by: Fasih Ali <[email protected]>

* Fasih/: added 3x images (#6219)

* fix: added 3x images

* chore: added lazy loading insted to eager

---------

Co-authored-by: Fasih Ali <[email protected]>

* Prince/DPROD-379/Fetch TrustPilot on build time (#6193)

* chore: initial poc

* chore: updated key structure

* chore: trustpilot on commit fetch

* chore: updated packages and generated data to json instead

* chore: fetch trustpilot data on build

* chore: reset data to test if fetching is working

* chore: removed fixed todos

* chore: fix comment

* chore: simplified on build fetching

* chore: add api keys on workflow

* chore: removed unnecessary ignored files

* chore: remove unnecessary change

* chore: remove unnecessary change

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* chore: default trustpilot values

* fix: issue on rendering trustpilot data (#6246)

* Hasan/Translation 2017 quill platform fix (#6247)

* chore: fix eu platfrom card contnet

* chore: updated quill-design pacakge

* Fasih/fix infinite carousel speed (#6242)

* chore: added updated pull

* chore: added speed

* chore: udpated data

* chore: updated time duration

---------

Co-authored-by: Fasih Ali <[email protected]>

* chore: follow gatsby convention

* Hasan/chore: fixed link component for eu (#6261)

* chore: fixed link component for eu

* chore: remove target from social links

* chore: added show eu modal condition

* chore: show modal condition for href

* chore: show modal condition for href

* chore: removed unused type

* chore: updated deriv-com pacakges

* chore: updated alert button onclick

* Hasan/chore: fixed live market issues (#6244)

* chore: sliced live market data

* chore: fixed slider issues

* chore: fixed edge slider issues

* chore: added click handler for live market card

* chore: updated live market buy sell click handler

* chore: updated live market buy sell click handler

* chore: updated live market buy sell click handler

* chore: updated live market bottom content

* chore: updated live market hook for stock and indices

* chore: updated deriv-com pacakges

* Hasan/Pr 00 quill remove floating cta (#6279)

* chore: removed floating cta

* empty: 🚀 to redeploy and trigger build

* chore: removed floating cta

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* chore: retrigger build

* Hasan/Pr 375 live market issues 2 (#6288)

* chore: fixed live market bottom link

* chore: fixed live market bottom link

* chore: updated market icons

* chore: updated tab trigger content

* chore: fixed card status

* chore: added commoditiees icon

* chore: removed parcel

* chore: updated parcel

* Hasan/chore: added media query based on height for hero award images (#6287)

* chore: added media query based on height for hero award images

* chore: added new parcel lib as optional

* chore: updated media query height

* auto-pull-translation

* Prince/New homepage master update (#6356)

* chore: merge master to new-homepage-translation

* chore: quill-icon stable version usage

* auto-pull-translation

* fix: package-lock file

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Nuzhy/_/quill icons issue (#6386)

* fix: quill-icons issue

* fix: revert trustpilot review score

* fix: update LabelPairedGridLgBoldIcon

* Nuzhy/QUILL-1290/Update Home page (#6392)

* fix: remove navigation, footer, providers which are integrated in layout

* fix: deleted footer, navigation files from home page

* Prince/Trustpilot debug (#6383)

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Aswathy/Steps homepage gap (#6382)

* Hasan/Pr 00 add prefix to atomic css (#6334)

* chore: added prefix to tryphography class

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to radius classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to spacing classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to color classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to flex classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to container classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to table classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to alert classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to tabs classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to accordion classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to icon classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to input classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to checkbox classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to visibility classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: added prefix to utility classes

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated utils functions

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated quill icons package

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated classname types

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in accordion component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in alert component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in card component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in container component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in flex component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in icon component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in input and checkbox component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in link component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in tab component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in table component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in typography component

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in molecules components

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in organisms components

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in templates components

Signed-off-by: hasan-deriv <[email protected]>

* chore: updated class names in pages components

Signed-off-by: hasan-deriv <[email protected]>

---------

Signed-off-by: hasan-deriv <[email protected]>

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Hasan/Pr 2169 quill layout (#6346)

* chore: updated eslint rule

* chore: updated gatsby browser

* chore: added anchor component

* chore: added broser alert component

* chore: added layout overlay components

* chore: added quill layout component

* chore: removed css from layout component

* chore: added quill layout to homepage

* chore: removed css from page component

* chore: added block and component css to global css

* chore: removed ibm and ubuntu fonts

* chore: updated tailwind config

* auto-pull-translation

* chore: removed block and component css from gatsby browser

* chore: removed block and component css from layout

* chore: updated quill layout

* chore: updated banner font size

* empty: 🚀 to redeploy and trigger build

* chore: updated blocks (#6289)

* chore: updated blocks

* chore: updated with libs

* fix: font size in eu changed

* fix: added the space issue

---------

Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: aswathy-deriv <[email protected]>

* chore: request translation (#6455)

* chore: request translation

* fix: space

* fix: unwanted words

* Hasan/DPROD-2094/cfd banner fix (#6457)

* auto-pull-translation

* chore: updated cfd banner css

* chore: updated font size breakpoint to xl

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Aswathy/Fast hassle issues (#6384)

* fix: updated the package

* fix: added the description for row

* fix: payment block issues

* Meenu/1334/Translation 1334 meenu 3 simple steps sub task (#6450)

* fix: 3 steps subtask fix

* empty: 🚀 to redeploy and trigger build

* empty: 🚀 to redeploy and trigger build

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Hasan/DPROD-2159/live market card tarnslation fix (#6473)

* auto-pull-translation

* chore: added live market localize content

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* {DPRO-378}/ Translation 378 fix fast hassle block subtask (#6494)

* fix: fix subtask

* fix: fix changes

* chore: updated icon package

* chore: pr build failure fix

* chore: pr build failure fix

* Meenu/{DPROD-2331}/Translation 2331 fixx cta button 3 steps (#6496)

* fix: fix subtask

* fix: removed wrong commit

* fix: fix changes

* fix: fixed icon

* fix: fixed conflicts

* fix: updated with upstream

* Pr 2169 quill layout fixes (#6462)

* auto-pull-translation

* chore: fixed ubuntu fonts

* chore: fixed floating button bg color

* chore: updated gatsby browser

* chore: updated gatsby browser and global css file

* chore: updated global css

* chore: updated overlay css

* chore: updated tailwind config

* chore: cleanup

* chore: updated global css and gatsby-browser

* auto-pull-translation

* chore: moved block css to gatsby browser from global css

* Meenu/{DPROD-2331}/Pr 2331 gap issue for 3 steps (#6515)

* fix: fixed padding issue

* fix: fixed gap issue

* Hasan/Pr 00 quill floating cta (#6406)

* chore: added floating cta

* chore: added logged in condition

* chore: updated floating cta root margin

* auto-pull-translation

* chore: fixed the EU issue

* chore: cleanup

* chore: updated z index of floating cta

* chore: moved unexpanded text to different component to get the correct ref

* chore: removed unwanted file

* chore: removed console

* chore: updated layout overlay z index

* chore: updated cta bottom height

* chore: updated floating cta hook

* auto-pull-translation

* chore: removed floating cta hook and moved all the implementation to provider

* chore: updated the breakpoint

* chore: updated floating cta component

* chore: updated different ref conditon for mobile and tablet

* chore: updated floating cta blur and bg

* chore: moved all cfd banner mobile text and desktop text in different component

* chore: added expanded state to ctabottom useeffect

* chore: synched floating button with cta

* chore: updated floating button mb

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* empty: 🚀 to redeploy and trigger build

* chore: added 2 more commands to update other external libs (#6467)

* chore: added 2 more commands to update other external libs

* translation: 📚 sync translations from crowdin feature branch

---------

Co-authored-by: DerivFE <[email protected]>

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* empty: 🚀 to redeploy and trigger build

* Pr 00 overlay fixes (#6585)

* auto-pull-translation

* chore: moved all the responsive css to css module

* auto-pull-translation

* Hasan/2170/eutestlink hero (#6472)

* chore: added region loading condiition

* chore: added region loading condition to text

* chore: added region loading condition to image

* chore: removed console

* chore: added is eu domain condition to hero content

* auto-pull-translation

* chore: updated is_eu condition

* chore: updated is_eu condition

* chore: hero eu testing

* auto-pull-translation

* chore: added browser logic to hero imagge

* chore: added browser logic to hero imagge

* auto-pull-translation

* chore: added browser logic to hero image

* chore: added browser logic to hero image

* chore: added browser logic to hero image

* chore: cleanup

* chore: cleanup

* chore: fetching total trustpilot reviews (#6657)

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* hasan/Pr 00 rtl issue fix (#6451)

* auto-pull-translation

* chore: updated cta block

* auto-pull-translation

* chore: fixed ubuntu fonts

* chore: fixed floating button bg color

* chore: updated gatsby browser

* chore: updated gatsby browser and global css file

* chore: updated global css

* chore: updated overlay css

* chore: updated tailwind config

* chore: cleanup

* chore: updated global css and gatsby-browser

* chore: added rtl classes for hero content and award images

* chore: removed rtl dir from hero section

* auto-pull-translation

* chore: moved block css to gatsby browser from global css

* chore: updated deriv packages

* chore: updated deriv packages

* auto-pull-translation

* chore: live market description link fix

* chore: updated deriv packages

* auto-pull-translation

* empty: 🚀 to redeploy and trigger build

* chore: updated deriv packages

* chore: updated fast payment animation

* chore: updated fast payment animation

* auto-pull-translation

* chore: removed unused classname

* auto-pull-translation

* auto-pull-translation

* chore: added rtl class to hero

* Hasan/Pr 375 live market fix (#6436)

* auto-pull-translation

* chore: updated live market icons

* chore: updated stock and indices array

* chore: updated indices type

* chore: added rest market icons

* chore: updated forex description for EU

* chore: updated deriv packages

* chore: added mid value to live market data

* auto-pull-translation

* chore: updated market icon

* chore: updated deriv packages

* auto-pull-translation

* chore: updated deriv packages

* chore: updated deriv packages

* chore: updated market icon

* auto-pull-translation

* chore: moved instrument truncate css to styles css

* auto-pull-translation

* chore: updated market icon

* chore: updated deriv packages

* chore: updated 20 years slider class

* chore: updated live market hook

* chore: updated live market hook

* Hasan/Pr 00 live market icon (#6706)

* auto-pull-translation

* chore: added derived indices eu icons

* fix: ⏪ add missing classname (#6717)

* Pr 00 swiper issue (#6712)

* auto-pull-translation

* chore: added mr to swiper slide

* Hasan/Pr 00 cta fix (#6742)

* auto-pull-translation

* chore: fixed floating cta issue

* chore: removed comment

* chore: removed console

* chore: updated condiition

* Mitra/DPROD-2166/Improve seo and accessibility (#6738)

* fix: 🔍 improve seo and accessibility

* Revert "Remove whatsapp icon" (#6739)

* empty: 🚀 to redeploy and trigger build

* fix: 🔍 improve seo

* fix: 🔍 update packages

---------

Co-authored-by: Habib Deriv <[email protected]>

* empty: 🚀 to redeploy and trigger build

* fix: alignment issue for the hero block

* fix: left crop issue fixed

* fix: hotfix

* empty: 🚀 to redeploy and trigger build

* fix: sync package-lock.json

* Mitra/DPROD-3022/Update content for new homepage (#6895)

* text: 📝 update row content

* fix: 📝 update eu content

* fix: 📝 fix content issue

* fix: 💄 add padding

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: 🔍 improve seo title and meta description (#6881)

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* chore: 📦 update the packages

* fix: 🐛 fix change of the icon name coming from quill icons

* Mitra/DPROD-3109/Arabic slider scroll issue (#6963)

* fix: 🐛 fix arabic scroll issue in slider

* fix: 🐛 fix change of the icon name coming from quill icons

* fix: 🐛 fix rtl issue

* Mitra/DPROD-3333/Seo alt for svg  (#6929)

* fix: 🔍 fix alt for svg

* fix: 📦 update packages

* empty: 🚀 to redeploy and trigger build

* fix: 🐛 fix name of the icons

* fix: 📝 update the string with lower case s (#6996)

* empty: 🚀 to redeploy and trigger build

* auto-pull-translation

* auto-pull-translation

* empty: 🚀 to redeploy and trigger build

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* Fasih/DPROD-3364/New Homepage optimization WITH font priority (#7005)

* feat: preload fonts and updated optimised banner

* feat: improved with image tag and added chunked

* feat: new links added for fonts

* feat: import google fonts and added lazy on images

* feat: preload fonts

---------

Co-authored-by: fasihali-deriv <[email protected]>

* Habib/DPROD-3364/add required key link tag (#7006)

* chore: add required key

* chore: remove unused variable

* fix: remove additional back slash

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* empty: 🚀 to redeploy and trigger build

* fix: remove additional back slash

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* empty: 🚀 to redeploy and trigger build

* Hasan/DPROD-3456/Fix RTL issue for Arabic language (#7010)

* auto-pull-translation

* chore: removed minifier plugin

* chore: added minifier plugin

* chore: fixed

* chore: fixed animation rtl

* fix: add prefix for classname (#7013)

* Fasih/DPROD-3471/Removed lazy loading attribute from fast payment section logos (#7018)

* fix: removed lazy loading for fast payment section

* fix: implement hook for payment section

* fix: implement is in viewport condition on data as well

* fix: revert hook implementation on data

---------

Co-authored-by: fasihali-deriv <[email protected]>

---------

Signed-off-by: hasan-deriv <[email protected]>
Co-authored-by: prince-deriv <[email protected]>
Co-authored-by: Michio <[email protected]>
Co-authored-by: Michio <[email protected]>
Co-authored-by: Mohsen Hajibeigloo <[email protected]>
Co-authored-by: DerivFE <[email protected]>
Co-authored-by: prince-deriv <[email protected]>
Co-authored-by: Hasan Mobarak <[email protected]>
Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: Fasih Ali <[email protected]>
Co-authored-by: jia-deriv <[email protected]>
Co-authored-by: Aswathy-Deriv <[email protected]>
Co-authored-by: Nuzhy-Deriv <[email protected]>
Co-authored-by: meenakshi-deriv <[email protected]>
Co-authored-by: meenu-deriv <[email protected]>
Co-authored-by: jia-deriv <[email protected]>
Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: aswathy-deriv <[email protected]>
Co-authored-by: mayuran-deriv <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>
Co-authored-by: meenakshi-deriv <[email protected]>

* Mitra/DPROD-3012/update the description for mt5 banner (#6890)

* feat: 💄 update the description for mt5 banner

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: 🐛 font size should be 24px

---------

Co-authored-by: DerivFE <[email protected]>

* fix: add css in global to fix ar slider direction for eu users (#7026)

Co-authored-by: fasihali-deriv <[email protected]>

* rewrite default quill-design-component-classname (#7022)

* fix: ctrader_sign_up page (#6844)

* Mitra/DPROD-3455/Fix licenses in regulatory page (#7002)

* fix: 🐛 revert licens changes in regulatory page

* empty: 🚀 to redeploy and trigger build

* fix: update pdf (#7021)

* fix: translation word (#6413)

* fix: translation word

* fix: revert

* fix: translation added

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* chore: trigger vercel

* chore: trigger vercel

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* chore: trigger vercel

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* chore: trigger vercel

---------

Co-authored-by: DerivFE <[email protected]>

* translations: 📚 sync translations with crowdin (#7043)

Co-authored-by: DerivFE <[email protected]>

* social icons override based on language

* fix

---------

Signed-off-by: hasan-deriv <[email protected]>
Co-authored-by: Habib Deriv <[email protected]>
Co-authored-by: prince-deriv <[email protected]>
Co-authored-by: Michio <[email protected]>
Co-authored-by: Michio <[email protected]>
Co-authored-by: Mohsen Hajibeigloo <[email protected]>
Co-authored-by: DerivFE <[email protected]>
Co-authored-by: prince-deriv <[email protected]>
Co-authored-by: Hasan Mobarak <[email protected]>
Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: Fasih Ali <[email protected]>
Co-authored-by: jia-deriv <[email protected]>
Co-authored-by: Aswathy-Deriv <[email protected]>
Co-authored-by: Nuzhy-Deriv <[email protected]>
Co-authored-by: meenakshi-deriv <[email protected]>
Co-authored-by: meenu-deriv <[email protected]>
Co-authored-by: jia-deriv <[email protected]>
Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: aswathy-deriv <[email protected]>
Co-authored-by: mayuran-deriv <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>
Co-authored-by: meenakshi-deriv <[email protected]>
Co-authored-by: konstantinosG-deriv <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
25 people authored Feb 13, 2024
1 parent d6168e5 commit 7ba6eb5
Show file tree
Hide file tree
Showing 27 changed files with 142 additions and 139 deletions.
3 changes: 2 additions & 1 deletion crowdin/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
"135210620": "Deriv is <0>regulated</0> by several entities including the Malta Financial Services Authority (MFSA), the Labuan Financial Services Authority (Labuan FSA), the Vanuatu Financial Services Commission (VFSC), and the British Virgin Islands Financial Services Commission.",
"138055021": "Synthetic indices",
"138627645": "- Entering your stake or preferred potential payout amount.",
"139668017": "By pressing “Create demo account”, you confirm that you are 18 or older. You understand that we may use your email address to send you information about Deriv products and services as well as market news. You can always unsubscribe from these emails in your account settings. For more information, please take a look at Deriv’s <0>Security and privacy policy</0>.",
"140083133": "Fund your account. Start trading on the mobile app, desktop app, or web browser.",
"141909159": "You’ll be brought back to the Cashier page. Click <0>Review pending</0> and select the transaction that you'd like to cancel.",
"143734792": "Terms that govern keeping and transferring funds in Deriv and the bonuses you might get",
Expand Down Expand Up @@ -1373,7 +1374,6 @@
"1291852379": "50 - 5,000",
"1293479771": "PnL for margin",
"1294884975": "30%",
"1296602191": "For mobile app sign-ups, set the broker code to <0>Deriv.com Limited.<0>",
"1298753999": "Three of the most commonly used strategies in automated trading are Martingale, D'Alembert, and Oscar's Grind — you can find them already-made and waiting for you in Deriv Bot.",
"1298837204": "<p>With a Digits contract, you predict whether the last digit of the last tick of your contract will meet specified criteria, depending on the contract type you select.</p><p>If you trade a Matches/Differs contract, you predict whether the last digit will match or be different from a selected number.</p><p>If you trade an Even/Odd contract, you predict whether the last digit will be an even or odd number.</p><p>If you trade an Over/Under contract, you predict whether the last digit will be over or under a specific number.</p>",
"1299144461": "Terms and conditions",
Expand Down Expand Up @@ -1886,6 +1886,7 @@
"1745193633": "Redirect notice",
"1746051371": "Download the app",
"1746052061": "> 5 - 10 billion",
"1746061638": "For mobile app login, you can find the broker name on Trader's Hub once you log in to your Deriv MT5 account",
"1746782390": "Will I still be able to trade with my account after registering as a payment agent?",
"1748626120": "No hidden costs",
"1748670878": "Can I use my Binance wallet to make the cryptocurrency deposit?",
Expand Down
33 changes: 33 additions & 0 deletions src/components/hooks/use-app-config.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { useEffect, useState } from 'react'

export enum SocialProviders {
Facebook = 'facebook',
Twitter = 'twitter',
Instagram = 'instagram',
Telegram = 'telegram',
Youtube = 'youtube',
Linkedin = 'linkedin',
}

export type TAppConfig = {
[key in SocialProviders]
}

export const useAppConfig = (): TAppConfig => {
const [config, setConfig] = useState<TAppConfig>(DefaultConfig)

useEffect(() => {
// setConfig(read from Growthbook or Firebase)
}, [])

return config
}

const DefaultConfig: TAppConfig = {
facebook: true,
twitter: true,
instagram: true,
telegram: true,
youtube: true,
linkedin: true,
}
78 changes: 0 additions & 78 deletions src/components/hooks/use-social-media-url.tsx

This file was deleted.

93 changes: 61 additions & 32 deletions src/features/components/templates/footer/data.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
} from '@deriv/quill-icons/Standalone'
import { DerivGoBanner } from './deriv-go-banner'
import { IIPAward } from './iip-award'
import { SocialProviders } from 'components/hooks/use-app-config'
import { Localize } from 'components/localization'

export const RowFooterNavData: FooterItems[] = [
Expand Down Expand Up @@ -498,91 +499,119 @@ export const socialButtonsROW = [
{
icon: <StandaloneFacebookIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.facebook.com/derivdotcom',
'data-cy': 'facebook',
'aria-label': 'facebook',
'data-cy': SocialProviders.Facebook,
'aria-label': SocialProviders.Facebook,
},
{
icon: <StandaloneInstagramIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.instagram.com/deriv_official',
'data-cy': 'instagram',
'aria-label': 'instagram',
'data-cy': SocialProviders.Instagram,
'aria-label': SocialProviders.Instagram,
},
{
icon: <StandaloneXTwitterIcon iconSize="md" fill="#000000b8" />,
href: 'https://twitter.com/derivdotcom/',
'data-cy': 'twitter',
'aria-label': 'twitter',
'data-cy': SocialProviders.Twitter,
'aria-label': SocialProviders.Twitter,
},
{
icon: <StandaloneYoutubeIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.youtube.com/@deriv',
'data-cy': 'youtube',
'aria-label': 'youtube',
'data-cy': SocialProviders.Youtube,
'aria-label': SocialProviders.Youtube,
},
{
icon: <StandaloneLinkedinIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.linkedin.com/company/derivdotcom/',
'data-cy': 'linkedin',
'aria-label': 'linkedin',
'data-cy': SocialProviders.Linkedin,
'aria-label': SocialProviders.Linkedin,
},
{
icon: <StandaloneTelegramIcon iconSize="md" fill="#000000b8" />,
href: 'https://t.me/Derivchannelofficial',
'data-cy': 'telegram',
'aria-label': 'telegram',
'data-cy': SocialProviders.Telegram,
'aria-label': SocialProviders.Telegram,
},
]

export const socialButtonsEU = [
{
icon: <StandaloneFacebookIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.facebook.com/DerivEU',
'data-cy': 'facebook',
'aria-label': 'facebook',
'data-cy': SocialProviders.Facebook,
'aria-label': SocialProviders.Facebook,
},
{
icon: <StandaloneInstagramIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.instagram.com/deriv_eu/',
'data-cy': 'instagram',
'aria-label': 'instagram',
'data-cy': SocialProviders.Instagram,
'aria-label': SocialProviders.Instagram,
},
{
icon: <StandaloneXTwitterIcon iconSize="md" fill="#000000b8" />,
href: 'https://twitter.com/deriv_eu/',
'data-cy': 'twitter',
'aria-label': 'twitter',
'data-cy': SocialProviders.Twitter,
'aria-label': SocialProviders.Twitter,
},
{
icon: <StandaloneYoutubeIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.youtube.com/@deriv',
'data-cy': 'youtube',
'aria-label': 'youtube',
'data-cy': SocialProviders.Youtube,
'aria-label': SocialProviders.Youtube,
},
{
icon: <StandaloneLinkedinIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.linkedin.com/company/derivdotcom/',
'data-cy': 'linkedin',
'aria-label': 'linkedin',
'data-cy': SocialProviders.Linkedin,
'aria-label': SocialProviders.Linkedin,
},
]

export const socialButtonsCareers = [
{
icon: <StandaloneFacebookIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.facebook.com/derivcareers',
'data-cy': 'facebook',
'aria-label': 'facebook',
},
{
icon: <StandaloneInstagramIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.instagram.com/derivcareers/',
'data-cy': 'instagram',
'aria-label': 'instagram',
'data-cy': SocialProviders.Facebook,
'aria-label': SocialProviders.Facebook,
},
{
icon: <StandaloneLinkedinIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.linkedin.com/company/derivdotcom/life/',
'data-cy': 'linkedin',
'aria-label': 'linkedin',
'data-cy': SocialProviders.Linkedin,
'aria-label': SocialProviders.Linkedin,
},
{
icon: <StandaloneInstagramIcon iconSize="md" fill="#000000b8" />,
href: 'https://www.instagram.com/derivcareers/',
'data-cy': SocialProviders.Instagram,
'aria-label': SocialProviders.Instagram,
},
]

export const specialLanguageUrls = {
ar: {
instagram: 'https://www.instagram.com/deriv_ar/',
twitter: 'https://twitter.com/DerivArabic',
facebook: 'https://www.facebook.com/derivarabic',
},
fr: {
instagram: 'https://www.instagram.com/deriv_french/',
twitter: 'https://twitter.com/DerivFrench',
facebook: 'https://www.facebook.com/FrenchDeriv/',
},
ru: {
instagram: 'https://www.instagram.com/deriv_russian/',
twitter: 'https://twitter.com/DerivRussian',
facebook: 'https://www.facebook.com/RussianDeriv',
},
es: {
instagram: 'https://www.instagram.com/deriv_espanol/',
twitter: 'https://twitter.com/derivespanol',
facebook: 'https://www.facebook.com/derivespanol',
},
pt: {
instagram: 'https://www.instagram.com/deriv_portugues/',
twitter: 'https://twitter.com/DerivPortugues',
facebook: 'https://www.facebook.com/derivportugues',
},
}
33 changes: 27 additions & 6 deletions src/features/components/templates/footer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useEffect, useState } from 'react'
import React, { useEffect, useMemo, useState } from 'react'
import Cookies from 'js-cookie'
import { Footer } from '@deriv-com/blocks'
import { qtMerge } from '@deriv/quill-design'
import {
Expand All @@ -7,17 +8,21 @@ import {
socialButtonsCareers,
socialButtonsEU,
socialButtonsROW,
specialLanguageUrls,
warnText,
} from './data'
import { DerivGoBanner } from './deriv-go-banner'
import { IIPAward } from './iip-award'
import { DescriptionContent } from './description'
import useRegion from 'components/hooks/use-region'
import { getLocationPathname } from 'common/utility'
import { TAppConfig, useAppConfig } from 'components/hooks/use-app-config'

export const MainFooter = () => {
const [is_career, setIsCareer] = useState(false)
const { is_eu, is_cpa_plan } = useRegion()
const lang = Cookies.get('user_language') || 'en'
const config = useAppConfig()

useEffect(() => {
const current_path = getLocationPathname()
Expand All @@ -26,11 +31,9 @@ export const MainFooter = () => {
setIsCareer(is_career_page)
}, [])

const socialButtons = is_career
? socialButtonsCareers
: is_eu
? socialButtonsEU
: socialButtonsROW
const socialButtons = useMemo(() => {
return getSocialButtons(lang, is_eu, is_career, config)
}, [is_eu, lang, is_career, config])

return (
<Footer.FooterBlock
Expand All @@ -46,4 +49,22 @@ export const MainFooter = () => {
)
}

const getSocialButtons = (lang: string, is_eu: boolean, is_career: boolean, config: TAppConfig) => {
const overrideWithLang = (arr) =>
arr.map((button) =>
lang in specialLanguageUrls
? button['aria-label'] in specialLanguageUrls[lang]
? { ...button, href: specialLanguageUrls[lang][button['aria-label']] }
: button
: button,
)

let buttons = is_career ? socialButtonsCareers : is_eu ? socialButtonsEU : socialButtonsROW

buttons = buttons.filter((button) => !!config[button?.['aria-label']])
buttons = overrideWithLang(buttons)

return buttons
}

export default MainFooter
4 changes: 2 additions & 2 deletions src/features/hooks/use-residence-list/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export type ResidenceType = {

const formatResidenceList = ({
residences,
restricted,
restricted = [],
}: {
residences: any[]
restricted: ['Iran', 'North Korea', 'Myanmar (Burma)', 'Syria', 'Cuba']
restricted: ['Iran', 'North Korea', 'Myanmar (Burma)', 'Syria', 'Cuba'] | string[]
}) => {
if (!residences.length) {
return []
Expand Down
2 changes: 1 addition & 1 deletion src/features/pages/signup/form-container/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const SignUpFormContainer = () => {
<SignUpPageForm />
<Typography.Paragraph textcolor="secondary" className={sign_up_content}>
<Localize
translate_text="_t_By pressing “Create demo account”, you confirm that you are 18 or older. You understand that we may use your email address to send you information about Deriv products and services as well as market news. You can always unsubscribe from these emails in your account settings. For more information, please take a look at Deriv’s <0>Security and privacy</0>._t_"
translate_text="_t_By pressing “Create demo account”, you confirm that you are 18 or older. You understand that we may use your email address to send you information about Deriv products and services as well as market news. You can always unsubscribe from these emails in your account settings. For more information, please take a look at Deriv’s <0>Security and privacy policy</0>._t_"
components={[
<Link
className={link_text}
Expand Down
Loading

0 comments on commit 7ba6eb5

Please sign in to comment.