Merge branch 'main' into profile-imp-v2

KyberNetwork · Jul 17, 2023 · 8104d00 · 8104d00
2 parents 141f3dc + 8d66f96
commit 8104d00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx
@@ -102,6 +102,7 @@ const NavLinkBetween = styled(MenuItem)`
   justify-content: space-between;
   position: unset !important;
   max-height: 40px;
+  cursor: pointer;
   svg {
     margin: 0;
     width: unset;

diff --git a/src/utils/iamError.ts b/src/utils/iamError.ts
@@ -23,6 +23,9 @@ const sendError = (name: string, apiUrl: string, trackData: any) => {
   captureException(error, { level: 'fatal', extra: { args: JSON.stringify(trackData, null, 2) } })
 }
 
+// hot fix to prevent spam for now.
+const blacklistPathBff = ['/v1/notification/me']
+
 /**
  * check error status: blocked, maybe cors issues or  server down
  * only check bff api + 2 route apis
@@ -55,7 +58,7 @@ export const checkIamDown = (axiosErr: AxiosError) => {
   const isRouteApiDie =
     isDie && (apiUrl.endsWith(AGGREGATOR_API_PATHS.GET_ROUTE) || apiUrl.endsWith(AGGREGATOR_API_PATHS.BUILD_ROUTE))
 
-  const isIamDie = isDie && apiUrl.startsWith(BFF_API)
+  const isIamDie = isDie && apiUrl.startsWith(BFF_API) && !blacklistPathBff.some(path => apiUrl.endsWith(path))
 
   if (isRouteApiDie) {
     ErrorInfo.routeApiError++

diff --git a/src/utils/string.ts b/src/utils/string.ts
@@ -37,7 +37,7 @@ export const escapeScriptHtml = (str: string) => {
   return str.replace(/<.*?script.*?>.*?<\/.*?script.*?>/gim, '')
 }
 
-export const isEmailValid = (value: string | undefined) => value?.match(/\S+@\S+\.\S+/)
+export const isEmailValid = (value: string | undefined) => value?.match(/^\w+([\.-]?\w)*@\w+([\.-]?\w)*(\.\w{2,10})+$/)
 
 export const getChainIdFromSlug = (network: string | undefined) => {
   return Object.values(NETWORKS_INFO).find(n => n.route === network)?.chainId