Merge pull request #103 from CudoVentures/cudos-dev

Cudos dev merge for release 1.0.3

src/components/Dialog/components/DelegationModal/index.tsx

@@ -11,9 +11,11 @@ const DelegationModal: React.FC = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({
-      ...initialDelegationModalState
-    })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({
+        ...initialDelegationModalState
+      })
+    }
   }
 
   const handleTryAgain = () => {

src/components/Layout/Footer.tsx

@@ -1,33 +1,36 @@
 import { Box, Grid, Typography } from '@mui/material'
-import FooterLogo from 'assets/vectors/logo-footer.svg'
-import RedditIcon from 'assets/vectors/reddit.svg?component'
+import moment from 'moment'
 import TwitterIcon from 'assets/vectors/twitter.svg?component'
 import TelegramIcon from 'assets/vectors/telegram.svg?component'
 import DiscordIcon from 'assets/vectors/discord.svg?component'
-
+import LinkedInIcon from 'assets/vectors/linkedin.svg?component'
+import MediumIcon from 'assets/vectors/medium.svg?component'
+import YouTubeIcon from 'assets/vectors/youtube.svg?component'
+import FacebookIcon from 'assets/vectors/facebook.svg?component'
+import SpotifyIcon from 'assets/vectors/spotify.svg?component'
 import { styles } from './styles'
 
 const linksLeft = [
-  { text: 'FAQ', url: 'https://www.cudos.org/' },
-  { text: 'Terms & Conditions', url: 'https://www.cudos.org/' },
-  { text: 'Privacy Policy', url: 'https://www.cudos.org/' },
+  { text: 'Terms & Conditions', url: 'https://www.cudos.org/terms-and-conditions/' },
+  { text: 'Privacy Policy', url: 'https://www.cudos.org/privacy-policy' },
   { text: 'cudos.org', url: 'https://www.cudos.org/' },
-  { text: 'License © 2018 - 2022', url: 'https://www.cudos.org/' }
+  { text: `License © 2018 - ${moment().year()}`, url: 'https://www.cudos.org/' }
 ]
 
 const linksRight = [
-  // { icon: <RedditIcon />, url: 'https://www.cudos.org/' },
   { icon: <TwitterIcon />, url: 'https://twitter.com/CUDOS_' },
   { icon: <TelegramIcon />, url: 'https://t.me/cudostelegram' },
-  { icon: <DiscordIcon />, url: 'https://discord.com/invite/t397SKqf4u' }
+  { icon: <DiscordIcon />, url: 'https://discord.com/invite/t397SKqf4u' },
+  { icon: <LinkedInIcon />, url: 'https://www.linkedin.com/company/cudos1' },
+  { icon: <MediumIcon />, url: 'https://medium.com/cudos' },
+  { icon: <YouTubeIcon />, url: 'https://www.youtube.com/c/CUDOS' },
+  { icon: <FacebookIcon />, url: 'https://www.facebook.com/cudos.org' },
+  { icon: <SpotifyIcon />, url: 'https://open.spotify.com/show/2lZuBXJ270g7taK06tnK35' }
 ]
 
 const Footer = () => {
   return (
     <Box sx={styles.footerContainer} gap={6}>
-      <Grid item>
-        <img src={FooterLogo} alt="logo" />
-      </Grid>
       <Box display="flex" alignItems="center">
         {linksLeft.map((link) => (
           <Grid

src/containers/Dashboard/WalletInformation/components/ClaimRewardsModal/index.tsx

@@ -11,9 +11,11 @@ const RewardsClaimModal: React.FC = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({
-      ...initialRewardsModalProps
-    })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({
+        ...initialRewardsModalProps
+      })
+    }
   }
 
   const handleTryAgain = () => {

src/containers/Faucet/components/Activity/index.tsx

@@ -31,7 +31,7 @@ const Activity = () => {
     ),
     timestamp: (
       <Typography variant="body2" color="text.secondary">
-        {moment(new Date(item.timestamp.parseZone().fromNow(true)))}
+        {moment(new Date(item.timestamp)).parseZone().fromNow(true)}
       </Typography>
     )
   }))

src/containers/Faucet/components/FaucetModal/index.tsx

@@ -10,9 +10,11 @@ const FaucetModal = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({
-      ...initialFaucetModalProps
-    })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({
+        ...initialFaucetModalProps
+      })
+    }
   }
 
   const renderComponent = () => {

src/containers/Faucet/components/Form/index.tsx

@@ -10,16 +10,30 @@ import CosmosNetworkConfig from 'ledgers/CosmosNetworkConfig'
 import { ModalStatus } from 'store/modal'
 import useModal from '../FaucetModal/hooks'
 import { styles } from './styles'
+import { isValidCudosAddress } from 'utils/projectUtils'
 
 const Form = () => {
   const captchaRef = useRef<any>(null)
   const [address, setAddress] = useState<string>('')
   const [amount, setAmount] = useState<string>('')
   const [showTransferBtn, setShowTransferBtn] = useState<boolean>(false)
   const { setWarning } = useNotifications()
+  const maxAmountAllowed: number = 100
 
   const { handleModal } = useModal()
 
+  const validInput = () => {
+
+    if (
+      Number(amount) > maxAmountAllowed || Number(amount) <= 0 ||
+      !amount || !address
+    ) {
+      return false
+    }
+
+    return true
+  }
+
   const handleAddress = (
     ev: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
   ) => {
@@ -34,15 +48,19 @@ const Form = () => {
 
   const checkCaptcha = async () => {
     const token = captchaRef.current.getValue()
+    const validatedInput = validInput()
 
-    if (!amount) {
-      captchaRef.current.reset()
-    }
-    if (token) {
+    if (token && validatedInput) {
       setShowTransferBtn(true)
-    } else {
-      setShowTransferBtn(false)
+      return
+    }
+
+    if (!validatedInput) {
+      setWarning('Please fill the required fields first')
     }
+
+    captchaRef.current.reset()
+    setShowTransferBtn(false)
   }
 
   const handleReceiveTokens = async () => {
@@ -52,10 +70,7 @@ const Form = () => {
       .multipliedBy(CosmosNetworkConfig.CURRENCY_1_CUDO)
       .toString(10)
 
-    const re = /^cudos[0-9a-z]{39}$/
-    const correctCudosAddress = address.match(re)
-
-    if (!correctCudosAddress) {
+    if (!isValidCudosAddress(address)) {
       setWarning('Wrong CUDOS Address Format')
       return
     }
@@ -77,7 +92,7 @@ const Form = () => {
           status: ModalStatus.FAILURE,
           failureMessage: {
             title: 'Transaction failed!',
-            subtitle: 'Maximum amount of 10 CUDOS reached for this account.'
+            subtitle: 'Maximum amount of 100 CUDOS reached for this account.'
           }
         })
       } else {
@@ -103,7 +118,7 @@ const Form = () => {
     <Card sx={{ padding: 0, flex: 1 }}>
       <Box sx={styles.formContainer}>
         <Typography variant="h5" fontWeight={900}>
-          Receive 10 Testnet CUDOS tokens
+          Receive Testnet CUDOS tokens
         </Typography>
         <Stack sx={{ width: '100%' }}>
           <Typography variant="body2" fontWeight={700}>
@@ -132,7 +147,7 @@ const Form = () => {
         </Stack>
         <Stack sx={{ width: '100%' }}>
           <Typography variant="body2" fontWeight={700}>
-            Amount (Maximum 10 CUDOS)
+            Amount (Maximum 100 CUDOS)
           </Typography>
           <StyledTextField
             variant="standard"
@@ -175,13 +190,7 @@ const Form = () => {
             width: '50%'
           })}
           onClick={handleReceiveTokens}
-          disabled={
-            Number(amount) > 10 ||
-            !amount ||
-            Number(amount) <= 0 ||
-            !showTransferBtn ||
-            !address
-          }
+          disabled={!showTransferBtn || !validInput()}
         >
           Receive Tokens
         </Button>

src/containers/Proposals/components/DepositModal/index.tsx

@@ -11,9 +11,11 @@ const DepositModal = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({
-      ...initialDepositModalState
-    })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({
+        ...initialDepositModalState
+      })
+    }
   }
 
   const handleTryAgain = () => {

src/containers/Proposals/components/ProposalModal/index.tsx

@@ -11,9 +11,11 @@ const ProposalModal = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({
-      ...initialProposalModalState
-    })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({
+        ...initialProposalModalState
+      })
+    }
   }
 
   const handleTryAgain = () => {

src/containers/Proposals/components/VotingModal/index.tsx

@@ -11,7 +11,9 @@ const VotingModal = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({ ...initialVotingModalState })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({ ...initialVotingModalState })
+    }
   }
 
   const handleTryAgain = () => {

src/containers/ValidatorDetails/components/Details/components/ValidatorInfo/components/RedelegationModal/index.tsx

@@ -11,9 +11,11 @@ const DelegationModal: React.FC = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({
-      ...initialRedelegationModalState
-    })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({
+        ...initialRedelegationModalState
+      })
+    }
   }
 
   const handleTryAgain = () => {

src/containers/ValidatorDetails/components/Details/components/ValidatorInfo/components/UndelegationModal/index.tsx

@@ -11,9 +11,11 @@ const DelegationModal: React.FC = () => {
   const { open, status } = modal
 
   const handleClose = () => {
-    handleModal({
-      ...initialUndelegationModalState
-    })
+    if (status !== ModalStatus.LOADING) {
+      handleModal({
+        ...initialUndelegationModalState
+      })
+    }
   }
 
   const handleTryAgain = () => {