diff --git a/lib/customers.js b/lib/customers.js index 27589b16..d53534a3 100644 --- a/lib/customers.js +++ b/lib/customers.js @@ -137,12 +137,6 @@ async function updateCustomer (id, data, userToken) { await db.none(sql, [id]) } - if (data.subscriberInfo) { - await Promise.all([getCustomerById(id), settingsLoader.loadLatest()]) - .then(([customer, config]) => sms.getLookup(config, customer.phone)) - .then(res => updateSubscriberData(id, res, userToken)) - .catch(logger.error) - } invalidateCustomerNotifications(id, formattedData) return getCustomerById(id) } diff --git a/lib/new-admin/graphql/types/customer.type.js b/lib/new-admin/graphql/types/customer.type.js index b24a1bfa..3c6b00fd 100644 --- a/lib/new-admin/graphql/types/customer.type.js +++ b/lib/new-admin/graphql/types/customer.type.js @@ -68,7 +68,6 @@ const typeDef = gql` lastTxFiatCode: String lastTxClass: String suspendedUntil: DateTimeISO - subscriberInfo: Boolean phoneOverride: String } diff --git a/lib/plugins/sms/inforu/inforu.js b/lib/plugins/sms/inforu/inforu.js index b1143b64..1453ca7f 100644 --- a/lib/plugins/sms/inforu/inforu.js +++ b/lib/plugins/sms/inforu/inforu.js @@ -40,12 +40,7 @@ function sendMessage (account, rec) { }) } -function getLookup () { - throw new Error('inforu error: lookup not supported') -} - module.exports = { NAME, - sendMessage, - getLookup + sendMessage } diff --git a/lib/plugins/sms/mock-sms/mock-sms.js b/lib/plugins/sms/mock-sms/mock-sms.js index 447180b8..1bd021b3 100644 --- a/lib/plugins/sms/mock-sms/mock-sms.js +++ b/lib/plugins/sms/mock-sms/mock-sms.js @@ -2,17 +2,6 @@ const _ = require('lodash/fp') const NAME = 'MockSMS' -function getLookup (account, number) { - console.log('Looking up number: %j', number) - return new Promise((resolve, reject) => { - if (_.endsWith('666', number)) { - reject (new Error(`${exports.NAME} mocked error!`)) - } else { - setTimeout(resolve, 1) - } - }) -} - function sendMessage (account, rec) { console.log('Sending SMS: %j', rec) return new Promise((resolve, reject) => { @@ -26,6 +15,5 @@ function sendMessage (account, rec) { module.exports = { NAME, - sendMessage, - getLookup + sendMessage } diff --git a/lib/plugins/sms/telnyx/telnyx.js b/lib/plugins/sms/telnyx/telnyx.js index 10253e82..74c3bcd0 100644 --- a/lib/plugins/sms/telnyx/telnyx.js +++ b/lib/plugins/sms/telnyx/telnyx.js @@ -15,13 +15,7 @@ function sendMessage (account, rec) { }) } -function getLookup () { - throw new Error('Telnyx error: lookup not supported') -} - - module.exports = { NAME, - sendMessage, - getLookup + sendMessage } diff --git a/lib/plugins/sms/twilio/twilio.js b/lib/plugins/sms/twilio/twilio.js index bdfc3843..cedd6952 100644 --- a/lib/plugins/sms/twilio/twilio.js +++ b/lib/plugins/sms/twilio/twilio.js @@ -37,33 +37,7 @@ function sendMessage (account, rec) { }) } -function getLookup (account, number) { - return Promise.resolve() - .then(() => { - const client = twilio(account.accountSid, account.authToken) - return client.lookups.v1.phoneNumbers(number) - .fetch({ addOns: ['lamassu_ekata'] }) - }) - .then(info => info.addOns.results['lamassu_ekata']) - .then(info => { - if (info.status !== 'successful') { - throw new Error(`Twilio error: ${info.message}`) - } - return info - }) - .catch(err => { - if (_.includes(err.code, BAD_NUMBER_CODES)) { - const badNumberError = new Error(err.message) - badNumberError.name = 'BadNumberError' - throw badNumberError - } - - throw new Error(`Twilio error: ${err.message}`) - }) -} - module.exports = { NAME, - sendMessage, - getLookup + sendMessage } diff --git a/lib/plugins/sms/vonage/vonage.js b/lib/plugins/sms/vonage/vonage.js index e945f818..2582f695 100644 --- a/lib/plugins/sms/vonage/vonage.js +++ b/lib/plugins/sms/vonage/vonage.js @@ -20,12 +20,7 @@ function sendMessage (account, rec) { }) } -function getLookup () { - throw new Error('Vonage error: lookup not supported') -} - module.exports = { NAME, sendMessage, - getLookup } diff --git a/lib/plugins/sms/whatsapp/whatsapp.js b/lib/plugins/sms/whatsapp/whatsapp.js index dee498ef..c2454665 100644 --- a/lib/plugins/sms/whatsapp/whatsapp.js +++ b/lib/plugins/sms/whatsapp/whatsapp.js @@ -36,12 +36,7 @@ function sendMessage (account, rec) { }) } -function getLookup () { - throw new Error('Whatsapp error: lookup not supported') -} - module.exports = { NAME, - sendMessage, - getLookup + sendMessage } diff --git a/lib/sms.js b/lib/sms.js index e9fe5b3e..08d14635 100644 --- a/lib/sms.js +++ b/lib/sms.js @@ -37,13 +37,6 @@ function sendMessage (settings, rec) { }) } -function getLookup (settings, number) { - return Promise.resolve() - .then(() => { - const { plugin, account } = getPlugin(settings) - return plugin.getLookup(account, number) - }) -} const toCryptoUnits = (cryptoAtoms, cryptoCode) => { const unitScale = coinUtils.getCryptoCurrency(cryptoCode).unitScale return cryptoAtoms.shiftedBy(-unitScale) @@ -117,7 +110,6 @@ function formatSmsReceipt (data, options) { module.exports = { getSms, sendMessage, - getLookup, formatSmsReceipt, toCryptoUnits } diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.jsx b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx index 61a8e1d3..df572d82 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerData.jsx +++ b/new-lamassu-admin/src/pages/Customers/CustomerData.jsx @@ -50,8 +50,6 @@ const CustomerData = ({ updateCustomRequest, authorizeCustomRequest, updateCustomEntry, - retrieveAdditionalDataDialog, - setRetrieve, checkAgainstSanctions }) => { const [previewPhoto, setPreviewPhoto] = useState(null) @@ -176,7 +174,6 @@ const CustomerData = ({ }) }, validationSchema: smsDataSchema.smsData, - retrieveAdditionalData: () => setRetrieve(true), initialValues: initialValues.smsData, isAvailable: !R.isNil(phone), hasAdditionalData: !R.isNil(smsData) && !R.isEmpty(smsData), @@ -440,7 +437,6 @@ const CustomerData = ({ save, cancel, deleteEditedData, - retrieveAdditionalData, children, validationSchema, initialValues, @@ -468,7 +464,6 @@ const CustomerData = ({ save={save} cancel={cancel} deleteEditedData={deleteEditedData} - retrieveAdditionalData={retrieveAdditionalData} checkAgainstSanctions={checkAgainstSanctions} editable={editable}> {children} @@ -546,7 +541,6 @@ const CustomerData = ({ )} - {retrieveAdditionalDataDialog} ) } diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx index 0de0e3d9..2d1c3093 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx +++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.jsx @@ -1,18 +1,11 @@ -import IconButton from '@mui/material/IconButton' -import SvgIcon from '@mui/material/SvgIcon' import { useQuery, useMutation, useLazyQuery, gql } from '@apollo/client' import Breadcrumbs from '@mui/material/Breadcrumbs' -import DialogActions from '@mui/material/DialogActions' -import DialogContent from '@mui/material/DialogContent' -import Dialog from '@mui/material/Dialog' import Switch from '@mui/material/Switch' import NavigateNextIcon from '@mui/icons-material/NavigateNext' import * as R from 'ramda' import React, { memo, useState } from 'react' import { useHistory, useParams } from 'react-router-dom' -import ErrorMessage from 'src/components/ErrorMessage' -import { Label1, Label2, H2, Info3 } from 'src/components/typography' -import CloseIcon from 'src/styling/icons/action/close/zodiac.svg?react' +import { Label1, Label2 } from 'src/components/typography' import AuthorizeReversedIcon from 'src/styling/icons/button/authorize/white.svg?react' import AuthorizeIcon from 'src/styling/icons/button/authorize/zodiac.svg?react' import BlockReversedIcon from 'src/styling/icons/button/block/white.svg?react' @@ -20,7 +13,7 @@ import BlockIcon from 'src/styling/icons/button/block/zodiac.svg?react' import DataReversedIcon from 'src/styling/icons/button/data/white.svg?react' import DataIcon from 'src/styling/icons/button/data/zodiac.svg?react' -import { Button, ActionButton } from 'src/components/buttons' +import { ActionButton } from 'src/components/buttons' import { OVERRIDE_AUTHORIZED, OVERRIDE_REJECTED @@ -147,7 +140,6 @@ const SET_CUSTOMER = gql` lastTxFiat lastTxFiatCode lastTxClass - subscriberInfo phoneOverride externalCompliance } @@ -297,7 +289,6 @@ const CHECK_AGAINST_SANCTIONS = gql` const CustomerProfile = memo(() => { const history = useHistory() - const [retrieve, setRetrieve] = useState(false) const [showCompliance, setShowCompliance] = useState(false) const [wizard, setWizard] = useState(false) const [error, setError] = useState(null) @@ -343,7 +334,6 @@ const CustomerProfile = memo(() => { const [setCustomer] = useMutation(SET_CUSTOMER, { onCompleted: () => { getCustomer() - setRetrieve(false) }, onError: error => setError(error) }) @@ -467,16 +457,6 @@ const CustomerProfile = memo(() => { } }) - const retrieveAdditionalData = () => - setCustomer({ - variables: { - customerId, - customerInput: { - subscriberInfo: true - } - } - }) - const onClickSidebarItem = code => setClickedItem(code) const configData = R.path(['config'])(customerResponse) ?? [] @@ -664,21 +644,8 @@ const CustomerProfile = memo(() => { updateCustomRequest={setCustomerCustomInfoRequest} authorizeCustomRequest={authorizeCustomRequest} updateCustomEntry={updateCustomEntry} - setRetrieve={setRetrieve} checkAgainstSanctions={checkAgainstSanctions} - retrieveAdditionalDataDialog={ - { - setError(null) - setRetrieve(false) - }} - onConfirmed={() => { - setError(null) - retrieveAdditionalData() - }} - error={error} - open={retrieve}> - }> + /> )} {isNotes && ( @@ -715,55 +682,4 @@ const CustomerProfile = memo(() => { ) }) -const RetrieveDataDialog = ({ - onConfirmed, - onDismissed, - open, - error, - props -}) => { - return ( - -
- onDismissed(false)}> - - - - -
-

{'Retrieve API data from Twilio'}

- - {`With this action you'll be using Twilio's API to retrieve additional - data from this user. This includes name and address, if available.\n`} - {` There is a small cost from Twilio for each retrieval. Would you like - to proceed?`} - - {error && ( - - Failed to fetch additional data - - )} - - - -
- ) -} - export default CustomerProfile diff --git a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx index e3df3bac..f03378f0 100644 --- a/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx +++ b/new-lamassu-admin/src/pages/Customers/components/EditableCard.jsx @@ -74,8 +74,6 @@ const EditableCard = ({ validationSchema, initialValues, deleteEditedData, - retrieveAdditionalData, - hasAdditionalData = true, editable, checkAgainstSanctions }) => { @@ -168,16 +166,6 @@ const EditableCard = ({
{!editing && ( <> - {!hasAdditionalData && ( - retrieveAdditionalData()}> - Retrieve API data - - )} {checkAgainstSanctions && (