Pr 00 updated to master (#7281)

* Pr 00 workflow fix 4 (#7182) * chore: test workflow * chore: removed * chore: test * chore: test * chore: fixed preview link workflow * Agrim/DPROD-3557/Translation 3557 footer change (#7158) * text: updating footer text * text: updating the text in the footer for EU and CPA * text: terms and conditions edit of text * text: edit the text * text: formatting the text * fix: changes in the text links * fix: fixing t&c, risk disclosure, secure links * auto-pull-translation * auto-pull-translation * fix: modifications in footer * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: changes in the text links * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * Agrim/DPROD-3441/Set disclaimer on trade specifications (#7095) * text: disclaimer on trade specifications * auto-pull-translation * fix: resolve conflict * fix: fixing the error * fix: resolve conflicts * auto-pull-translation * fix: resolve conflict * fix: fixing the error * fix: resolve conflict * auto-pull-translation * fix: resolve conflict * fix: fixing the error * fix: resolve conflict * auto-pull-translation * fix: resolve conflict * fix: fixing the error * text: updating footer text * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * fix: resolve conflict * fix: resolve conflict * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: resolve conflict * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * fix: to redeploy and trigger build * auto-pull-translation * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * fix: resolve conflict * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch --------- Co-authored-by: DerivFE <[email protected]> Co-authored-by: prince-deriv <[email protected]> * Agrim/DPROD-3025/Replace the spanish row pdf's with english to spanish pdf's (#7128) * fix: replacing the spanish row pdf's with english to spanish pdf's * fix: remove spaces from pdf name * behnaz/DPROD-3359/Feb trading data (#7060) * chorn: fx row * chorn: derived row * chorn: derived coma row * chorn: derived add quet row * chorn: derived add quet2 row * chorn: stock row * chorn: stock GBP row * chorn: etfs row * chorn: etfs remove extra 1 row * chorn: crypto row * chorn: crypto base row * chorn: comod row * chorn: comod EU * chorn: fx EU * chorn: derived EU * chorn: stock EU * chorn: etfs EU * chorn: crypto EU * mayuran/DPROD-2759/ws_improvements (#7070) * fix: wip * fix: dummy initial * fix: check socket * fix: added conditionsa * fix: ws call * fix: ws reconnect * fix: check api manager * chore: trigger vercel * fix: ws socket calls * fix: session storage * fix: window added * fix: addded window * fix: remove unwanted code * fix: check * fix: kogs * fix: ready state * fix: code clear * fix: added logs * fix: minor issue in reconnect * fix: loading changed logic * fix: remove session storage * Revert "fix: remove session storage" This reverts commit abb84c3. * fix: remove session storage * fix: improvement of use WS * fix: remove console logs (#7201) * Update smoketests.yml - change e2e skip term (#7194) * Update smoketests.yml - change e2e skip term If the term 'skipsm' is specified in the branch name then skip the e2e tests (used to be 'quill'). This is because the dev knows they are making radical change which will need the tests to be modified at a later date. * Update smoketests.yml - Modified to use DRAFT param Skip smoket test if the PR is in Draft mode. * Update generate-preview-link.yml - Add DRAFT param (#7198) We need to store a new param to GH storage, DRAFT. So that the smoketest.yml can use it to ignore a test run. * Fasih/DPROD-3590/integrate firebase feature flag for third party items (#7149) * feat: implement json which contain items name * feat: adding flag on third party packages * feat: implemented flag on trade platfrom apps * feat: removed unsued code * feat: made some items value false * feat: enabled all items * feat: add condition for derivgo footer badge * feat: updated keys * feat: interated api and hook * feat: updated hook with importing function * feat: updated hook and filtered footer icon data * feat: remvoed hotjar and gtm from flags * feat: removed unused code * feat: made every item true * feat: updated other layout files * feat: updated the condition --------- Co-authored-by: fasihali-deriv <[email protected]> Co-authored-by: Muhammad Fasih Ali Naqvi <[email protected]> * chore: update multiple build action yml (#7210) * chore: update multiple build action yml * chore: update action with To DO * Update smoketests.yml - Mod to draft param (#7217) * Update smoketests.yml - Mod to draft param The draft param wasn't being interpretted correctly. * Update smoketests.yml * chore: updated the config url (#7223) Co-authored-by: Muhammad Fasih Ali Naqvi <[email protected]> * chore: update icon file (#7151) * behnaz/MARK-1066/phone-8d (#7185) * chore: phone 8 d * chore: add the phone length * chore: decrease padding in tablet (#7152) * Agrim/DPROD-2993/Translation 2993 meta changes dtrader (#7168) * fix: changing name and description of dTrader seo * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: meta attributes * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * auto-pull-translation * auto-pull-translation * auto-pull-translation * fix: empty commit * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * fix: empty commit * fix: empty commit --------- Co-authored-by: DerivFE <[email protected]> Co-authored-by: Agrim Jain <[email protected]> * Aswathy/DPROD-3448/Deriv Academy new Sign Up flow (#7090) * feat: new signup page * fix: redirection of login page * feat: academy app id redirection for login * fix: window error issue * fix: window error * fix: app id connection and login page * fix: changed the url flow for academy signup flow * fix: passowrd changes * fix: validation for password * fix: password feature button * fix: added the token auth * fix: added authorized token * fix: background color issue * fix: redirection of url to thinkific * fix: authorize the api call * fix: redirection of language to english only * fix: for handling the response for the country * fix: flickering logo issue * fix: flickering logo issue with use state * fix: flickering logo * fix: created the academy nav logo * fix: logo fix flicker * fix: password page * fix: country selection and disabling button * fix: redirection issue * fix: logo issue * fix: translations issue * fix: logo issue * fix: changed the logo * fix: minimized the logo size * fix: dropdown issues * fix: sonar cloud issues * fix: issues in the design * fix: dropdown is reverted to old one * fix: dropdown issues * fix: removed the button width for residence page * fix: focus blur * fix: added the dropdown search changes * fix: changed the css file * fix: renamed the css file * fix: percy issues * fix: percy run issue * fix: renamed the password files * fix: sonarcloud issues * Agrim/DPROD-3466/fix: color intensity hero (#7141) * fix: color intensity hero * fix: color intensity 2 * fix: improve resolution of image * fix: fix the photo resolution * fix: webp to png fix * fix: changing the image to optimize performance * fix: changing the image to optimize performance * fix: update the image * fix: update photo * fix: resolution fix of image * fix: make the relevant changes to the image * fix: fixing the styling * fix: making required changes * fix: empty commit * fix: empty commit --------- Co-authored-by: Agrim Jain <[email protected]> * Agrim/DPROD-3532/fix: changed the award (#7121) * fix: changed the award * fix: changed award and fix the sizing issue * 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 * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * fix: empty commit * fix: empty commit * fix: empty commit * fix: empty commit --------- Co-authored-by: DerivFE <[email protected]> Co-authored-by: Agrim Jain <[email protected]> * fix: minified error (#7255) * feat: adding ctrader to carousel (#7235) Co-authored-by: Agrim Jain <[email protected]> * behnaz/MARK-1003/lead to deriv.com (#7086) * chore: url lead to deriv.com * chore: url lead to affiliate-ib * chore: remove the extra space * fix: initial contact us page (#7226) * Agrim/DPROD-3654/Translation 3654 translation for the footer with links (#7247) * fix: incorrect links in the ROW footer * fix: fixes in the text * fix: fixing the cpa issue * fix: capital letters on the links * auto-pull-translation * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * fix: empty commit * auto-pull-translation * translation: 📚 sync translations from crowdin feature branch * fix: empty commit * fix: empty commit * fix: empty commit * fix: deleting telgram from cpa --------- Co-authored-by: Agrim Jain <[email protected]> Co-authored-by: DerivFE <[email protected]> --------- Co-authored-by: Agrim Jain <[email protected]> Co-authored-by: DerivFE <[email protected]> Co-authored-by: prince-deriv <[email protected]> Co-authored-by: behnaz <[email protected]> Co-authored-by: mayuran-deriv <[email protected]> Co-authored-by: markodonnell-deriv <[email protected]> Co-authored-by: fasihali-deriv <[email protected]> Co-authored-by: fasihali-deriv <[email protected]> Co-authored-by: Muhammad Fasih Ali Naqvi <[email protected]> Co-authored-by: Habib Deriv <[email protected]> Co-authored-by: Agrim Jain <[email protected]> Co-authored-by: Aswathy-Deriv <[email protected]>
binary-com · Mar 12, 2024 · 05b6155 · 05b6155
1 parent 8cb63fd
commit 05b6155
Show file tree

Hide file tree

Showing 103 changed files with 7,394 additions and 5,537 deletions.
diff --git a/.github/workflows/smoketests.yml b/.github/workflows/smoketests.yml
@@ -41,6 +41,10 @@ jobs:
                   echo "branch_name=$(cat ./pr/BRANCHNAME)" >> $GITHUB_OUTPUT
                   echo "user_name=$(cat ./pr/USERNAME)" >> $GITHUB_OUTPUT
                   echo "draft=$(cat ./pr/DRAFT)" >> $GITHUB_OUTPUT
+                  
+            - name: pr_info_debug 🔍
+              run: |
+               echo "PR Draft value ={{ $steps.pr_information.outputs.draft }}--"
 
             - name: Checkout external repository with Cypress tests
               uses: actions/checkout@v4
@@ -49,7 +53,7 @@ jobs:
 
             - name: Cypress run
               # Uses the official Cypress GitHub action https://github.com/cypress-io/github-action
-              if: (!steps.pr_information.outputs.draft)
+              if: "contains(steps.pr_information.outputs.draft, 'false')"
               uses: cypress-io/github-action@v6
               with:
                   # Records to Cypress Cloud
@@ -72,7 +76,7 @@ jobs:
 
             - name: Set comments message
               id: set_msg
-              if: always() && (!steps.pr_information.outputs.draft)
+              if: always() && contains(steps.pr_information.outputs.draft, 'false')
               run: |
                   # Using shell script to conditionally set the message
                   if [[ "${{ job.status }}" == "success" ]]; then
@@ -82,7 +86,7 @@ jobs:
                   fi
 
             - name: Leave comment
-              if: always() && (!steps.pr_information.outputs.draft)
+              if: always() && contains(steps.pr_information.outputs.draft, 'false')
               uses: marocchino/sticky-pull-request-comment@v2
               with:
                   header: Smoke tests status update

diff --git a/crowdin/messages.json b/crowdin/messages.json
diff --git a/deriv.com.conf b/deriv.com.conf
@@ -26,11 +26,11 @@ server {
     }
 
     location ~* "^/([\w]{2}|zh-tw|zh-cn)/contact-us" {
-        return 301 https://$http_host/$1/contact_us/;
+        return 301 https://$http_host/$1/contact-us/;
     }
 
     location /contact-us {
-        return 301 https://$http_host/contact_us/;
+        return 301 https://$http_host/contact-us/;
     }
 
     location ~* "^/([\w]{2}|zh-tw|zh-cn)/about" {

diff --git a/package-lock.json b/package-lock.json
diff --git a/themes/gatsby-theme-deriv/gatsby-node.js b/themes/gatsby-theme-deriv/gatsby-node.js
@@ -46,7 +46,7 @@ exports.onPreInit = () => {
 const BuildPage = (page, actions, region) => {
     const { createRedirect, createPage } = actions
     const is_responsible_trading = /responsible/g.test(page.path)
-    const is_contact_us = /contact_us/g.test(page.path)
+    const is_contact_us = /contact-us/g.test(page.path)
     const is_careers = /careers/g.test(page.path)
     const is_p2p = /responsible/g.test(page.path)
     const who_we_are = /who-we-are/g.test(page.path)
@@ -97,20 +97,20 @@ const BuildPage = (page, actions, region) => {
 
     if (is_contact_us) {
         createRedirect({
-            fromPath: `/contact-us/`,
-            toPath: `/contact_us/`,
+            fromPath: `/contact_us/`,
+            toPath: `/contact-us/`,
             redirectInBrowser: true,
             isPermanent: true,
         })
         createRedirect({
             fromPath: `/contact/`,
-            toPath: `/contact_us/`,
+            toPath: `/contact-us/`,
             redirectInBrowser: true,
             isPermanent: true,
         })
         createRedirect({
-            fromPath: `/contact-us`,
-            toPath: `/contact_us/`,
+            fromPath: `/contact_us`,
+            toPath: `/contact-us/`,
             redirectInBrowser: true,
             isPermanent: true,
         })
@@ -273,20 +273,20 @@ const BuildPage = (page, actions, region) => {
 
         if (is_contact_us) {
             createRedirect({
-                fromPath: `/${lang}/contact-us/`,
-                toPath: `/${lang}/contact_us/`,
+                fromPath: `/${lang}/contact_us/`,
+                toPath: `/${lang}/contact-us/`,
                 redirectInBrowser: true,
                 isPermanent: true,
             })
             createRedirect({
                 fromPath: `/${lang}/contact/`,
-                toPath: `/${lang}/contact_us/`,
+                toPath: `/${lang}/contact-us/`,
                 redirectInBrowser: true,
                 isPermanent: true,
             })
             createRedirect({
-                fromPath: `/${lang}/contact-us`,
-                toPath: `/${lang}/contact_us`,
+                fromPath: `/${lang}/contact_us`,
+                toPath: `/${lang}/contact-us`,
                 redirectInBrowser: true,
                 isPermanent: true,
             })

diff --git a/themes/gatsby-theme-deriv/package.json b/themes/gatsby-theme-deriv/package.json
@@ -36,6 +36,8 @@
     "@svgr/webpack": "^8.1.0",
     "@tanstack/react-table": "^8.10.7",
     "@vercel/gatsby-plugin-vercel-builder": "^0.1.2",
+    "@zxcvbn-ts/core": "^3.0.4",
+    "@zxcvbn-ts/language-common": "^3.0.4",
     "cli-select": "^1.1.2",
     "clsx": "^1.2.1",
     "commander": "^8.3.0",

diff --git a/themes/gatsby-theme-deriv/src/common/login.ts b/themes/gatsby-theme-deriv/src/common/login.ts
@@ -2,12 +2,15 @@ import Cookies from 'js-cookie'
 import { isStorageSupported } from './storage'
 import { getCookiesFields, getCookiesObject, getDataLink, getDataObjFromCookies } from './cookies'
 import { getAppId } from './websocket/config'
-import { redirectToTradingPlatform } from './utility'
+import { isBrowser, redirectToTradingPlatform } from './utility'
 import { brand_name, deriv_app_id, oauth_url } from 'common/constants'
 
 export type TSocialProvider = 'google' | 'facebook' | 'apple'
 
 const Login = (() => {
+    const url = isBrowser() && window.location.href
+    const is_academy = isBrowser() && url.includes('academy')
+
     const redirectToLogin = () => {
         if (isStorageSupported(sessionStorage)) {
             window.location.href = loginUrl()
@@ -31,9 +34,17 @@ const Login = (() => {
 
         const sub_url = redirectToTradingPlatform()
 
-        return server_url && /qa/.test(server_url)
-            ? `https://${server_url}/oauth2/authorize?app_id=${getAppId()}&l=${language}&brand=${brand_name.toLowerCase()}${affiliate_token_link}${cookies_link}&platform=${sub_url}`
-            : `${oauth_url}/oauth2/authorize?app_id=${deriv_app_id}&l=${language}&brand=${brand_name.toLowerCase()}${affiliate_token_link}${cookies_link}&platform=${sub_url}`
+        if (is_academy) {
+            if (server_url && /qa/.test(server_url)) {
+                return `https://${server_url}/oauth2/authorize?app_id=37228&l=${language}&brand=${brand_name.toLowerCase()}${affiliate_token_link}${cookies_link}&platform=${sub_url}`
+            }
+            return `${oauth_url}/oauth2/authorize?app_id=37228&l=${language}&brand=${brand_name.toLowerCase()}${affiliate_token_link}${cookies_link}&platform=${sub_url}`
+        } else {
+            if (server_url && /qa/.test(server_url)) {
+                return `https://${server_url}/oauth2/authorize?app_id=${getAppId()}&l=${language}&brand=${brand_name.toLowerCase()}${affiliate_token_link}${cookies_link}&platform=${sub_url}`
+            }
+            return `${oauth_url}/oauth2/authorize?app_id=${deriv_app_id}&l=${language}&brand=${brand_name.toLowerCase()}${affiliate_token_link}${cookies_link}&platform=${sub_url}`
+        }
     }
 
     const initOneAll = (provider: TSocialProvider, utm_content?: string): void => {

diff --git a/themes/gatsby-theme-deriv/src/common/websocket/config.ts b/themes/gatsby-theme-deriv/src/common/websocket/config.ts
@@ -69,7 +69,8 @@ const isStaging = () => isBrowser() && domain_config.staging.hostname === window
 const isBeta = () => isBrowser() && domain_config.beta.hostname === window.location.hostname
 const isLive = () => isProduction() || isStaging() || isBeta()
 const isLocalHost = () => isBrowser() && domain_config.local.hostname === window.location.hostname
-
+const url = isBrowser() && window.location.href
+const is_academy = isBrowser() && url.includes('academy')
 const getAppId = (): null | number | string => {
     let app_id = null
     const user_app_id = '' // you can insert Application ID of your registered application here
@@ -83,24 +84,28 @@ const getAppId = (): null | number | string => {
 
         const config_app_id = window.localStorage.getItem('config.app_id')
 
-        if (url_app_id) {
-            app_id = url_app_id
-        } else if (config_app_id) {
-            app_id = config_app_id
-        } else if (isStaging()) {
-            window.localStorage.removeItem('config.default_app_id')
-            app_id = domain_config.staging.app_id
-        } else if (isBeta()) {
-            window.localStorage.removeItem('config.default_app_id')
-            app_id = domain_config.beta.app_id
-        } else if (user_app_id.length) {
-            window.localStorage.setItem('config.default_app_id', user_app_id) // it's being used in endpoint chrome extension - please do not remove
-            app_id = user_app_id
-        } else if (isLocalHost()) {
-            app_id = domain_config.local.app_id
+        if (is_academy) {
+            app_id = 37228
         } else {
-            window.localStorage.removeItem('config.default_app_id')
-            app_id = isProduction() ? prod_app_id : domain_config.test.app_id
+            if (url_app_id) {
+                app_id = url_app_id
+            } else if (config_app_id) {
+                app_id = config_app_id
+            } else if (isStaging()) {
+                window.localStorage.removeItem('config.default_app_id')
+                app_id = domain_config.staging.app_id
+            } else if (isBeta()) {
+                window.localStorage.removeItem('config.default_app_id')
+                app_id = domain_config.beta.app_id
+            } else if (user_app_id.length) {
+                window.localStorage.setItem('config.default_app_id', user_app_id) // it's being used in endpoint chrome extension - please do not remove
+                app_id = user_app_id
+            } else if (isLocalHost()) {
+                app_id = domain_config.local.app_id
+            } else {
+                window.localStorage.removeItem('config.default_app_id')
+                app_id = isProduction() ? prod_app_id : domain_config.test.app_id
+            }
         }
     }
     return app_id

diff --git a/themes/gatsby-theme-deriv/src/components/custom/other-platforms.tsx b/themes/gatsby-theme-deriv/src/components/custom/other-platforms.tsx
@@ -635,7 +635,7 @@ export const NavCompany = ({ onClick }: NavCompanyProps) => (
             )}
             title="_t_Contact us_t_"
             onClick={onClick}
-            to="/contact_us/"
+            to="/contact-us/"
         />
         <CardLink
             Icon={() => <img src={Career} alt={localize('_t_careers_t_')} width="24" height="24" />}

diff --git a/themes/gatsby-theme-deriv/src/components/elements/dropdown-search.tsx b/themes/gatsby-theme-deriv/src/components/elements/dropdown-search.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import styled, { css } from 'styled-components'
 import {
     Arrow,
@@ -41,6 +41,7 @@ const DropdownInput = styled.input<DropdownInputProps>`
     display: flex;
     align-items: center;
     justify-content: flex-start;
+
     ${(props) =>
         props.has_short_name &&
         css`
@@ -78,12 +79,19 @@ const DropdownSearch = ({
     onChange,
     selected_item,
     is_alternate_style,
+    onClearInput,
+    placeholder,
     ...props
 }: DropdownProps) => {
     const [input_value, setInputValue] = useState('')
     const [dropdown_items, setDropdownItems] = useState([...items])
     const [is_open, dropdown_ref, nodes, handleChange, toggleListVisibility, setOpen] =
         useDropdown(onChange)
+    const inputRef = useRef(null)
+
+    useEffect(() => {
+        !is_open && inputRef.current.blur()
+    }, [is_open])
 
     // Auto select default value
     useEffect(() => {
@@ -99,6 +107,7 @@ const DropdownSearch = ({
     const handleInputChange = (e) => {
         setInputValue(e.target.value)
         toggleListVisibility(e)
+        onClearInput?.()
     }
 
     const handleSelectItem = (option: SelectedType, handled_error: FormikErrorsType) => {
@@ -139,6 +148,7 @@ const DropdownSearch = ({
                     </StyledLabel>
                     <DropdownInput
                         id="selected_dropdown"
+                        ref={inputRef}
                         tabIndex={0}
                         onClick={toggleListVisibility}
                         onChange={handleInputChange}
@@ -149,7 +159,7 @@ const DropdownSearch = ({
                         value={input_value}
                         is_active={is_open}
                         is_alternate_style={is_alternate_style}
-                        placeholder={label}
+                        placeholder={placeholder}
                     />
                     <Arrow onClick={toggleListVisibility} expanded={is_open} />
                 </Flex>

diff --git a/themes/gatsby-theme-deriv/src/components/elements/dropdown.tsx b/themes/gatsby-theme-deriv/src/components/elements/dropdown.tsx
@@ -286,17 +286,20 @@ export const StyledLabel = styled.label<DropdownStyledProps>`
     transition: 0.25s ease transform;
     transform: translateZ(0);
     padding: 0 0.8rem;
+    margin-top: 3px;
 
     ${(props) =>
         !props.is_alternate_style &&
         css`
             @media ${device.tabletL} {
                 font-size: 1.65rem;
                 top: 1.4rem;
+                margin-top: 0px;
             }
             @media ${device.mobileL} {
                 font-size: 1.5rem;
                 top: 1.6rem;
+                margin-top: 0px;
             }
         `}
 
@@ -439,8 +442,10 @@ export type DropdownProps = {
     value?: string
     disabled?: boolean
     autocomplete?: string
+    placeholder?: string
     mb?: string
     is_alternate_style?: boolean
+    onClearInput?: () => void
 } & Pick<ItemsType, 'contractSize'>
 
 const Dropdown = ({

diff --git a/themes/gatsby-theme-deriv/src/components/elements/off-canvas-menu.tsx b/themes/gatsby-theme-deriv/src/components/elements/off-canvas-menu.tsx
@@ -512,7 +512,7 @@ export const OffCanvasMenuWrapper = (props: OffCanvasMenuWrapperProps) => {
                                 <Localize translate_text="_t_Why choose us_t_" />
                             </span>
                         </StyledLink>
-                        <StyledLink to="/contact_us/" onClick={handleArrowClick}>
+                        <StyledLink to="/contact-us/" onClick={handleArrowClick}>
                             <div>
                                 <img
                                     src={Contact}

diff --git a/themes/gatsby-theme-deriv/src/components/hooks/use-active-link-state.tsx b/themes/gatsby-theme-deriv/src/components/hooks/use-active-link-state.tsx
@@ -13,7 +13,7 @@ const getNavigationMap = (type: string) => {
                     'regulatory',
                     'why-choose-us',
                     'partners',
-                    'contact_us',
+                    'contact-us',
                     'careers',
                     'who-we-are',
                 ],

diff --git a/themes/gatsby-theme-deriv/src/components/hooks/use-third-party-flags.tsx b/themes/gatsby-theme-deriv/src/components/hooks/use-third-party-flags.tsx
@@ -1,6 +1,7 @@
 import { useState, useEffect } from 'react'
 import { initializeApp } from 'firebase/app'
 import { getDatabase, ref, onValue } from 'firebase/database'
+// import useRegion from 'components/hooks/use-region'
 import featuresConfig from '../../../static/appConfig'
 
 const thirdPartyFlagsConfig = {