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