fix: UI/UX tweaks

new-lamassu-admin/src/pages/Blacklist/Blacklist.styles.js

@@ -1,4 +1,4 @@
-import { spacer, white, errorColor } from 'src/styling/variables'
+import { spacer, white } from 'src/styling/variables'
 const styles = {
   grid: {
     flex: 1,
@@ -32,7 +32,7 @@ const styles = {
     marginLeft: 8
   },
   error: {
-    color: errorColor
+    marginTop: 20
   }
 }
 

new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js

@@ -5,6 +5,7 @@ import * as R from 'ramda'
 import React from 'react'
 import * as Yup from 'yup'
 
+import ErrorMessage from 'src/components/ErrorMessage'
 import Modal from 'src/components/Modal'
 import { Link } from 'src/components/buttons'
 import { TextInput } from 'src/components/inputs/formik'
@@ -32,7 +33,10 @@ const BlackListModal = ({
     LTC: 'LPKvbjwV1Kaksktzkr7TMK3FQtQEEe6Wqa',
     DASH: 'XqQ7gU8eM76rEfey726cJpT2RGKyJyBrcn',
     ZEC: 't1KGyyv24eL354C9gjveBGEe8Xz9UoPKvHR',
-    BCH: 'qrd6za97wm03lfyg82w0c9vqgc727rhemg5yd9k3dm'
+    BCH: 'qrd6za97wm03lfyg82w0c9vqgc727rhemg5yd9k3dm',
+    USDT: '0x5754284f345afc66a98fbb0a0afe71e0f007b949',
+    XMR:
+      '888tNkZrPN6JsEgekjMnABU4TBzc2Dt29EPAvkRxbANsAnjyPbb3iQ1YBRk1UXcdRsiKc9dhwMVgN5S9cQUiyoogDavup3H'
   }
 
   return (
@@ -53,9 +57,8 @@ const BlackListModal = ({
             .trim()
             .required('An address is required')
         })}
-        onSubmit={({ address }, { resetForm }) => {
+        onSubmit={({ address }) => {
           handleAddToBlacklist(address.trim())
-          resetForm()
         }}>
         <Form id="address-form">
           <H3 className={classes.modalTitle}>
@@ -63,7 +66,6 @@ const BlackListModal = ({
               ? `Blacklist ${R.toLower(selectedCoin.display)} address`
               : ''}
           </H3>
-          <span className={classes.error}>{errorMsg}</span>
           <Field
             name="address"
             fullWidth
@@ -72,6 +74,9 @@ const BlackListModal = ({
             placeholder={`ex: ${placeholderAddress[selectedCoin.code]}`}
             component={TextInput}
           />
+          {!R.isNil(errorMsg) && (
+            <ErrorMessage className={classes.error}>{errorMsg}</ErrorMessage>
+          )}
         </Form>
       </Formik>
       <div className={classes.footer}>

new-lamassu-admin/src/pages/Funding.js

@@ -212,7 +212,9 @@ const Funding = () => {
               <div className={classes.addressWrapper}>
                 <div className={classes.mono}>
                   <strong>
-                    <CopyToClipboard buttonClassname={classes.copyToClipboard}>
+                    <CopyToClipboard
+                      buttonClassname={classes.copyToClipboard}
+                      key={selected.cryptoCode}>
                       {formatAddress(
                         selected.cryptoCode,
                         selected.fundingAddress

new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js

@@ -8,7 +8,6 @@ import { DeleteDialog } from 'src/components/DeleteDialog'
 import { Link, Button, IconButton } from 'src/components/buttons'
 import DataTable from 'src/components/tables/DataTable'
 import { Label3, TL1 } from 'src/components/typography'
-import { ReactComponent as CardIdIcon } from 'src/styling/icons/ID/card/zodiac.svg'
 import { ReactComponent as PhoneIdIcon } from 'src/styling/icons/ID/phone/zodiac.svg'
 import { ReactComponent as DeleteIcon } from 'src/styling/icons/action/delete/enabled.svg'
 
@@ -49,7 +48,6 @@ const GET_CUSTOMERS = gql`
       id
       phone
       idCardData
-      phone
     }
   }
 `
@@ -102,12 +100,6 @@ const IndividualDiscounts = () => {
           <div className={classes.identification}>
             <PhoneIdIcon />
             <span>{customer.phone}</span>
-            {customer?.idCardData?.documentNumber && (
-              <>
-                <CardIdIcon />
-                <span>{customer?.idCardData?.documentNumber}</span>
-              </>
-            )}
           </div>
         )
       }

new-lamassu-admin/src/pages/Triggers/Wizard.js

@@ -183,10 +183,10 @@ const InfoPanel = ({ step, config = {}, liveValues = {}, currency }) => {
   return (
     <>
       <H5 className={classes.infoTitle}>Trigger overview so far</H5>
-      <Info3 noMargin className={classes.infoText}>
+      <Info3 noMargin>
         {oldText}
         {step !== 1 && ', '}
-        {newText}
+        <span className={classes.infoCurrentText}>{newText}</span>
         {!isLastStep && '...'}
       </Info3>
     </>

new-lamassu-admin/src/pages/Triggers/components/helper.js

@@ -61,7 +61,7 @@ const getDefaultSettings = () => {
   return [
     {
       name: 'expirationTime',
-      header: 'Expiration Time',
+      header: 'Expiration time',
       width: 196,
       size: 'sm',
       editable: false
@@ -101,7 +101,7 @@ const getOverrides = () => {
     },
     {
       name: 'expirationTime',
-      header: 'Expiration Time',
+      header: 'Expiration time',
       width: 196,
       size: 'sm',
       editable: false