lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use dev database as default for pazuz

Browse source
This commit is contained in:
Sérgio Salgado 2021-11-11 00:01:03 +00:00
parent 62ce359a80
commit b9114b6a33
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/options-loader.js
View file

@ -6,6 +6,8 @@ const _ = require('lodash/fp')
require('dotenv').config() require('dotenv').config()
const DATABASE = process.env.LAMASSU_DB ?? 'DEV'
const dbMapping = psqlConf => ({ const dbMapping = psqlConf => ({
STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf), STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf),
RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf), RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf),
@ -39,7 +41,7 @@ function load () {
opts: JSON.parse(fs.readFileSync(globalConfigPath)) opts: JSON.parse(fs.readFileSync(globalConfigPath))
} }
config.opts.postgresql = dbMapping(config.opts.postgresql)[process.env.LAMASSU_DB] config.opts.postgresql = dbMapping(config.opts.postgresql)[DATABASE]
return config return config
} catch (_) { } catch (_) {
@ -50,7 +52,7 @@ function load () {
opts: JSON.parse(fs.readFileSync(homeConfigPath)) opts: JSON.parse(fs.readFileSync(homeConfigPath))
} }
config.opts.postgresql = dbMapping(config.opts.postgresql)[process.env.LAMASSU_DB] config.opts.postgresql = dbMapping(config.opts.postgresql)[DATABASE]
return config return config
} catch (_) { } catch (_) {

11
new-lamassu-admin/src/pages/ATMWallet/ATMWallet.js
View file

@ -51,6 +51,9 @@ const GET_OPERATOR_BY_USERNAME = gql`
} }
` `
const formatCurrency = amount =>
amount.toLocaleString('en-US', { maximumFractionDigits: 2 })
const CHIPS_PER_ROW = 6 const CHIPS_PER_ROW = 6
const Assets = ({ balance, wallets, currency }) => { const Assets = ({ balance, wallets, currency }) => {
@ -66,7 +69,7 @@ const Assets = ({ balance, wallets, currency }) => {
<P className={classes.fieldHeader}>Available balance</P> <P className={classes.fieldHeader}>Available balance</P>
<div className={classes.totalAssetWrapper}> <div className={classes.totalAssetWrapper}>
<Info2 noMargin className={classes.fieldValue}> <Info2 noMargin className={classes.fieldValue}>
{balance.toLocaleString('en-US', { maximumFractionDigits: 2 })} {formatCurrency(balance)}
</Info2> </Info2>
<Info2 noMargin className={classes.fieldCurrency}> <Info2 noMargin className={classes.fieldCurrency}>
{R.toUpper(currency)} {R.toUpper(currency)}
@ -78,9 +81,7 @@ const Assets = ({ balance, wallets, currency }) => {
<P className={classes.fieldHeader}>Total balance in wallets</P> <P className={classes.fieldHeader}>Total balance in wallets</P>
<div className={classes.totalAssetWrapper}> <div className={classes.totalAssetWrapper}>
<Info2 noMargin className={classes.fieldValue}> <Info2 noMargin className={classes.fieldValue}>
{walletFiatSum().toLocaleString('en-US', { {formatCurrency(walletFiatSum())}
maximumFractionDigits: 2
})}
</Info2> </Info2>
<Info2 noMargin className={classes.fieldCurrency}> <Info2 noMargin className={classes.fieldCurrency}>
{R.toUpper(currency)} {R.toUpper(currency)}
@ -92,7 +93,7 @@ const Assets = ({ balance, wallets, currency }) => {
<P className={classes.fieldHeader}>Total assets</P> <P className={classes.fieldHeader}>Total assets</P>
<div className={classes.totalAssetWrapper}> <div className={classes.totalAssetWrapper}>
<Info2 noMargin className={classes.fieldValue}> <Info2 noMargin className={classes.fieldValue}>
{balance.toLocaleString('en-US', { maximumFractionDigits: 2 })} {formatCurrency(balance)}
</Info2> </Info2>
<Info2 noMargin className={classes.fieldCurrency}> <Info2 noMargin className={classes.fieldCurrency}>
{R.toUpper(currency)} {R.toUpper(currency)}