MohammadH/Endpoint localstorage (#2755)

mohammad-hashemi-deriv · web-flow · commit fe30c9b649c3 · 2022-03-11T12:03:03.000+08:00
* update package-lock.json

* update package lock

* fix: add manual clients country to localstorage to prevent overwriting clients country by ip

* fix: remove local storage manual country when press on reset button

* fix: add isbrowser before using localstorage
diff --git a/src/components/hooks/use-website-status.js b/src/components/hooks/use-website-status.js
@@ -1,7 +1,7 @@
 import { useState, useLayoutEffect } from 'react'
 import { useCookieState } from './use-cookie-state'
 import { BinarySocketBase } from 'common/websocket/socket_base'
-import { getDateFromToday } from 'common/utility'
+import { getDateFromToday, isBrowser } from 'common/utility'
 
 const WEBSITE_STATUS_COUNTRY_KEY = 'website_status'
 const COOKIE_EXPIRY_DAYS = 7
@@ -11,6 +11,8 @@ export const useWebsiteStatus = () => {
         expires: getDateFromToday(COOKIE_EXPIRY_DAYS),
     })
 
+    const manual_clients_country = isBrowser() && localStorage.getItem('manual_clients_country')
+
     const [is_loading, setLoading] = useState(true)
 
     useLayoutEffect(() => {
@@ -32,7 +34,7 @@ export const useWebsiteStatus = () => {
                 setLoading(false)
                 binary_socket.close()
             }
-        } else {
+        } else if (!manual_clients_country) {
             const binary_socket = BinarySocketBase.init()
             binary_socket.onopen = () => {
                 binary_socket.send(JSON.stringify({ website_status: 1 }))
@@ -50,6 +52,8 @@ export const useWebsiteStatus = () => {
                 binary_socket.close()
                 setLoading(false)
             }
+        } else {
+            setLoading(false)
         }
     }, [website_status])
 
diff --git a/src/pages/endpoint/index.tsx b/src/pages/endpoint/index.tsx
@@ -8,7 +8,7 @@ import { Container, SEO } from 'components/containers'
 import { Header, Text } from 'components/elements'
 import { Input, Button } from 'components/form'
 import validation from 'common/validation'
-import { trimSpaces } from 'common/utility'
+import { trimSpaces, isBrowser } from 'common/utility'
 import { default_server_url } from 'common/constants'
 import { getAppId } from 'common/websocket/config'
 import { DerivStore } from 'store'
@@ -121,6 +121,7 @@ const Endpoint = () => {
         // reset website status values
         setWebsiteStatus()
         handleStatus(setStatus, 'Config has been reset successfully')
+        isBrowser() && localStorage.removeItem('manual_clients_country')
         // TODO: if there is a change requires reload in the future
         // window.location.reload()
     }
@@ -131,6 +132,7 @@ const Endpoint = () => {
 
         // handle website status changes
         const new_website_status = { ...website_status, clients_country: values.clients_country }
+        isBrowser() && localStorage.setItem('manual_clients_country', values.clients_country)
         setWebsiteStatus(new_website_status)
         actions.setSubmitting(false)
         handleStatus(actions.setStatus, 'Config has been updated')
diff --git a/src/store/index.tsx b/src/store/index.tsx
@@ -23,7 +23,7 @@ export type DerivStoreType = {
     is_uk_country: boolean
     LC_API: { open_chat_window: () => void }
     setFirstLoadOpenLc: React.Dispatch<React.SetStateAction<boolean>>
-    setWebsiteStatus: Dispatch<WebsiteStatusType>
+    setWebsiteStatus: Dispatch<WebsiteStatusType | void>
     user_country: string
     website_status_loading: boolean
     website_status: WebsiteStatusType
