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/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/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..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/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 (
<>
-
+
{
loading={filtersLoading}
filters={filters}
options={filterOptions}
- inputPlaceholder={'Search Transactions'}
+ inputPlaceholder={'Search transactions'}
onChange={onFilterChange}
/>
diff --git a/new-lamassu-admin/src/pages/UserManagement/UserManagement.js b/new-lamassu-admin/src/pages/UserManagement/UserManagement.js
index 0e6b89c8..5c0a0347 100644
--- a/new-lamassu-admin/src/pages/UserManagement/UserManagement.js
+++ b/new-lamassu-admin/src/pages/UserManagement/UserManagement.js
@@ -241,7 +241,7 @@ const Users = () => {
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..ec5d5325 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: 'Third-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..8551c123 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 () => (
@@ -225,14 +225,14 @@ const getPazuzRoutes = () => [
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
@@ -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
+}