From 72eb8517312c025f58c43019e0a062498ff38692 Mon Sep 17 00:00:00 2001 From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com> Date: Tue, 13 Dec 2022 11:32:59 +0100 Subject: [PATCH 1/2] fix: standardize caps --- .../src/components/editableTable/Header.js | 4 ++-- .../machineActions/MachineActions.js | 2 +- .../src/pages/Cashout/WizardStep.js | 2 +- .../Commissions/components/CommissionsList.js | 4 ++-- .../src/pages/Customers/CustomersList.js | 2 +- .../Customers/components/CustomerSidebar.js | 2 +- new-lamassu-admin/src/pages/Funding.js | 2 +- new-lamassu-admin/src/pages/MachineLogs.js | 2 +- .../src/pages/Maintenance/CashUnits.js | 2 +- .../src/pages/Maintenance/CashboxHistory.js | 2 +- .../pages/Maintenance/MachineDetailsCard.js | 4 ++-- .../src/pages/Maintenance/MachineStatus.js | 6 ++--- .../sections/CryptoBalanceAlerts.js | 4 ++-- .../src/pages/Notifications/sections/Setup.js | 6 ++--- .../src/pages/OperatorInfo/ContactInfo.js | 4 ++-- .../src/pages/OperatorInfo/ReceiptPrinting.js | 2 +- .../src/pages/Services/Services.js | 2 +- .../SessionManagement/SessionManagement.js | 2 +- .../pages/UserManagement/UserManagement.js | 2 +- new-lamassu-admin/src/pages/Wallet/Wallet.js | 2 +- new-lamassu-admin/src/pages/Wallet/helper.js | 10 ++++----- .../src/routing/lamassu.routes.js | 22 +++++++++---------- new-lamassu-admin/src/routing/pazuz.routes.js | 14 ++++++------ new-lamassu-admin/src/utils/string.js | 10 ++++++++- 24 files changed, 61 insertions(+), 53 deletions(-) diff --git a/new-lamassu-admin/src/components/editableTable/Header.js b/new-lamassu-admin/src/components/editableTable/Header.js index 07efcdac..b6ca9b2c 100644 --- a/new-lamassu-admin/src/components/editableTable/Header.js +++ b/new-lamassu-admin/src/components/editableTable/Header.js @@ -9,7 +9,7 @@ import { TDoubleLevelHead, ThDoubleLevel } from 'src/components/fake-table/Table' -import { startCase } from 'src/utils/string' +import { sentenceCase } from 'src/utils/string' import TableCtx from './Context' @@ -99,7 +99,7 @@ const Header = () => { <>{attachOrderedByToComplexHeader(header) ?? header} ) : ( - {!R.isNil(display) ? display : startCase(name)}{' '} + {!R.isNil(display) ? display : sentenceCase(name)}{' '} {!R.isNil(orderedBy) && R.equals(name, orderedBy.code) && '-'} )} diff --git a/new-lamassu-admin/src/components/machineActions/MachineActions.js b/new-lamassu-admin/src/components/machineActions/MachineActions.js index d9ede4f1..d62833a0 100644 --- a/new-lamassu-admin/src/components/machineActions/MachineActions.js +++ b/new-lamassu-admin/src/components/machineActions/MachineActions.js @@ -187,7 +187,7 @@ const MachineActions = memo(({ machine, onActionSuccess }) => { display: 'Restart services for' }) }}> - Restart Services + Restart services {machine.model === 'aveiro' && ( Default Commissions diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js index 9ea641a1..ebf4f82e 100644 --- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js +++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.js @@ -37,7 +37,7 @@ const SHOW_ALL = { const ORDER_OPTIONS = [ { code: 'machine', - display: 'Machine Name' + display: 'Machine name' }, { code: 'cryptoCurrencies', @@ -53,7 +53,7 @@ const ORDER_OPTIONS = [ }, { code: 'fixedFee', - display: 'Fixed Fee' + display: 'Fixed fee' }, { code: 'minimumTx', diff --git a/new-lamassu-admin/src/pages/Customers/CustomersList.js b/new-lamassu-admin/src/pages/Customers/CustomersList.js index a7ed2a92..df39f4d9 100644 --- a/new-lamassu-admin/src/pages/Customers/CustomersList.js +++ b/new-lamassu-admin/src/pages/Customers/CustomersList.js @@ -36,7 +36,7 @@ const CustomersList = ({ view: getName }, { - header: 'Total TXs', + header: 'Total Txs', width: 126, textAlign: 'right', view: it => `${Number.parseInt(it.totalTxs)}` diff --git a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js index 6bcf3444..a698a218 100644 --- a/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js +++ b/new-lamassu-admin/src/pages/Customers/components/CustomerSidebar.js @@ -26,7 +26,7 @@ const CustomerSidebar = ({ isSelected, onClick }) => { }, { code: 'customerData', - display: 'Customer Data', + display: 'Customer data', Icon: CustomerDataIcon, InverseIcon: CustomerDataReversedIcon }, diff --git a/new-lamassu-admin/src/pages/Funding.js b/new-lamassu-admin/src/pages/Funding.js index e642aaf3..9462ea1c 100644 --- a/new-lamassu-admin/src/pages/Funding.js +++ b/new-lamassu-admin/src/pages/Funding.js @@ -164,7 +164,7 @@ const Funding = () => { {funding.length && (
- Total Crypto Balance + Total crypto balance {getConfirmedTotal(funding)} diff --git a/new-lamassu-admin/src/pages/MachineLogs.js b/new-lamassu-admin/src/pages/MachineLogs.js index d06f4a2c..88bc6478 100644 --- a/new-lamassu-admin/src/pages/MachineLogs.js +++ b/new-lamassu-admin/src/pages/MachineLogs.js @@ -111,7 +111,7 @@ const Logs = () => { <>
- Machine Logs + Machine logs {logsResponse && (
{ !dataLoading && ( <> { }, { name: 'billCount', - header: 'Bill Count', + header: 'Bill count', width: 115, textAlign: 'left', input: NumberInput, diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js index 0aaf1ea2..5551f009 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js +++ b/new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js @@ -92,7 +92,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess, timezone }) => { - + {modelPrettifier[machine.model]} @@ -126,7 +126,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess, timezone }) => { - + {machine.packetLoss ? new BigNumber(machine.packetLoss).toFixed(3).toString() + diff --git a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js index 035f2d33..e50eaf5c 100644 --- a/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js +++ b/new-lamassu-admin/src/pages/Maintenance/MachineStatus.js @@ -74,7 +74,7 @@ const MachineStatus = () => { const elements = [ { - header: 'Machine Name', + header: 'Machine name', width: 250, size: 'sm', textAlign: 'left', @@ -111,7 +111,7 @@ const MachineStatus = () => { : 'unknown' }, { - header: 'Software Version', + header: 'Software version', width: 200, size: 'sm', textAlign: 'left', @@ -134,7 +134,7 @@ const MachineStatus = () => { <>
- Machine Status + Machine status
diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js index 270a9edb..a626020b 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceAlerts.js @@ -32,7 +32,7 @@ const CryptoBalanceAlerts = ({ section, fieldWidth }) => { section={section} decoration={currency} className={classes.cryptoBalanceAlertsForm} - title="Default (Low Balance)" + title="Default (Low balance)" label="Alert me under" editing={isEditing(LOW_BALANCE_KEY)} disabled={isDisabled(LOW_BALANCE_KEY)} @@ -49,7 +49,7 @@ const CryptoBalanceAlerts = ({ section, fieldWidth }) => { save={save} decoration={currency} className={classes.cryptoBalanceAlertsSecondForm} - title="Default (High Balance)" + title="Default (High balance)" label="Alert me over" editing={isEditing(HIGH_BALANCE_KEY)} disabled={isDisabled(HIGH_BALANCE_KEY)} diff --git a/new-lamassu-admin/src/pages/Notifications/sections/Setup.js b/new-lamassu-admin/src/pages/Notifications/sections/Setup.js index 2e8d7583..cd512b9e 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/Setup.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/Setup.js @@ -12,7 +12,7 @@ import { } from 'src/components/fake-table/Table' import { Switch } from 'src/components/inputs' import { fromNamespace, toNamespace } from 'src/utils/config' -import { startCase } from 'src/utils/string' +import { sentenceCase } from 'src/utils/string' import NotificationsCtx from '../NotificationsContext' @@ -62,7 +62,7 @@ const Row = ({ return ( - {shouldUpperCase ? R.toUpper(namespace) : startCase(namespace)} + {shouldUpperCase ? R.toUpper(namespace) : sentenceCase(namespace)} @@ -127,7 +127,7 @@ const Setup = ({ wizard, forceDisable }) => { Channel {Object.keys(sizes).map(it => ( - {startCase(it)} + {sentenceCase(it)} ))} diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js index e1b68f21..bb3f9bb8 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/ContactInfo.js @@ -136,7 +136,7 @@ const ContactInfo = ({ wizard }) => { const fields = [ { name: 'name', - label: 'Full name', + label: 'Company name', value: info.name ?? '', component: TextInput }, @@ -160,7 +160,7 @@ const ContactInfo = ({ wizard }) => { }, { name: 'companyNumber', - label: 'Company number', + label: 'Company registration number', value: info.companyNumber ?? '', component: TextInput } diff --git a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js index dd3f9d19..9b90c14a 100644 --- a/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js +++ b/new-lamassu-admin/src/pages/OperatorInfo/ReceiptPrinting.js @@ -109,7 +109,7 @@ const ReceiptPrinting = memo(({ wizard }) => { }, { name: 'companyNumber', - display: 'Company number' + display: 'Company registration number' }, { name: 'machineLocation', diff --git a/new-lamassu-admin/src/pages/Services/Services.js b/new-lamassu-admin/src/pages/Services/Services.js index 966038c9..6a2e08d8 100644 --- a/new-lamassu-admin/src/pages/Services/Services.js +++ b/new-lamassu-admin/src/pages/Services/Services.js @@ -103,7 +103,7 @@ const Services = () => { return (
- + {R.values(schemas).map(schema => ( diff --git a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js index 83457474..bc7fbe02 100644 --- a/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js +++ b/new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js @@ -108,7 +108,7 @@ const SessionManagement = () => { return ( <> - + { return ( <> - + { <>
{ }, { name: 'allowTransactionBatching', - header: `Allow BTC Transaction Batching`, + header: `Allow BTC transaction batching`, size: 'sm', stripe: true, width: 260, @@ -119,7 +119,7 @@ const getAdvancedWalletElements = () => { }, { name: 'feeMultiplier', - header: `BTC Miner's Fee`, + header: `BTC Miner's fee`, size: 'sm', stripe: true, width: 250, @@ -179,7 +179,7 @@ const getAdvancedWalletElementsOverrides = ( }, { name: 'feeMultiplier', - header: `Miner's Fee`, + header: `Miner's fee`, size: 'sm', stripe: true, width: 250, @@ -280,7 +280,7 @@ const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => { }, { name: 'zeroConf', - header: 'Confidence Checking', + header: 'Confidence checking', size: 'sm', stripe: true, view: (it, row) => { @@ -304,7 +304,7 @@ const getElements = (cryptoCurrencies, accounts, onChange, wizard = false) => { }, { name: 'zeroConfLimit', - header: '0-conf Limit', + header: '0-conf limit', size: 'sm', stripe: true, view: (it, row) => diff --git a/new-lamassu-admin/src/routing/lamassu.routes.js b/new-lamassu-admin/src/routing/lamassu.routes.js index 4b2ca01f..873fc0fb 100644 --- a/new-lamassu-admin/src/routing/lamassu.routes.js +++ b/new-lamassu-admin/src/routing/lamassu.routes.js @@ -49,7 +49,7 @@ const getLamassuRoutes = () => [ children: [ { key: 'cash_units', - label: 'Cash Units', + label: 'Cash units', route: '/maintenance/cash-units', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: CashUnits @@ -63,14 +63,14 @@ const getLamassuRoutes = () => [ }, { key: 'logs', - label: 'Machine Logs', + label: 'Machine logs', route: '/maintenance/logs', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: MachineLogs }, { key: 'machine-status', - label: 'Machine Status', + label: 'Machine status', route: '/maintenance/machine-status', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: MachineStatus @@ -130,7 +130,7 @@ const getLamassuRoutes = () => [ }, { key: 'services', - label: '3rd Party Services', + label: '3rd Party services', route: '/settings/3rd-party-services', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: Services @@ -144,9 +144,9 @@ const getLamassuRoutes = () => [ }, { key: namespaces.OPERATOR_INFO, - label: 'Operator Info', + label: 'Operator info', route: '/settings/operator-info', - title: 'Operator Information', + title: 'Operator information', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], get component() { return () => ( @@ -232,7 +232,7 @@ const getLamassuRoutes = () => [ key: 'loyalty', label: 'Loyalty', route: '/compliance/loyalty', - title: 'Loyalty Panel', + title: 'Loyalty panel', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], get component() { return () => ( @@ -247,14 +247,14 @@ const getLamassuRoutes = () => [ children: [ { key: 'individual-discounts', - label: 'Individual Discounts', + label: 'Individual discounts', route: '/compliance/loyalty/individual-discounts', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: IndividualDiscounts }, { key: 'promo-codes', - label: 'Promo Codes', + label: 'Promo codes', route: '/compliance/loyalty/codes', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: PromoCodes @@ -280,14 +280,14 @@ const getLamassuRoutes = () => [ children: [ { key: 'user-management', - label: 'User Management', + label: 'User management', route: '/system/user-management', allowedRoles: [ROLES.SUPERUSER], component: UserManagement }, { key: 'session-management', - label: 'Session Management', + label: 'Session management', route: '/system/session-management', allowedRoles: [ROLES.SUPERUSER], component: SessionManagement diff --git a/new-lamassu-admin/src/routing/pazuz.routes.js b/new-lamassu-admin/src/routing/pazuz.routes.js index e0a9be94..f6ad9d21 100644 --- a/new-lamassu-admin/src/routing/pazuz.routes.js +++ b/new-lamassu-admin/src/routing/pazuz.routes.js @@ -56,14 +56,14 @@ const getPazuzRoutes = () => [ }, { key: 'logs', - label: 'Machine Logs', + label: 'Machine logs', route: '/maintenance/logs', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: MachineLogs }, { key: 'machine-status', - label: 'Machine Status', + label: 'Machine status', route: '/maintenance/machine-status', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: MachineStatus @@ -123,9 +123,9 @@ const getPazuzRoutes = () => [ }, { key: namespaces.OPERATOR_INFO, - label: 'Operator Info', + label: 'Operator info', route: '/settings/operator-info', - title: 'Operator Information', + title: 'Operator information', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], get component() { return () => ( @@ -232,7 +232,7 @@ const getPazuzRoutes = () => [ }, { key: 'promo-codes', - label: 'Promo Codes', + label: 'Promo codes', route: '/compliance/loyalty/codes', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: PromoCodes @@ -290,14 +290,14 @@ const getPazuzRoutes = () => [ children: [ { key: 'user-management', - label: 'User Management', + label: 'User management', route: '/system/user-management', allowedRoles: [ROLES.SUPERUSER], component: UserManagement }, { key: 'session-management', - label: 'Session Management', + label: 'Session management', route: '/system/session-management', allowedRoles: [ROLES.SUPERUSER], component: SessionManagement diff --git a/new-lamassu-admin/src/utils/string.js b/new-lamassu-admin/src/utils/string.js index 837369c8..d210cfba 100644 --- a/new-lamassu-admin/src/utils/string.js +++ b/new-lamassu-admin/src/utils/string.js @@ -26,7 +26,15 @@ const startCase = R.compose( splitOnUpper ) +const sentenceCase = R.compose(onlyFirstToUpper, S.joinWith(' '), splitOnUpper) + const singularOrPlural = (amount, singularStr, pluralStr) => parseInt(amount) === 1 ? singularStr : pluralStr -export { startCase, onlyFirstToUpper, formatLong, singularOrPlural } +export { + startCase, + onlyFirstToUpper, + formatLong, + singularOrPlural, + sentenceCase +} From 644a6b32bd12630182299c4f283896be21c81c5b Mon Sep 17 00:00:00 2001 From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com> Date: Tue, 13 Dec 2022 11:34:19 +0100 Subject: [PATCH 2/2] fix: standardize caps --- .../src/pages/Analytics/Analytics.js | 2 +- .../src/pages/Commissions/helper.js | 10 ++++----- .../pages/Customers/components/IdDataCard.js | 4 ++-- .../src/pages/Customers/helper.js | 2 +- new-lamassu-admin/src/pages/Locales/helper.js | 6 ++--- .../sections/CryptoBalanceOverrides.js | 4 ++-- .../src/pages/Services/Services.js | 2 +- .../src/pages/Services/schemas/binance.js | 4 ++-- .../src/pages/Services/schemas/binanceus.js | 4 ++-- .../src/pages/Services/schemas/bitgo.js | 22 +++++++++---------- .../src/pages/Services/schemas/bitstamp.js | 4 ++-- .../src/pages/Services/schemas/blockcypher.js | 4 ++-- .../src/pages/Services/schemas/cex.js | 4 ++-- .../src/pages/Services/schemas/itbit.js | 4 ++-- .../src/pages/Services/schemas/kraken.js | 4 ++-- .../src/pages/Services/schemas/mailgun.js | 6 ++--- .../src/pages/Services/schemas/singlebitgo.js | 6 ++--- .../src/pages/Services/schemas/twilio.js | 6 ++--- .../src/pages/Transactions/Transactions.js | 2 +- new-lamassu-admin/src/pages/Wallet/helper.js | 2 +- .../src/routing/lamassu.routes.js | 2 +- new-lamassu-admin/src/routing/pazuz.routes.js | 2 +- 22 files changed, 53 insertions(+), 53 deletions(-) diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.js b/new-lamassu-admin/src/pages/Analytics/Analytics.js index b7eed8fa..46d85572 100644 --- a/new-lamassu-admin/src/pages/Analytics/Analytics.js +++ b/new-lamassu-admin/src/pages/Analytics/Analytics.js @@ -29,7 +29,7 @@ const useStyles = makeStyles(styles) const MACHINE_OPTIONS = [{ code: 'all', display: 'All machines' }] const REPRESENTING_OPTIONS = [ { code: 'overTime', display: 'Over time' }, - { code: 'topMachines', display: 'Top Machines' }, + { code: 'topMachines', display: 'Top machines' }, { code: 'hourOfTheDay', display: 'Hour of the day' } ] const PERIOD_OPTIONS = [ diff --git a/new-lamassu-admin/src/pages/Commissions/helper.js b/new-lamassu-admin/src/pages/Commissions/helper.js index f93e6789..6418afa4 100644 --- a/new-lamassu-admin/src/pages/Commissions/helper.js +++ b/new-lamassu-admin/src/pages/Commissions/helper.js @@ -245,7 +245,7 @@ const getSchema = locale => { .max(percentMax) .required(), fixedFee: Yup.number() - .label('Fixed Fee') + .label('Fixed fee') .min(0) .max(highestBill) .required(), @@ -326,7 +326,7 @@ const getOverridesSchema = (values, rawData, locale) => { return true } }) - .label('Crypto Currencies') + .label('Crypto currencies') .required() .min(1), cashIn: Yup.number() @@ -340,7 +340,7 @@ const getOverridesSchema = (values, rawData, locale) => { .max(percentMax) .required(), fixedFee: Yup.number() - .label('Fixed Fee') + .label('Fixed fee') .min(0) .max(highestBill) .required(), @@ -437,7 +437,7 @@ const getListCommissionsSchema = locale => { .label('Machine') .required(), cryptoCurrencies: Yup.array() - .label('Crypto Currency') + .label('Crypto currency') .required() .min(1), cashIn: Yup.number() @@ -451,7 +451,7 @@ const getListCommissionsSchema = locale => { .max(percentMax) .required(), fixedFee: Yup.number() - .label('Fixed Fee') + .label('Fixed fee') .min(0) .max(highestBill) .required(), diff --git a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js index 3083283f..12a838db 100644 --- a/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js +++ b/new-lamassu-admin/src/pages/Customers/components/IdDataCard.js @@ -32,7 +32,7 @@ const IdDataCard = memo(({ customerData, updateCustomer }) => { size: 160 }, { - header: 'Birth Date', + header: 'Birth date', display: (rawDob && format('yyyy-MM-dd')(parse(new Date(), 'yyyyMMdd', rawDob))) ?? @@ -61,7 +61,7 @@ const IdDataCard = memo(({ customerData, updateCustomer }) => { size: 120 }, { - header: 'Expiration Date', + header: 'Expiration date', display: ifNotNull( rawExpirationDate, format('yyyy-MM-dd', rawExpirationDate) diff --git a/new-lamassu-admin/src/pages/Customers/helper.js b/new-lamassu-admin/src/pages/Customers/helper.js index 42e38317..84954b99 100644 --- a/new-lamassu-admin/src/pages/Customers/helper.js +++ b/new-lamassu-admin/src/pages/Customers/helper.js @@ -411,7 +411,7 @@ const customerDataElements = { }, { name: 'expirationDate', - label: 'Expiration Date', + label: 'Expiration date', component: TextInput, editable: true }, diff --git a/new-lamassu-admin/src/pages/Locales/helper.js b/new-lamassu-admin/src/pages/Locales/helper.js index 32b14e4e..2c050694 100644 --- a/new-lamassu-admin/src/pages/Locales/helper.js +++ b/new-lamassu-admin/src/pages/Locales/helper.js @@ -157,7 +157,7 @@ const LocaleSchema = Yup.object().shape({ .label('Country') .required(), fiatCurrency: Yup.string() - .label('Fiat Currency') + .label('Fiat currency') .required(), languages: Yup.array() .label('Languages') @@ -165,7 +165,7 @@ const LocaleSchema = Yup.object().shape({ .min(1) .max(4), cryptoCurrencies: Yup.array() - .label('Crypto Currencies') + .label('Crypto currencies') .required() .min(1), timezone: Yup.string() @@ -186,7 +186,7 @@ const OverridesSchema = Yup.object().shape({ .min(1) .max(4), cryptoCurrencies: Yup.array() - .label('Crypto Currencies') + .label('Crypto currencies') .required() .min(1) }) diff --git a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js index dcd2fb4e..c4957965 100644 --- a/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js +++ b/new-lamassu-admin/src/pages/Notifications/sections/CryptoBalanceOverrides.js @@ -62,7 +62,7 @@ const CryptoBalanceOverrides = ({ section }) => { .nullable() .required(), [LOW_BALANCE_KEY]: Yup.number() - .label('Low Balance') + .label('Low balance') .when(HIGH_BALANCE_KEY, { is: HIGH_BALANCE_KEY => !HIGH_BALANCE_KEY, then: Yup.number().required() @@ -73,7 +73,7 @@ const CryptoBalanceOverrides = ({ section }) => { .max(CURRENCY_MAX) .nullable(), [HIGH_BALANCE_KEY]: Yup.number() - .label('High Balance') + .label('High balance') .when(LOW_BALANCE_KEY, { is: LOW_BALANCE_KEY => !LOW_BALANCE_KEY, then: Yup.number().required() diff --git a/new-lamassu-admin/src/pages/Services/Services.js b/new-lamassu-admin/src/pages/Services/Services.js index 6a2e08d8..72eab97b 100644 --- a/new-lamassu-admin/src/pages/Services/Services.js +++ b/new-lamassu-admin/src/pages/Services/Services.js @@ -103,7 +103,7 @@ const Services = () => { return (
- + {R.values(schemas).map(schema => ( diff --git a/new-lamassu-admin/src/pages/Services/schemas/binance.js b/new-lamassu-admin/src/pages/Services/schemas/binance.js index 8e4e9bd4..6be4be26 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/binance.js +++ b/new-lamassu-admin/src/pages/Services/schemas/binance.js @@ -12,14 +12,14 @@ export default { elements: [ { code: 'apiKey', - display: 'API Key', + display: 'API key', component: TextInputFormik, face: true, long: true }, { code: 'privateKey', - display: 'Private Key', + display: 'Private key', component: SecretInputFormik } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/binanceus.js b/new-lamassu-admin/src/pages/Services/schemas/binanceus.js index eee1ece7..7afd724b 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/binanceus.js +++ b/new-lamassu-admin/src/pages/Services/schemas/binanceus.js @@ -12,14 +12,14 @@ export default { elements: [ { code: 'apiKey', - display: 'API Key', + display: 'API key', component: TextInputFormik, face: true, long: true }, { code: 'privateKey', - display: 'Private Key', + display: 'Private key', component: SecretInputFormik } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js index f810a728..2e57b9a0 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js +++ b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js @@ -26,7 +26,7 @@ export default { elements: [ { code: 'token', - display: 'API Token', + display: 'API token', component: TextInput, face: true, long: true @@ -47,52 +47,52 @@ export default { }, { code: 'BTCWalletId', - display: 'BTC Wallet ID', + display: 'BTC wallet ID', component: TextInput }, { code: 'BTCWalletPassphrase', - display: 'BTC Wallet Passphrase', + display: 'BTC wallet passphrase', component: SecretInput }, { code: 'LTCWalletId', - display: 'LTC Wallet ID', + display: 'LTC wallet ID', component: TextInput }, { code: 'LTCWalletPassphrase', - display: 'LTC Wallet Passphrase', + display: 'LTC wallet passphrase', component: SecretInput }, { code: 'ZECWalletId', - display: 'ZEC Wallet ID', + display: 'ZEC wallet ID', component: TextInput }, { code: 'ZECWalletPassphrase', - display: 'ZEC Wallet Passphrase', + display: 'ZEC wallet passphrase', component: SecretInput }, { code: 'BCHWalletId', - display: 'BCH Wallet ID', + display: 'BCH wallet ID', component: TextInput }, { code: 'BCHWalletPassphrase', - display: 'BCH Wallet Passphrase', + display: 'BCH wallet passphrase', component: SecretInput }, { code: 'DASHWalletId', - display: 'DASH Wallet ID', + display: 'DASH wallet ID', component: TextInput }, { code: 'DASHWalletPassphrase', - display: 'DASH Wallet Passphrase', + display: 'DASH wallet passphrase', component: SecretInput } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js b/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js index df8e8105..431fcfb5 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js +++ b/new-lamassu-admin/src/pages/Services/schemas/bitstamp.js @@ -19,14 +19,14 @@ export default { }, { code: 'key', - display: 'API Key', + display: 'API key', component: TextInputFormik, face: true, long: true }, { code: 'secret', - display: 'API Secret', + display: 'API secret', component: SecretInputFormik } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/blockcypher.js b/new-lamassu-admin/src/pages/Services/schemas/blockcypher.js index 3515eb1e..d0875577 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/blockcypher.js +++ b/new-lamassu-admin/src/pages/Services/schemas/blockcypher.js @@ -9,14 +9,14 @@ export default { elements: [ { code: 'token', - display: 'API Token', + display: 'API token', component: TextInput, face: true, long: true }, { code: 'confidenceFactor', - display: 'Confidence Factor', + display: 'Confidence factor', component: NumberInput, face: true }, diff --git a/new-lamassu-admin/src/pages/Services/schemas/cex.js b/new-lamassu-admin/src/pages/Services/schemas/cex.js index 2c67aa1c..c43b6bda 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/cex.js +++ b/new-lamassu-admin/src/pages/Services/schemas/cex.js @@ -12,14 +12,14 @@ export default { elements: [ { code: 'apiKey', - display: 'API Key', + display: 'API key', component: TextInputFormik, face: true, long: true }, { code: 'privateKey', - display: 'Private Key', + display: 'Private key', component: SecretInputFormik } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/itbit.js b/new-lamassu-admin/src/pages/Services/schemas/itbit.js index 702ca29e..949ba692 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/itbit.js +++ b/new-lamassu-admin/src/pages/Services/schemas/itbit.js @@ -26,12 +26,12 @@ export default { }, { code: 'clientKey', - display: 'Client Key', + display: 'Client key', component: TextInputFormik }, { code: 'clientSecret', - display: 'Client Secret', + display: 'Client secret', component: SecretInputFormik } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/kraken.js b/new-lamassu-admin/src/pages/Services/schemas/kraken.js index 752c3f7a..733cebe4 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/kraken.js +++ b/new-lamassu-admin/src/pages/Services/schemas/kraken.js @@ -12,14 +12,14 @@ export default { elements: [ { code: 'apiKey', - display: 'API Key', + display: 'API key', component: TextInputFormik, face: true, long: true }, { code: 'privateKey', - display: 'Private Key', + display: 'Private key', component: SecretInputFormik } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/mailgun.js b/new-lamassu-admin/src/pages/Services/schemas/mailgun.js index 151344e9..80e1f615 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/mailgun.js +++ b/new-lamassu-admin/src/pages/Services/schemas/mailgun.js @@ -9,7 +9,7 @@ export default { elements: [ { code: 'apiKey', - display: 'API Key', + display: 'API key', component: TextInputFormik }, { @@ -19,13 +19,13 @@ export default { }, { code: 'fromEmail', - display: 'From Email', + display: 'From email', component: TextInputFormik, face: true }, { code: 'toEmail', - display: 'To Email', + display: 'To email', component: TextInputFormik, face: true } diff --git a/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js b/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js index 5af804ca..9e206632 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js +++ b/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js @@ -13,7 +13,7 @@ const singleBitgo = code => ({ elements: [ { code: 'token', - display: 'API Token', + display: 'API token', component: TextInput, face: true, long: true @@ -34,12 +34,12 @@ const singleBitgo = code => ({ }, { code: `${code}WalletId`, - display: `${code} Wallet ID`, + display: `${code} wallet ID`, component: TextInput }, { code: `${code}WalletPassphrase`, - display: `${code} Wallet Passphrase`, + display: `${code} wallet passphrase`, component: SecretInput } ], diff --git a/new-lamassu-admin/src/pages/Services/schemas/twilio.js b/new-lamassu-admin/src/pages/Services/schemas/twilio.js index 1ed2228f..4628edb3 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/twilio.js +++ b/new-lamassu-admin/src/pages/Services/schemas/twilio.js @@ -17,18 +17,18 @@ export default { }, { code: 'authToken', - display: 'Auth Token', + display: 'Auth token', component: SecretInputFormik }, { code: 'fromNumber', - display: 'Twilio Number (international format)', + display: 'Twilio number (international format)', component: TextInputFormik, face: true }, { code: 'toNumber', - display: 'Notifications Number (international format)', + display: 'Notifications number (international format)', component: TextInputFormik, face: true } diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.js index 2559dfbf..cd49ca34 100644 --- a/new-lamassu-admin/src/pages/Transactions/Transactions.js +++ b/new-lamassu-admin/src/pages/Transactions/Transactions.js @@ -323,7 +323,7 @@ const Transactions = () => { loading={filtersLoading} filters={filters} options={filterOptions} - inputPlaceholder={'Search Transactions'} + inputPlaceholder={'Search transactions'} onChange={onFilterChange} />
diff --git a/new-lamassu-admin/src/pages/Wallet/helper.js b/new-lamassu-admin/src/pages/Wallet/helper.js index 1f6d6c61..7747292f 100644 --- a/new-lamassu-admin/src/pages/Wallet/helper.js +++ b/new-lamassu-admin/src/pages/Wallet/helper.js @@ -119,7 +119,7 @@ const getAdvancedWalletElements = () => { }, { name: 'feeMultiplier', - header: `BTC Miner's fee`, + header: `BTC miner's fee`, size: 'sm', stripe: true, width: 250, diff --git a/new-lamassu-admin/src/routing/lamassu.routes.js b/new-lamassu-admin/src/routing/lamassu.routes.js index 873fc0fb..ec5d5325 100644 --- a/new-lamassu-admin/src/routing/lamassu.routes.js +++ b/new-lamassu-admin/src/routing/lamassu.routes.js @@ -130,7 +130,7 @@ const getLamassuRoutes = () => [ }, { key: 'services', - label: '3rd Party services', + label: 'Third-party services', route: '/settings/3rd-party-services', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: Services diff --git a/new-lamassu-admin/src/routing/pazuz.routes.js b/new-lamassu-admin/src/routing/pazuz.routes.js index f6ad9d21..8551c123 100644 --- a/new-lamassu-admin/src/routing/pazuz.routes.js +++ b/new-lamassu-admin/src/routing/pazuz.routes.js @@ -225,7 +225,7 @@ const getPazuzRoutes = () => [ children: [ { key: 'individual-discounts', - label: 'Individual Discounts', + label: 'Individual discounts', route: '/compliance/loyalty/individual-discounts', allowedRoles: [ROLES.USER, ROLES.SUPERUSER], component: IndividualDiscounts