chore(backport): fix(notifier): makes exp date calc safer

.github/workflows/backport.yml

@@ -15,5 +15,5 @@ jobs:
       - name: backport
         uses: rsksmart/rif-marketplace-backport@v1
         with:
-          branches: develop,staging,testnet,mainnet
+          branches: develop,testnet,mainnet
           github_token: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rif-marketplace-ui",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "description": "RIF Marketplace provides a digital catalogue with a wide range of decentralised services.",
   "keywords": [
     "RIF",
@@ -107,4 +107,4 @@
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.ts"
     }
   }
-}
+}

src/components/molecules/ExpirationDate.tsx

@@ -1,4 +1,4 @@
-import Typography from '@material-ui/core/Typography'
+import Typography, { TypographyProps } from '@material-ui/core/Typography'
 import React, { FC } from 'react'
 import { getShortDateString } from 'utils/dateUtils'
 import {
@@ -35,10 +35,10 @@ type Props = {
   className?: string
   date: Date
   type: SubscriptionExpirationType
-}
+} & TypographyProps
 
 const ExpirationDate: FC<Props> = ({
-  className = '', date, type,
+  className = '', date, type, ...typoProps
 }) => {
   const classes = useStyles()
 
@@ -51,7 +51,7 @@ const ExpirationDate: FC<Props> = ({
       className={`${classes[type]} ${className}`}
     >
       <Grid item>
-        <Typography variant="body2">
+        <Typography variant="body2" {...typoProps}>
           {getShortDateString(date)}
         </Typography>
       </Grid>

src/components/molecules/RifAddress.tsx

@@ -1,15 +1,18 @@
 import Typography, { TypographyProps } from '@material-ui/core/Typography'
-import { CopyTextTooltip } from '@rsksmart/rif-ui'
+import { CopyTextTooltip, shortenString } from '@rsksmart/rif-ui'
 import React, { FC } from 'react'
 import { shortChecksumAddress } from 'utils/stringUtils'
 
 export interface RifAddressProps extends TypographyProps {
   pretext?: string
   value: string
+  disableChecksum?: boolean
 }
 
-const RifAddress: FC<RifAddressProps> = ({ pretext, value, ...rest }) => {
-  const address = shortChecksumAddress(value)
+const RifAddress: FC<RifAddressProps> = ({
+  pretext, value, disableChecksum, ...rest
+}) => {
+  const address = disableChecksum ? shortenString(value) : shortChecksumAddress(value)
 
   const displayElement = (
     <Typography {...rest}>

src/components/molecules/index.ts

@@ -9,7 +9,7 @@ export {
   CombinedPriceCell,
   IconedItem,
   ReturnButton,
-  RifAddress as AddressItem,
+  RifAddress,
   JobDoneBox,
   SelectRowButton,
 }

src/components/organisms/notifier/buy/CheckoutStepper.tsx

@@ -19,9 +19,16 @@ type Props = {
 }
 
 const getExpirationDate = (daysLeft: number): Date => {
+<<<<<<< HEAD
+  const expirationDate = new Date()
+  expirationDate.setUTCHours(0, 0, 0, 0)
+  expirationDate.setUTCDate(expirationDate.getDate() + daysLeft)
+  return new Date(expirationDate)
+=======
   const retDate = new Date()
   retDate.setDate(retDate.getDate() + daysLeft)
   return retDate
+>>>>>>> dab6224 (fix(notifier): makes exp date calc safer)
 }
 
 const CheckoutStepper: FC<Props> = (

src/components/organisms/rns/sell/MyDomains.tsx

@@ -1,4 +1,4 @@
-import { AddressItem, SelectRowButton } from 'components/molecules'
+import { RifAddress, SelectRowButton } from 'components/molecules'
 import DomainFilters from 'components/organisms/filters/DomainFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
 import { RnsDomain } from 'models/marketItems/DomainItem'
@@ -70,7 +70,7 @@ const MyDomains: FC = () => {
             maxLength={30}
           />
         )
-        : <AddressItem pretext="Unknown RNS:" value={tokenId} />
+        : <RifAddress pretext="Unknown RNS:" value={tokenId} />
 
       const isProcessingConfs = pendingConfs.some(
         ({ contractActionData }) => (

src/components/organisms/rns/sell/MyOffers.tsx

@@ -1,6 +1,6 @@
 import IconButton from '@material-ui/core/IconButton'
 import ClearIcon from '@material-ui/icons/Clear'
-import { AddressItem, CombinedPriceCell, SelectRowButton } from 'components/molecules'
+import { RifAddress, CombinedPriceCell, SelectRowButton } from 'components/molecules'
 import DomainFilters from 'components/organisms/filters/DomainFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
 import { RnsDomain } from 'models/marketItems/DomainItem'
@@ -76,7 +76,7 @@ const MyOffers: FC = () => {
             maxLength={30}
           />
         )
-        : <AddressItem pretext="Unknown RNS:" value={tokenId} />
+        : <RifAddress pretext="Unknown RNS:" value={tokenId} />
 
       const isProcessingConfs = pendingConfs.some(
         ({ contractActionData }) => (

src/components/organisms/rns/sell/SoldDomains.tsx

@@ -1,4 +1,4 @@
-import { AddressItem, CombinedPriceCell } from 'components/molecules'
+import { RifAddress, CombinedPriceCell } from 'components/molecules'
 import DomainFilters from 'components/organisms/filters/DomainFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
 import { RnsSoldDomain } from 'models/marketItems/DomainItem'
@@ -52,12 +52,12 @@ const SoldDomains: FC<{}> = () => {
       const pseudoResolvedName = name && `${name}.rsk`
       const displayDomainName = domainName || pseudoResolvedName
         ? <ShortenTextTooltip value={domainName || pseudoResolvedName as string} maxLength={30} />
-        : <AddressItem pretext="Unknown RNS:" value={tokenId} />
+        : <RifAddress pretext="Unknown RNS:" value={tokenId} />
 
       const displayItem = {
         id,
         domainName: displayDomainName,
-        buyer: <AddressItem value={buyer} />,
+        buyer: <RifAddress value={buyer} />,
         currency: displayName,
         sellingPrice: <CombinedPriceCell
           price={price.toString()}

src/components/organisms/storage/agreements/DetailsModal.tsx

@@ -7,7 +7,6 @@ import {
 } from '@rsksmart/rif-ui'
 /* eslint-disable-next-line import/no-unresolved */
 import { ModalProps } from '@rsksmart/rif-ui/dist/components/atoms/modal/Modal'
-import GridColumn from 'components/atoms/GridColumn'
 import GridItem from 'components/atoms/GridItem'
 import RifCard from 'components/organisms/RifCard'
 import { AgreementCustomerView, AgreementProviderView } from 'components/organisms/storage/agreements/utils'
@@ -35,7 +34,9 @@ const useModalStyles = makeStyles((theme: Theme) => ({
   },
 }))
 
-const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions }) => {
+const DetailsModal: FC<DetailsModalProps> = ({
+  modalProps, itemDetails, actions,
+}) => {
   const modalCardStyleClasses = useModalStyles()
   return (
     <Modal
@@ -55,8 +56,11 @@ const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions
             <ModalHeader className={modalCardStyleClasses.modalWidth}>
               <ModalTitle>{itemDetails?.title}</ModalTitle>
             </ModalHeader>
-            <GridColumn
+            <Grid
+              container
               spacing={2}
+              wrap="nowrap"
+              direction="column"
               className={modalCardStyleClasses.itemDetails}
             >
               {itemDetails ? Object.keys(itemDetails)
@@ -68,6 +72,7 @@ const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions
                     container
                     direction="row"
                     spacing={6}
+                    wrap="nowrap"
                     xs={12}
                   >
                     <GridItem
@@ -84,7 +89,7 @@ const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions
                     <GridItem xs={6}>{itemDetails[key]}</GridItem>
                   </Grid>
                 )) : ''}
-            </GridColumn>
+            </Grid>
           </RifCard>
         </ModalBody>
       </>