diff --git a/new-lamassu-admin/src/components/buttons/SubpageButton.js b/new-lamassu-admin/src/components/buttons/SubpageButton.js index c61cd847..f9979cba 100644 --- a/new-lamassu-admin/src/components/buttons/SubpageButton.js +++ b/new-lamassu-admin/src/components/buttons/SubpageButton.js @@ -2,6 +2,7 @@ import { makeStyles } from '@material-ui/core/styles' import classnames from 'classnames' import React, { memo, useState } from 'react' +import { H4 } from 'src/components/typography' import { ReactComponent as CancelIconInverse } from 'src/styling/icons/button/cancel/white.svg' import subpageButtonStyles from './SubpageButton.styles' @@ -30,7 +31,7 @@ const SubpageButton = memo( classes.buttonIconActiveLeft )} /> - {children} +

{children}

{ const classes = useStyles() + const idNumber = R.path(['idCardData', 'documentNumber'])(customer) + const usSsn = R.path(['usSsn'])(customer) + const elements = [ { header: 'Phone number', size: 172, value: getFormattedPhone(customer.phone, locale.country) - }, - { - header: 'ID number', - size: 172, - value: R.path(['idCardData', 'documentNumber'])(customer) ?? '' - }, - { - header: 'US SSN', - size: 127, - value: R.path(['usSsn'])(customer) ?? '' } ] + if (idNumber) + elements.push({ + header: 'ID number', + size: 172, + value: idNumber + }) + + if (usSsn) + elements.push({ + header: 'US SSN', + size: 127, + value: usSsn + }) + const name = getName(customer) return ( diff --git a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js index 67690b3a..bf90193b 100644 --- a/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js +++ b/new-lamassu-admin/src/pages/Customers/components/TransactionsList.js @@ -131,7 +131,7 @@ const TransactionsList = ({ customer, data, loading, locale }) => { {header} @@ -142,7 +142,7 @@ const TransactionsList = ({ customer, data, loading, locale }) => {

{value}

@@ -152,11 +152,7 @@ const TransactionsList = ({ customer, data, loading, locale }) => {

- {loading - ? 'Loading' - : hasData - ? 'All transactions from this customer' - : 'No transactions so far'} + {loading ? 'Loading' : hasData ? '' : 'No transactions so far'}

diff --git a/new-lamassu-admin/src/styling/icons/ID/card/comet.svg b/new-lamassu-admin/src/styling/icons/ID/card/comet.svg index 82524043..0163f2cb 100644 --- a/new-lamassu-admin/src/styling/icons/ID/card/comet.svg +++ b/new-lamassu-admin/src/styling/icons/ID/card/comet.svg @@ -1,11 +1,10 @@ - - - Created with Sketch. - - - - - + + icon/ID/card/new/comet + + + + + - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/card/tomato.svg b/new-lamassu-admin/src/styling/icons/ID/card/tomato.svg index eb66f205..a3effa2d 100644 --- a/new-lamassu-admin/src/styling/icons/ID/card/tomato.svg +++ b/new-lamassu-admin/src/styling/icons/ID/card/tomato.svg @@ -1,11 +1,10 @@ - - - Created with Sketch. - - - - - + + icon/ID/card/new/tomato + + + + + - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/card/white.svg b/new-lamassu-admin/src/styling/icons/ID/card/white.svg index bae5e538..3448f195 100644 --- a/new-lamassu-admin/src/styling/icons/ID/card/white.svg +++ b/new-lamassu-admin/src/styling/icons/ID/card/white.svg @@ -1,11 +1,10 @@ - - - Created with Sketch. - - - - - + + icon/ID/card/new/white + + + + + - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/card/zodiac.svg b/new-lamassu-admin/src/styling/icons/ID/card/zodiac.svg index 6b04169a..14a0fc39 100644 --- a/new-lamassu-admin/src/styling/icons/ID/card/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/ID/card/zodiac.svg @@ -1,9 +1,8 @@ - - - Created with Sketch. - - + + icon/ID/card/new/zodiac + + @@ -12,4 +11,4 @@ - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/phone/comet.svg b/new-lamassu-admin/src/styling/icons/ID/phone/comet.svg index 35a8572b..ea786af7 100644 --- a/new-lamassu-admin/src/styling/icons/ID/phone/comet.svg +++ b/new-lamassu-admin/src/styling/icons/ID/phone/comet.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/phone/new/comet + + - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/phone/tomato.svg b/new-lamassu-admin/src/styling/icons/ID/phone/tomato.svg index ac249b8b..ac4320cc 100644 --- a/new-lamassu-admin/src/styling/icons/ID/phone/tomato.svg +++ b/new-lamassu-admin/src/styling/icons/ID/phone/tomato.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/phone/new/tomato + + - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/phone/white.svg b/new-lamassu-admin/src/styling/icons/ID/phone/white.svg index e36de464..6485d8b9 100644 --- a/new-lamassu-admin/src/styling/icons/ID/phone/white.svg +++ b/new-lamassu-admin/src/styling/icons/ID/phone/white.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/phone/new/white + + - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/phone/zodiac.svg b/new-lamassu-admin/src/styling/icons/ID/phone/zodiac.svg index 883236ab..6454e804 100644 --- a/new-lamassu-admin/src/styling/icons/ID/phone/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/ID/phone/zodiac.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/phone/new/zodiac + + - + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/photo/comet.svg b/new-lamassu-admin/src/styling/icons/ID/photo/comet.svg index 9075da73..ddeb1e5a 100644 --- a/new-lamassu-admin/src/styling/icons/ID/photo/comet.svg +++ b/new-lamassu-admin/src/styling/icons/ID/photo/comet.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/photo/new/comet + + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/photo/tomato.svg b/new-lamassu-admin/src/styling/icons/ID/photo/tomato.svg index 4950345f..77b2e366 100644 --- a/new-lamassu-admin/src/styling/icons/ID/photo/tomato.svg +++ b/new-lamassu-admin/src/styling/icons/ID/photo/tomato.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/photo/new/tomato + + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/photo/white.svg b/new-lamassu-admin/src/styling/icons/ID/photo/white.svg index b29b2c75..1c541cc7 100644 --- a/new-lamassu-admin/src/styling/icons/ID/photo/white.svg +++ b/new-lamassu-admin/src/styling/icons/ID/photo/white.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/photo/new/white + + \ No newline at end of file diff --git a/new-lamassu-admin/src/styling/icons/ID/photo/zodiac.svg b/new-lamassu-admin/src/styling/icons/ID/photo/zodiac.svg index d25effb3..b02095e1 100644 --- a/new-lamassu-admin/src/styling/icons/ID/photo/zodiac.svg +++ b/new-lamassu-admin/src/styling/icons/ID/photo/zodiac.svg @@ -1,8 +1,7 @@ - - - Created with Sketch. - - + + icon/ID/photo/new/zodiac + + \ No newline at end of file