Merge branch 'master' into translation-new-homepage

.github/workflows/beta.yml

@@ -23,6 +23,7 @@ env:
     GATSBY_RUDDERSTACK_STAGING_KEY: ${{ secrets.GATSBY_RUDDERSTACK_STAGING_KEY }}
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
     GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
+    GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
 
 jobs:
     release-beta:

.github/workflows/generate-preview-link.yml

@@ -130,6 +130,8 @@ jobs:
                   GATSBY_STRAPI_TOKEN: ${{ secrets.GATSBY_STRAPI_TOKEN }}
                   GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
                   GATSBY_TRUSTPILOT_API_KEY: ${{ secrets.GATSBY_TRUSTPILOT_API_KEY }}
+                  GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+
               run: npm run build
 
             - name: Publish to Cloudflare Pages

.github/workflows/production.yml

@@ -20,6 +20,7 @@ env:
     GATSBY_RUDDERSTACK_PRODUCTION_KEY: ${{ secrets.GATSBY_RUDDERSTACK_PRODUCTION_KEY }}
     GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
     GATSBY_TRUSTPILOT_API_KEY: ${{ secrets.GATSBY_TRUSTPILOT_API_KEY }}
+    GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
 
 jobs:
     release-production:

.github/workflows/staging.yml

@@ -25,6 +25,8 @@ env:
     GATSBY_STRAPI_TOKEN: ${{ secrets.GATSBY_STRAPI_TOKEN }}
     GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID: ${{ secrets.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID }}
     GATSBY_TRUSTPILOT_API_KEY: ${{ secrets.GATSBY_TRUSTPILOT_API_KEY }}
+    GATSBY_HOTJAR_ID: ${{ secrets.GATSBY_HOTJAR_ID }}
+
 jobs:
     release-staging:
         timeout-minutes: 30

gatsby-ssr.js

@@ -12,6 +12,7 @@ export const wrapPageElement = WrapPagesWithLocaleContext
 
 export const onRenderBody = ({ setHeadComponents }) => {
     const gtmTrackingId = process.env.GATSBY_GOOGLE_TAG_MANAGER_TRACKING_ID || ''
+    const hotjarId = process.env.GATSBY_HOTJAR_ID || ''
 
     setHeadComponents([
         // Partytown setup
@@ -51,5 +52,24 @@ export const onRenderBody = ({ setHeadComponents }) => {
                 }}
             />
         ),
+
+        // Hotjar setup
+        hotjarId && (
+            <script
+                key="hotjar-script"
+                dangerouslySetInnerHTML={{
+                    __html: `(function(h,o,t,j,a,r){
+            h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+            h._hjSettings={hjid:'${hotjarId}',hjsv:'7'};
+            a=o.getElementsByTagName('head')[0];
+            setTimeout(function(){
+                r=o.createElement('script');r.async=1;
+                r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+                a.appendChild(r);
+            }, 3000);
+        })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');`,
+                }}
+            />
+        ),
     ])
-}
+}

src/components/elements/symbols.ts

@@ -358,6 +358,13 @@ import DEX600UP from 'images/svg/symbols/dex-600up.svg'
 import DEX600DN from 'images/svg/symbols/dex-600dn.svg'
 import DEX1500UP from 'images/svg/symbols/dex-1500up.svg'
 import DEX1500DN from 'images/svg/symbols/dex-1500dn.svg'
+import VINDEX15S1 from 'images/svg/symbols/volatility_15_1s.svg'
+import VINDEX30S1 from 'images/svg/symbols/volatility_30_1s.svg'
+import VINDEX90S1 from 'images/svg/symbols/volatility_90_1s.svg'
+import CRASHI600 from 'images/svg/symbols/crash-indices-600.svg'
+import CRASHI900 from 'images/svg/symbols/crash-indices-900.svg'
+import BOOMI600 from 'images/svg/symbols/boom-indices-600.svg'
+import BOOMI900 from 'images/svg/symbols/boom-indices-900.svg'
 
 export {
     AAL,
@@ -720,4 +727,11 @@ export {
     DEX600DN,
     DEX1500UP,
     DEX1500DN,
+    VINDEX15S1,
+    VINDEX30S1,
+    VINDEX90S1,
+    CRASHI600,
+    CRASHI900,
+    BOOMI600,
+    BOOMI900,
 }

src/features/components/templates/footer/description.tsx

@@ -10,7 +10,7 @@ export const DescriptionContent = () => {
         <>
             <Text size="sm">
                 <Localize
-                    translate_text="_t_Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority <0>(licence)</0>. Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission <1>(licence)</1>. Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission <2>(licence)</2>. Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_"
+                    translate_text="_t_Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority <0>(licence)</0>. Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission <1>(licence)</1>. Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission <2>(licence)</2>. Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. The holding company for these subsidiaries is Deriv.com Limited, with the registration number 71479 and the registered address at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_"
                     components={[
                         <a
                             className={clsx(sharedClasses)}
@@ -61,7 +61,7 @@ export const DescriptionContentEU = () => {
         <>
             <Text size="sm">
                 <Localize
-                    translate_text="_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act <0>(licence)</0>. Deriv Holdings (Guernsey) Limited is the holding company for the above subsidiary with the registration number 71479 and the registered address of 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_"
+                    translate_text="_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act <0>(licence)</0>. The holding company for this subsidiary is Deriv.com Limited, with the registration number 71479 and the registered address at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_"
                     components={[
                         <a
                             className={clsx(sharedClasses)}
@@ -100,7 +100,7 @@ export const DescriptionContentCPA = () => {
         <>
             <Text size="sm">
                 <Localize
-                    translate_text="_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence</0>). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence</1>). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence</2>). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<3>licence</3>). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. Deriv.com Limited is the holding company for the above subsidiaries with the registration number 71479 and the registered address is located at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_"
+                    translate_text="_t_Deriv Investments (Europe) Limited is licensed and regulated by the Malta Financial Services Authority under the Investment Services Act (<0>licence</0>). Deriv (FX) Ltd is licensed by the Labuan Financial Services Authority (<1>licence</1>). Deriv (BVI) Ltd is licensed by the British Virgin Islands Financial Services Commission (<2>licence</2>). Deriv (V) Ltd is licensed by the Vanuatu Financial Services Commission (<3>licence</3>). Deriv (SVG) LLC has a registered office at First Floor, SVG Teachers Credit Union Uptown Building, Corner of James and Middle Street, Kingstown P.O., St Vincent and the Grenadines. The holding company for these subsidiaries is Deriv.com Limited, with the registration number 71479 and the registered address at 2nd Floor, 1 Cornet Street, St Peter Port, Guernsey, GY1 1BZ._t_"
                     components={[
                         <a
                             className={clsx(sharedClasses)}

src/features/pages/partners/deriv-prime/meet-us-there/data.tsx

@@ -6,45 +6,45 @@ import { localize } from 'components/localization'
 
 export const expo_cards: ExpoCardTypes[] = [
     {
-        title: '_t_iFX EXPO Cyprus_t_',
-        date: '_t_19-21 September 2023_t_',
+        title: '_t_iFX Expo Dubai_t_',
+        date: '_t_16-18 January 2024_t_',
         image: (
             <StaticImage
-                src="../../../../../images/common/deriv-prime/cyprus_expo.png"
-                alt={localize('_t_Cyprus Expo_t_')}
+                src="../../../../../images/common/deriv-prime/ifx_expo_dubai.png"
+                alt={localize('_t_iFX Expo Dubai Exhibitor_t_')}
                 className={styles.image}
                 formats={['avif', 'webp', 'auto']}
                 placeholder="none"
             />
         ),
-        link: 'https://cyprus2023.ifxexpo.com/',
+        link: 'https://dubai2024.ifxexpo.com/discover/',
     },
     {
-        title: '_t_Forex Expo Dubai_t_',
-        date: '_t_26-27 September 2023_t_',
+        title: '_t_iFX Expo Latam_t_',
+        date: '_t_9-11 April 2024_t_',
         image: (
             <StaticImage
-                src="../../../../../images/common/deriv-prime/dubai_expo.png"
-                alt={localize('_t_Dubai Expo_t_')}
+                src="../../../../../images/common/deriv-prime/ifx_expo_latam.png"
+                alt={localize('_t_iFX Expo Latam Exhibitor_t_')}
                 className={styles.image}
                 formats={['avif', 'webp', 'auto']}
                 placeholder="none"
             />
         ),
-        link: 'https://theforexexpo.com/dubai2023/',
+        link: 'https://latam2024.ifxexpo.com/',
     },
     {
-        title: '_t_FM London Summit_t_',
-        date: '_t_20-22 November 2023_t_',
+        title: '_t_Forex Expo Dubai_t_',
+        date: '_t_7-8 October 2024_t_',
         image: (
             <StaticImage
-                src="../../../../../images/common/deriv-prime/london_summit.png"
-                alt={localize('_t_London Summit_t_')}
+                src="../../../../../images/common/deriv-prime/forex_expo_dubai.png"
+                alt={localize('_t_Forex Expo Dubai Exhibitor_t_')}
                 className={styles.image}
                 formats={['avif', 'webp', 'auto']}
                 placeholder="none"
             />
         ),
-        link: 'https://events.financemagnates.com/fmls23/lp/',
+        link: 'https://theforexexpo.com/dubai2024/',
     },
 ]