fix: merge conflicts

crowdin/messages.json

@@ -111,7 +111,6 @@
   "93147818": "<0>Hits & Impression</0> report: Displays your hit and click-through rates",
   "94340092": "Asian options are available on the SmartTrader and Deriv Bot trading platforms. You can trade Asian options on synthetics.",
   "94412618": "Yes, you can customise the trade duration of your Only Ups/Only Downs contracts. The available time periods range from 2 ticks to 5 ticks.",
-  "94912230": "Belarus",
   "95016326": "Kindly follow the steps:",
   "96820070": "<0>50 lots</0> with 100 leverage:",
   "97278922": "Max effective leverage",
@@ -606,7 +605,6 @@
   "606371596": "How to trade the forex market",
   "607535944": "5 - 30 minutes",
   "607853927": "The price barrier in Touch/No Touch contracts refers to the specified price level that the underlying instrument's price needs to touch or not touch during the contract duration.",
-  "609069249": "Minsk, Belarus",
   "612131072": "Clients in the rest of the world (except for restricted countries such as the USA, Canada, and Hong Kong) can have accounts under Deriv (SVG) LLC.",
   "613877038": "Chart",
   "613971219": "Email image",
@@ -1046,7 +1044,6 @@
   "1050003244": "USD/ZAR",
   "1051666965": "Volatility 300 Index",
   "1051732300": "Secure and responsible online trading guidelines | Deriv",
-  "1052239082": "Minsk | Our office – Belarus | Deriv",
   "1053153674": "Jump 50 Index",
   "1053405337": "Min deposit",
   "1053562787": "easy signup",
@@ -1133,7 +1130,6 @@
   "1126492980": "The <0>Buy/Sell</0> tab shows you ads by other advertisers. You can see your ads in the <0>My ads</0> tab.",
   "1126725671": "A notice to help you understand the risks that might arise when you trade on Deriv",
   "1126917116": "Micro pairs",
-  "1127858885": "Find your role with us by browsing Deriv job opportunities in Minsk, Belarus.",
   "1128046384": "No. You can withdraw your commission whenever you want.",
   "1129126362": "<0> -0.83</0>",
   "1130568086": "To withdraw funds from your Deriv X account, you’ll first need to transfer the funds to your Deriv account. Go to Cashier, click \"Transfer\", and follow the instructions on the screen.",
@@ -3221,9 +3217,9 @@
   "-1625504236": "Guernsey",
   "-623790227": "Asia",
   "-283810073": "Malaysia",
-  "-950943028": "Eastern Europe",
   "-1847522411": "Africa",
   "-1552543730": "Caribbean",
+  "-2098459063": "British Virgin Islands",
   "-1077630901": "Oceania",
   "-1278724614": "Have any query or need assistance, check out the details to call our international help desk and our email ID. Feel free to contact us anytime!",
   "-1439893219": "Got questions? Here's how to get answers.",

deriv.com.conf

@@ -109,6 +109,10 @@ server {
         return 301 https://$http_host/human-resources/;
     }
 
+     location /careers/locations/minsk {
+        return 301 https://$http_host/careers/;
+    }
+
     rewrite ^/en/(.*)$   https://$http_host/$1 permanent;
 
     location ~* \.(html)$ {

gatsby-config.js

@@ -96,6 +96,7 @@ module.exports = {
                     '/bug-bounty',
                     '/**/bug-bounty',
                     '/**/bug-bounty/**/',
+                    '/careers/locations/minsk/',
                     '/check-email',
                     '/**/check-email',
                     '/reset-password',

gatsby-node.js

@@ -44,6 +44,18 @@ exports.onCreatePage = ({ page, actions }) => {
             redirectInBrowser: true,
             isPermanent: true,
         })
+        createRedirect({
+            fromPath: `/careers/locations/minsk`,
+            toPath: `/careers/`,
+            redirectInBrowser: true,
+            isPermanent: true,
+        })
+        createRedirect({
+            fromPath: `/careers/locations/minsk/`,
+            toPath: `/careers/`,
+            redirectInBrowser: true,
+            isPermanent: true,
+        })
     }
 
     if (is_responsible_trading) {

src/components/containers/seo.tsx

@@ -110,7 +110,7 @@ const SEO = ({
             name: 'Deriv',
             alternateName: 'Deriv.com',
             url: 'https://deriv.com',
-            logo: 'https://deriv.com/static/1b57a116945933314eefeec0030c8e9d/2a4de/logo.png',
+            logo: TradingImage,
             sameAs: [
                 'https://www.facebook.com/derivdotcom',
                 'https://www.twitter.com/derivdotcom',
@@ -173,7 +173,7 @@ const SEO = ({
                 },
                 {
                     property: 'og:image',
-                    content: meta_attributes?.og_img || TradingImage,
+                    content: TradingImage,
                 },
                 {
                     property: 'og:image:width',

src/features/pages/home/our-platforms/data.tsx

@@ -8,7 +8,6 @@ import DerivXIcon from 'images/svg/custom/rebranding/deriv-x-icon.svg'
 import DBotIcon from 'images/svg/custom/rebranding/deriv-bot-icon.svg'
 import BinaryBotIcon from 'images/svg/custom/rebranding/binarybot-icon.svg'
 import SmartTraderIcon from 'images/svg/custom/rebranding/smarttrader-icon.svg'
-import APIIcon from 'images/svg/custom/rebranding/deriv-api-icon.svg'
 import DerivEzIcon from 'images/svg/custom/rebranding/deriv-ez-icon.svg'
 import Link from 'features/components/atoms/link'
 import {
@@ -157,15 +156,24 @@ const platformSliderItems: SmartPlatformItem[] = [
                     />,
                 ],
             },
-            image: (
-                <StaticImage
-                    objectFit="contain"
-                    src="../../../../images/common/home/rebranding/platform_deriv_trader.png"
-                    alt="deriv trader"
-                    formats={['avif', 'webp', 'auto']}
-                    placeholder="none"
-                />
-            ),
+            image: ({ is_eu }) =>
+                is_eu ? (
+                    <StaticImage
+                        objectFit="contain"
+                        src="../../../../images/common/home/rebranding/platform_deriv_trader_eu.png"
+                        alt="deriv trader"
+                        formats={['avif', 'webp', 'auto']}
+                        placeholder="none"
+                    />
+                ) : (
+                    <StaticImage
+                        objectFit="contain"
+                        src="../../../../images/common/home/rebranding/platform_deriv_trader.png"
+                        alt="deriv trader"
+                        formats={['avif', 'webp', 'auto']}
+                        placeholder="none"
+                    />
+                ),
         },
     },
     {

src/features/pages/options/vanilla/index.tsx

@@ -55,9 +55,6 @@ const VanillaOptions = () => {
             </Flex.Box>
             <Flex.Box justify="center" align="center" direction="col">
                 <AvailableMarketPlatforms markets={vanillaMarkets} platforms={vanillaPlatforms} />
-                <Typography.Paragraph font_family="UBUNTU" mt="20x">
-                    <Localize translate_text="_t_Currently available on demo accounts only_t_" />
-                </Typography.Paragraph>
             </Flex.Box>
             <OptionsFaq faqs={vanillaFAQ} />
         </OptionsLayout>

src/pages/careers/_model/_locations/_contact-details.ts

@@ -3,8 +3,6 @@ const address_asuncion = [
     'Doctor Morra, Asunción 1849',
 ]
 
-const address_belarus = ['Level 2, 25/1-3 Vera Khoruzhey Street,', 'Minsk 220123']
-
 const address_ciudad = ['World Trade Center Ciudad del Este, Andrés Rojas, Cd. del Este, Paraguay']
 
 const address_cyberjaya = ['Deriv HQ, 3500, Jalan Teknokrat 3, 63000 Cyberjaya, Selangor']
@@ -26,6 +24,10 @@ const address_georgetown = [
     'Cayman Enterprise City, Strathvale House, 2nd Floor, 90 N Church St, George Town, Cayman Islands',
 ]
 
+const address_roadtown = [
+    '2nd Floor, Suite 2, Omar Hodge Building, 325 Waterfront Drive, Road Town, Tortola, VG 1110, British Virgin Islands',
+]
+
 const address_ipoh = ['E-5-6, Soho Ipoh 2,', 'Jalan Sultan Idris Shah,', 'Ipoh 30000, Perak']
 
 const address_france = ["17 Rue d'Antin, 75002 Paris"]
@@ -54,7 +56,6 @@ const address_rwanda = ['Level 2 East Wing, Kigali Heights, KG7', 'Avenue, Kigal
 
 export {
     address_asuncion,
-    address_belarus,
     address_cyberjaya,
     address_cyprus,
     address_dubai,
@@ -70,5 +71,6 @@ export {
     address_georgetown,
     address_jordan,
     address_vanuatu,
+    address_roadtown,
     address_reading,
 }

src/pages/careers/_model/_locations/_locations.ts

@@ -10,9 +10,9 @@ import {
     address_melaka,
     address_cyprus,
     address_rwanda,
-    address_belarus,
     address_france,
     address_guernsey,
+    address_roadtown,
     address_jordan,
     address_singapore,
     address_vanuatu,
@@ -26,7 +26,6 @@ import MaltaFlagIcon from 'images/svg/careers/flag_malta.svg'
 import CyprusFlagIcon from 'images/svg/careers/flag_cyprus.svg'
 import CaymanFlagIcon from 'images/svg/careers/flag_cayman.svg'
 import RwandaFlagIcon from 'images/svg/careers/flag_rwanda.svg'
-import BelarusFlagIcon from 'images/svg/careers/flag_belarus.svg'
 import BVIFlagIcon from 'images/svg/careers/flag_bvi.svg'
 import UKFlagIcon from 'images/svg/careers/flag_uk.svg'
 import FranceFlagIcon from 'images/svg/careers/flag_france.svg'
@@ -348,42 +347,6 @@ export const rwanda: LocationsType = {
     has_iframe: true,
 }
 
-export const minsk: LocationsType = {
-    name: 'minsk',
-    job_location: 'Minsk',
-    continent: 'eastern_europe',
-    display_continent: 'Eastern Europe',
-    link: '/careers/locations/minsk/',
-    display_name: 'Minsk',
-    display_thumbnail_name: 'Minsk',
-    display_title_name: 'Minsk',
-    img_alt: 'Diamond shape building in Minsk',
-    map_office_name: '(BY) LLC',
-    country: 'Belarus',
-    flagIcon: BelarusFlagIcon,
-    thumbnail: 'thumbnail_minsk',
-    first_p:
-        'Deriv (BY) LLC started its operations in the year 2021 to tap into the regional talent pool. The Customer Support and Front-end teams work towards attaining customer satisfaction and building digital products to give them the best trading experience possible.',
-    first_img: 'living_in_minsk',
-    first_img_alt: 'Houses nearby lake',
-    grid_images: ['minsk_grid_1', 'minsk_grid_2', 'minsk_grid_3', 'minsk_grid_4'],
-    grid_img_alt: [
-        'Girls smiling while seeing their laptop screens',
-        'Group of people smiling while seeing on the laptop screen',
-        'Team meetings',
-        'Girl having a chat ',
-    ],
-    map: 'ChIJF9lVNV_P20YRukiwrfpLP4E',
-    badge: 'minsk_great_place_to_work_badge',
-    badge_alt: 'Minsk Great Place to Work 2022 Certification Badge',
-    map_text:
-        'The work culture at Deriv (BY) LLC is lively and energetic. You will get exposure to global projects and work with highly skilled professionals from across the world. If working for a diverse and thriving team excites you, join our team in Minsk.',
-    address: address_belarus,
-    map_img: 'minsk_map',
-    google_map_link: 'https://goo.gl/maps/7wUCJ6zy7P8CsmkD7',
-    has_iframe: true,
-}
-
 export const paris: LocationsType = {
     name: 'paris',
     job_location: 'Paris',
@@ -565,7 +528,7 @@ export const roadtown: LocationsType = {
     display_thumbnail_name: 'Road Town',
     display_title_name: 'Road Town',
     img_alt: 'Deriv’s British Virgin Islands office at Road Town',
-    map_office_name: '(BVI)',
+    map_office_name: '(BVI) Ltd',
     country: 'British Virgin Islands',
     flagIcon: BVIFlagIcon,
     thumbnail: 'thumbnail_roadtown',
@@ -575,9 +538,13 @@ export const roadtown: LocationsType = {
     first_img_alt: 'Road Town, British Virgin Islands',
     grid_images: ['guernsey_grid_1', 'guernsey_grid_2', 'bvi_grid_3', 'guernsey_grid_4'],
     grid_img_alt: ['Deriv’s British Virgin Islands team', '', 'Boss explaining to team members'],
-    map: 'ChIJs5fO51eGJY8RKFew8LoGSxU',
+    map: 'ChIJpZcftYkqgk4R0hiTkAwsZB4',
     map_text:
-        'Being part of our British Virgin Islands team gives you the chance to analyse regulatory policies, predict changes in fintech regulations, and formulate plans to make sure our BVI compliance strategies are effective. If you have a passion for law and look for worthy challenges in your career, join us at Deriv (BVI).',
+        'Being part of our British Virgin Islands team gives you the chance to analyse regulatory policies, predict changes in fintech regulations, and formulate plans to make sure our BVI compliance strategies are effective. If you have a passion for law and look for worthy challenges in your career, join us at Deriv (BVI) Ltd.',
+    google_map_link: 'https://goo.gl/maps/nNq43TGQNZRRJgar5 ',
+    address: address_roadtown,
+    has_iframe: true,
+    has_map: true,
 }
 
 export const jordan: LocationsType = {
@@ -690,7 +657,6 @@ export const all_offices: LocationsType[] = [
     vanuatu,
     dubai,
     jordan,
-    minsk,
     rwanda,
     asuncion,
     ciudad,
@@ -710,7 +676,6 @@ export const locations = {
     ipoh: `${ipoh.display_name}, ${ipoh.country}`,
     cyprus: `${cyprus.display_name}, ${cyprus.country}`,
     rwanda: `${rwanda.display_name}, ${rwanda.country}`,
-    belarus: `${minsk.display_name}, ${minsk.country}`,
     france: `${paris.display_name}, ${paris.country}`,
     guernsey: `${guernsey.display_name}, ${guernsey.country}`,
     vanuatu: `${vanuatu.display_name}, ${vanuatu.country}`,
@@ -726,7 +691,6 @@ export const allContinents = {
     asia: [],
     oceania: [],
     middle_east: [],
-    eastern_europe: [],
     africa: [],
     latam: [],
     caribbean: [],

src/pages/careers/locations/index.tsx

@@ -338,7 +338,6 @@ const Locations = () => {
                         'asia',
                         'oceania',
                         'middle_east',
-                        'eastern_europe',
                         'africa',
                         'latam',
                         'caribbean',