diff --git a/src/pages/about-us/_OurOffices.tsx b/src/pages/about-us/_OurOffices.tsx index dc49ab21004..2c5155ee90c 100644 --- a/src/pages/about-us/_OurOffices.tsx +++ b/src/pages/about-us/_OurOffices.tsx @@ -164,7 +164,7 @@ const OurOffices = () => { return ( - {localize('Our international offices')} + {localize('Our global offices')} @@ -207,20 +207,20 @@ const OurOffices = () => { link="/careers/locations/dubai" /> @@ -230,9 +230,15 @@ const OurOffices = () => { title={localize('Labuan')} link="/careers/locations/labuan" /> - - - + {/* Uncomment after new offices will be shown and add links! */} + {/* + */} + @@ -274,20 +280,20 @@ const OurOffices = () => { link="/careers/locations/dubai" /> @@ -297,9 +303,15 @@ const OurOffices = () => { title={localize('Labuan')} link="/careers/locations/labuan" /> - - - + {/* Uncomment after new offices will be shown and add links! */} + {/* + */} + @@ -318,13 +330,13 @@ const OurOffices = () => { - {localize('13')} + {localize('11')} {localize('offices')} - {localize('10')} + {localize('8')} {localize('countries')} diff --git a/src/pages/careers/_model/_locations/_locations.ts b/src/pages/careers/_model/_locations/_locations.ts index fee4827f535..b622eaba24d 100644 --- a/src/pages/careers/_model/_locations/_locations.ts +++ b/src/pages/careers/_model/_locations/_locations.ts @@ -23,6 +23,7 @@ import BelarusFlagIcon from 'images/svg/careers/flag_belarus.svg' import FranceFlagIcon from 'images/svg/careers/flag_france.svg' import UKFlagIcon from 'images/svg/careers/flag_uk.svg' import ChannelIslandsFlagIcon from 'images/svg/careers/flag._channel_islands.svg' +import { locationsTypes } from './_locations.types' export const cyberjaya = { name: 'cyberjaya', @@ -347,6 +348,7 @@ export const guernsey = { name: 'guernsey', link: '/careers/locations/guernsey/', display_name: 'Guernsey', + img_alt: 'Guernsey alt img', map_office_name: '(Guernsey)', country: 'Channel Islands', flagIcon: ChannelIslandsFlagIcon, @@ -354,7 +356,9 @@ export const guernsey = { first_p: 'Our office at Guernsey focuses on compliance. A team of dedicated experts provide oversight so that Deriv offices across the world comply with legislative and regulatory requirements. With their vast knowledge in corporate law, anti-money laundering, and other related legislations, they will anticipate and mitigate regulatory risks.', first_img: 'living_in_guernsey', + first_img_alt: 'living_in_guernsey alt img', grid_images: ['guernsey_grid_1', 'guernsey_grid_2', 'guernsey_grid_3', 'guernsey_grid_4'], + grid_img_alt: ['guernsey grid 1', 'guernsey grid 2', 'guernsey grid 3', 'guernsey grid 4'], map: 'M8p55z3Wu4EKhQ3A7', map_text: 'At Deriv (Guernsey), we study regulatory landscapes in different Deriv jurisdictions to ensure the right thing is done at all times. We seek self-motivation, attention to detail, and a strong interest in law. Deriv (Guernsey) gives you the opportunity to analyse regulatory policies, predict changes in fintech regulations, and formulate plans to ensure the efficiency of Deriv Group’s compliance strategies.', @@ -363,13 +367,13 @@ export const guernsey = { google_map_link: 'https://goo.gl/maps/M8p55z3Wu4EKhQ3A7', has_iframe: false, } -export const all_offices = [ +export const all_offices: locationsTypes[] = [ // london, dubai, // paris, malta, cyprus, - // guernsey, + guernsey, cyberjaya, labuan, ipoh, @@ -378,6 +382,7 @@ export const all_offices = [ rwanda, minsk, ] + export const locations = { cyberjaya: `${cyberjaya.display_name}, ${cyberjaya.country}`, malta: `${malta.display_name}`, @@ -391,5 +396,5 @@ export const locations = { belarus: `${minsk.display_name}, ${minsk.country}`, // france: `${paris.display_name}, ${paris.country}`, // uk: `${london.display_name}, ${london.country}`, - // guernsey: `${guernsey.display_name}, ${guernsey.country}`, + guernsey: `${guernsey.display_name}, ${guernsey.country}`, } diff --git a/src/pages/careers/_model/_locations/_locations.types.ts b/src/pages/careers/_model/_locations/_locations.types.ts index 6e8f5c1f558..2fd42756023 100644 --- a/src/pages/careers/_model/_locations/_locations.types.ts +++ b/src/pages/careers/_model/_locations/_locations.types.ts @@ -1,21 +1,21 @@ export type locationsTypes = { - name?: string - link?: string - display_name?: string - img_alt?: string - map_office_name?: string - country?: string - flagIcon?: string - thumbnail?: string - first_p?: string - first_img?: string - first_img_alt?: string - grid_images?: string[] - grid_img_alt?: string[] - map?: string + name: string + link: string + display_name: string + img_alt: string + map_office_name: string + country: string + flagIcon: string + thumbnail: string + first_p: string + first_img: string + first_img_alt: string + grid_images: string[] + grid_img_alt: string[] + map: string map_img?: string - map_text?: string - address?: string[] + map_text: string + address: string[] google_map_link?: string has_iframe?: boolean } diff --git a/src/pages/careers/locations/_location-layout.tsx b/src/pages/careers/locations/_location-layout.tsx index 8bfdaa21a45..c25b4683674 100644 --- a/src/pages/careers/locations/_location-layout.tsx +++ b/src/pages/careers/locations/_location-layout.tsx @@ -355,13 +355,14 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => { return ( <> - + - + Deriv in {display_name} @@ -378,7 +379,13 @@ export const LocationLayout = ({ location, images }: LocationLayoutProps) => { -
+
Our office
diff --git a/src/pages/careers/locations/guernsey/_index.tsx b/src/pages/careers/locations/guernsey/index.tsx similarity index 100% rename from src/pages/careers/locations/guernsey/_index.tsx rename to src/pages/careers/locations/guernsey/index.tsx