diff --git a/new-lamassu-admin/src/pages/Blacklist/Blacklist.styles.js b/new-lamassu-admin/src/pages/Blacklist/Blacklist.styles.js
index 107b7698..f3323253 100644
--- a/new-lamassu-admin/src/pages/Blacklist/Blacklist.styles.js
+++ b/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
}
}
diff --git a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js b/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
index 048257af..4c13881b 100644
--- a/new-lamassu-admin/src/pages/Blacklist/BlacklistModal.js
+++ b/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()
}}>
diff --git a/new-lamassu-admin/src/pages/Funding.js b/new-lamassu-admin/src/pages/Funding.js
index 98d46d6e..57880205 100644
--- a/new-lamassu-admin/src/pages/Funding.js
+++ b/new-lamassu-admin/src/pages/Funding.js
@@ -212,7 +212,9 @@ const Funding = () => {
-
+
{formatAddress(
selected.cryptoCode,
selected.fundingAddress
diff --git a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js b/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js
index b9585d76..6e261234 100644
--- a/new-lamassu-admin/src/pages/LoyaltyPanel/IndividualDiscounts.js
+++ b/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 = () => {
{customer.phone}
- {customer?.idCardData?.documentNumber && (
- <>
-
-
{customer?.idCardData?.documentNumber}
- >
- )}
)
}
diff --git a/new-lamassu-admin/src/pages/Triggers/Wizard.js b/new-lamassu-admin/src/pages/Triggers/Wizard.js
index cef065f6..44eb7875 100644
--- a/new-lamassu-admin/src/pages/Triggers/Wizard.js
+++ b/new-lamassu-admin/src/pages/Triggers/Wizard.js
@@ -183,10 +183,10 @@ const InfoPanel = ({ step, config = {}, liveValues = {}, currency }) => {
return (
<>
Trigger overview so far
-
+
{oldText}
{step !== 1 && ', '}
- {newText}
+ {newText}
{!isLastStep && '...'}
>
diff --git a/new-lamassu-admin/src/pages/Triggers/components/helper.js b/new-lamassu-admin/src/pages/Triggers/components/helper.js
index 54216b91..0737bca8 100644
--- a/new-lamassu-admin/src/pages/Triggers/components/helper.js
+++ b/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