Merge pull request #256 from chain4travel/suite

Link Styling Enhancement and Currency Display Fix
chain4travel · Sep 30, 2024 · 5e27518 · 5e27518
2 parents 96a9547 + f01cfcc
commit 5e27518
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 20 deletions.
diff --git a/src/components/Partners/PartnerCard.tsx b/src/components/Partners/PartnerCard.tsx
@@ -47,7 +47,7 @@ const PartnerCard: React.FC<PartnerCardProps> = ({ partner, clickable, onClick }
     useEffect(() => {
         if (pChainAddresses) {
             let partnerAddresses = pChainAddresses.find(
-                elem => elem.Network.toLowerCase() === activeNetwork.name.toLowerCase(),
+                elem => elem.Network.toLowerCase() === activeNetwork?.name?.toLowerCase(),
             )
             if (partnerAddresses) chackValidatorStatus(partnerAddresses.pAddress)
         }

diff --git a/src/helpers/useSmartContract.tsx b/src/helpers/useSmartContract.tsx
@@ -114,12 +114,12 @@ export const SmartContractProvider: React.FC<SmartContractProviderProps> = ({ ch
         )
         try {
             if (
-                activeNetwork.name.toLowerCase() !== 'columbus' &&
-                activeNetwork.name.toLowerCase() !== 'camino'
+                activeNetwork?.name?.toLowerCase() !== 'columbus' &&
+                activeNetwork?.name?.toLowerCase() !== 'camino'
             )
                 return
             let contractAddress =
-                activeNetwork.name.toLowerCase() === 'columbus'
+                activeNetwork?.name?.toLowerCase() === 'columbus'
                     ? CONTRACTCMACCOUNTMANAGERADDRESSCOLUMBUS
                     : CONTRACTCMACCOUNTMANAGERADDRESSCAMINO
             if (auth) {
@@ -148,8 +148,8 @@ export const SmartContractProvider: React.FC<SmartContractProviderProps> = ({ ch
     const path = window.location.pathname
     useEffect(() => {
         if (
-            activeNetwork.name.toLowerCase() === 'columbus' ||
-            activeNetwork.name.toLowerCase() === 'camino'
+            activeNetwork?.name?.toLowerCase() === 'columbus' ||
+            activeNetwork?.name?.toLowerCase() === 'camino'
         ) {
             setAccountReadContract(null)
             setAccountWriteContract(null)

diff --git a/src/layout/PartnersLayout.tsx b/src/layout/PartnersLayout.tsx
@@ -41,7 +41,17 @@ const ClaimProfile = () => {
                 first.
             </Typography>
             <Typography variant="body2" textAlign={'center'}>
-                Contact the Camino Network Foundation via <Link onClick={generateEmail}>email</Link>{' '}
+                Contact the Camino Network Foundation via{' '}
+                <Link
+                    component="a"
+                    sx={{
+                        color: theme => theme.palette.text.primary,
+                        textDecorationColor: 'inherit',
+                    }}
+                    onClick={generateEmail}
+                >
+                    email
+                </Link>{' '}
                 to proceed.
             </Typography>
             <Button
@@ -94,7 +104,7 @@ const PartnersLayout = () => {
 
     const partnerCChainAddress = useMemo(() => {
         let cAddress = data?.attributes?.cChainAddresses.find(
-            elem => elem.Network === activeNetwork.name.toLowerCase(),
+            elem => elem.Network === activeNetwork?.name?.toLowerCase(),
         )
         if (cAddress) return cAddress
         return ''
@@ -103,8 +113,8 @@ const PartnersLayout = () => {
     if (
         path.includes('partners/messenger-configuration') &&
         !store.state.isAuth &&
-        (activeNetwork.name.toLowerCase() !== 'columbus' ||
-            activeNetwork.name.toLowerCase() !== 'camino')
+        (activeNetwork?.name?.toLowerCase() !== 'columbus' ||
+            activeNetwork?.name?.toLowerCase() !== 'camino')
     ) {
         return <Navigate to="/login" replace />
     }

diff --git a/src/views/landing/LandingPage.tsx b/src/views/landing/LandingPage.tsx
@@ -1,12 +1,12 @@
 import { Box, Grid, Typography } from '@mui/material'
 import { changeActiveApp, getAllApps } from '../../redux/slices/app-config'
 
-import LandingPageAppWidget from './LandingPageAppWidget'
 import React from 'react'
-import { getActiveNetwork } from '../../redux/slices/network'
-import { useAppSelector } from '../../hooks/reduxHooks'
 import { useDispatch } from 'react-redux'
 import { useNavigate } from 'react-router'
+import { useAppSelector } from '../../hooks/reduxHooks'
+import { getActiveNetwork } from '../../redux/slices/network'
+import LandingPageAppWidget from './LandingPageAppWidget'
 
 export default function LandingPage() {
     const activeNetwork = useAppSelector(getActiveNetwork)

diff --git a/src/views/partners/MatchingPartners.tsx b/src/views/partners/MatchingPartners.tsx
@@ -1,11 +1,12 @@
 import { Box, Typography } from '@mui/material'
 import React, { useEffect, useMemo } from 'react'
 import { useNavigate } from 'react-router'
+import store from 'wallet/store'
 import PartnerCard from '../../components/Partners/PartnerCard'
 import { usePartnerConfigurationContext } from '../../helpers/partnerConfigurationContext'
 import { useSmartContract } from '../../helpers/useSmartContract'
 import { useAppSelector } from '../../hooks/reduxHooks'
-import { useListMatchingPartnersQuery } from '../../redux/services/partners'
+import { useIsPartnerQuery, useListMatchingPartnersQuery } from '../../redux/services/partners'
 import { getActiveNetwork } from '../../redux/slices/network'
 
 const MatchingPartners = ({ state }) => {
@@ -21,29 +22,45 @@ const MatchingPartners = ({ state }) => {
         supportedResult: value?.state?.stepsConfig[1]?.services,
         wantedResult: value?.state?.stepsConfig[2]?.services,
     })
+    const { data, refetch: refetchIsPartner } = useIsPartnerQuery({
+        cChainAddress: store?.state?.activeWallet?.ethAddress
+            ? '0x' + store?.state?.activeWallet?.ethAddress
+            : '',
+    })
     const activeNetwork = useAppSelector(getActiveNetwork)
     const sc = useSmartContract()
     const matchingPartnersFiltred = useMemo(() => {
         return partners?.data
             ? partners?.data?.filter(elem => {
                   let address = elem?.attributes?.cChainAddresses.find(
-                      elem => elem.Network.toLowerCase() === activeNetwork.name.toLowerCase(),
+                      elem => elem.Network.toLowerCase() === activeNetwork?.name?.toLowerCase(),
                   )?.cAddress
                   if (address !== sc?.wallet?.address) return true
                   return false
               })
             : []
     }, [partners])
+    const partnerCChainAddress = useMemo(() => {
+        let cAddress = data?.attributes?.cChainAddresses.find(
+            elem => elem.Network === activeNetwork?.name?.toLowerCase(),
+        )
+        if (cAddress) return cAddress
+        return ''
+    }, [data])
     useEffect(() => {
-        if (activeNetwork) refetch()
+        if (activeNetwork) {
+            refetch()
+            refetchIsPartner()
+        }
     }, [activeNetwork])
     const navigate = useNavigate()
     if (
         isLoading ||
         isFetching ||
         error ||
         !matchingPartnersFiltred ||
-        matchingPartnersFiltred?.length === 0
+        matchingPartnersFiltred?.length === 0 ||
+        !partnerCChainAddress
     )
         return <></>
     return (

diff --git a/src/views/partners/Partner.tsx b/src/views/partners/Partner.tsx
@@ -607,13 +607,14 @@ const Partner = () => {
                                     wantedServices={state.stepsConfig[2].services}
                                     supportedServices={state.stepsConfig[1].services}
                                     CMAccountAddress={value?.contractCMAccountAddress}
+                                    supportedCurrencies={partner.supportedCurrencies}
+                                    partner={partner}
                                 />
                             ) : (
                                 OwnBusinsessNotOnMessenger
                             )}
                         </Box>
                     ) : (
-                        // <></>
                         partner.contractAddress && (
                             <Box
                                 sx={{

diff --git a/src/views/settings/Links.tsx b/src/views/settings/Links.tsx
@@ -98,8 +98,8 @@ export default function Links({ type = 'else', partner }: { type?: string; partn
         />,
         auth &&
             store.state.activeWallet?.type !== 'multisig' &&
-            (activeNetwork.name.toLowerCase() === 'columbus' ||
-                activeNetwork.name.toLowerCase() === 'camino') && (
+            (activeNetwork?.name?.toLowerCase() === 'columbus' ||
+                activeNetwork?.name?.toLowerCase() === 'camino') && (
                 <Tab
                     onClick={() => navigate('/partners/messenger-configuration')}
                     className="tab"