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

Merge pull request #1195 from josepfo/fix/omit-screens

Browse source 
Fix: omit lamassu screens
This commit is contained in:
Rafael Taranto 2022-05-12 10:16:46 +01:00 • committed by GitHub
commit 161d1853c4
7 changed files with 97 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import { useQuery } from '@apollo/react-hooks'
import { Paper } from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles'
import BigNumber from 'bignumber.js'
import classnames from 'classnames'
import gql from 'graphql-tag'
import * as R from 'ramda'
@ -15,7 +16,7 @@ import { ReactComponent as DashLogo } from 'src/styling/logos/icon-dash-colour.s
import { ReactComponent as EthereumLogo } from 'src/styling/logos/icon-ethereum-colour.svg'
import { ReactComponent as LitecoinLogo } from 'src/styling/logos/icon-litecoin-colour.svg'
import { ReactComponent as ZCashLogo } from 'src/styling/logos/icon-zcash-colour.svg'
import { numberToFiatAmount } from 'src/utils/number'
import { numberToFiatAmount, numberToCryptoAmount } from 'src/utils/number'
import styles from './ATMWallet.styles'
@ -31,7 +32,7 @@ const GET_OPERATOR_BY_USERNAME = gql`
cryptoBalances
machines
joined
assetValue
assets
preferredFiatCurrency
contactInfo {
name
@ -57,9 +58,10 @@ const CHIPS_PER_ROW = 6
const Assets = ({ balance, wallets, currency }) => {
const classes = useStyles({ numberOfChips: CHIPS_PER_ROW })
const walletFiatSum = () => {
return R.sum(R.map(it => it.fiatValue, wallets))
}
const walletFiatSum = R.sum(R.map(it => it.fiatValue, wallets))
const totalValue = BigNumber(balance)
.plus(walletFiatSum)
.toNumber()
return (
<div className={classes.totalAssetWrapper}>
@ -79,7 +81,7 @@ const Assets = ({ balance, wallets, currency }) => {
<P className={classes.fieldHeader}>Total balance in wallets</P>
<div className={classes.totalAssetWrapper}>
<Info2 noMargin className={classes.fieldValue}>
{numberToFiatAmount(walletFiatSum())}
{numberToFiatAmount(walletFiatSum)}
</Info2>
<Info2 noMargin className={classes.fieldCurrency}>
{R.toUpper(currency)}
@ -91,7 +93,7 @@ const Assets = ({ balance, wallets, currency }) => {
<P className={classes.fieldHeader}>Total assets</P>
<div className={classes.totalAssetWrapper}>
<Info2 noMargin className={classes.fieldValue}>
{numberToFiatAmount(balance)}
{numberToFiatAmount(totalValue)}
</Info2>
<Info2 noMargin className={classes.fieldCurrency}>
{R.toUpper(currency)}
@ -142,11 +144,11 @@ const WalletInfoChip = ({ wallet, currency }) => {
<div className={classes.walletValueWrapper}>
<Label2 className={classes.fieldHeader}>{wallet.name} value</Label2>
<Label2 className={classes.walletValue}>
{numberToFiatAmount(wallet.amount.toFixed(1))} {wallet.cryptoCode}
{numberToCryptoAmount(wallet.amount)} {wallet.cryptoCode}
</Label2>
<Label2 className={classes.fieldHeader}>Hedged value</Label2>
<Label2 className={classes.walletValue}>
{numberToFiatAmount(wallet.fiatValue)} {currency}
{numberToFiatAmount(wallet.hedgedFiatValue)} {currency}
</Label2>
</div>
</Paper>
@ -170,43 +172,61 @@ const ATMWallet = () => {
cryptoCode: 'BTC',
name: 'Bitcoin',
amount: operatorData?.cryptoBalances.xbt ?? 0,
fiatValue: 0,
isHedged: true
fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.xbt ?? 0,
hedgedFiatValue: operatorData?.assets.values.hedgedContracts.xbt ?? 0,
isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.xbt ?? 0).gt(
0
)
},
{
cryptoCode: 'ETH',
name: 'Ethereum',
amount: operatorData?.cryptoBalances.eth ?? 0,
fiatValue: 0,
isHedged: true
fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.eth ?? 0,
hedgedFiatValue: operatorData?.assets.values.hedgedContracts.eth ?? 0,
isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.eth ?? 0).gt(
0
)
},
{
cryptoCode: 'LTC',
name: 'Litecoin',
amount: operatorData?.cryptoBalances.ltc ?? 0,
fiatValue: 0,
isHedged: true
fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.ltc ?? 0,
hedgedFiatValue: operatorData?.assets.values.hedgedContracts.ltc ?? 0,
isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.ltc ?? 0).gt(
0
)
},
{
cryptoCode: 'ZEC',
name: 'Z-Cash',
name: 'Zcash',
amount: operatorData?.cryptoBalances.zec ?? 0,
fiatValue: 0,
isHedged: false
fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.zec ?? 0,
hedgedFiatValue: operatorData?.assets.values.hedgedContracts.zec ?? 0,
isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.zec ?? 0).gt(
0
)
},
{
cryptoCode: 'BCH',
name: 'Bitcoin Cash',
amount: operatorData?.cryptoBalances.bch ?? 0,
fiatValue: 0,
isHedged: true
fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.bch ?? 0,
hedgedFiatValue: operatorData?.assets.values.hedgedContracts.bch ?? 0,
isHedged: BigNumber(operatorData?.assets.values.hedgedCrypto.bch ?? 0).gt(
0
)
},
{
cryptoCode: 'DASH',
name: 'Dash',
amount: operatorData?.cryptoBalances.dash ?? 0,
fiatValue: 0,
isHedged: false
fiatValue: operatorData?.assets.values.cryptoBalancesInFiat.dash ?? 0,
hedgedFiatValue: operatorData?.assets.values.hedgedContracts.dash ?? 0,
isHedged: BigNumber(
operatorData?.assets.values.hedgedCrypto.dash ?? 0
).gt(0)
}
]
@ -216,10 +236,10 @@ const ATMWallet = () => {
<TitleSection title="ATM Wallets" />
<Assets
balance={
operatorData.fiatBalances[operatorData.preferredFiatCurrency]
operatorData?.fiatBalances[operatorData.preferredFiatCurrency] ?? 0
}
wallets={wallets}
currency={operatorData.preferredFiatCurrency}
currency={operatorData?.preferredFiatCurrency ?? ''}
/>
<H3 className={classes.walletChipTitle}>ATM Wallets</H3>
<div className={classes.walletChipList}>

23
new-lamassu-admin/src/pages/Accounting/Accounting.js
View file

@ -1,5 +1,6 @@
import { useQuery } from '@apollo/react-hooks'
import { makeStyles } from '@material-ui/core/styles'
import BigNumber from 'bignumber.js'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useContext } from 'react'
@ -26,7 +27,7 @@ const GET_OPERATOR_BY_USERNAME = gql`
cryptoBalances
machines
joined
assetValue
assets
preferredFiatCurrency
contactInfo {
name
@ -169,23 +170,31 @@ const Accounting = () => {
}
]
const hedgingReserve = BigNumber(
R.reduce(
(acc, value) => acc.plus(value),
BigNumber(0),
R.values(operatorData?.assets.values.hedgedContracts) ?? []
) ?? 0
).toNumber()
console.log(opData)
return (
!loading && (
<>
<TitleSection title="Accounting" />
<Assets
balance={
operatorData.fiatBalances[operatorData.preferredFiatCurrency]
}
hedgingReserve={operatorData.hedgingReserve ?? 0}
currency={operatorData.preferredFiatCurrency}
balance={operatorData?.assets.total ?? 0}
hedgingReserve={hedgingReserve}
currency={operatorData?.preferredFiatCurrency ?? ''}
/>
<H4 className={classes.tableTitle}>Fiat balance history</H4>
<DataTable
loading={loading}
emptyText="No transactions so far"
elements={elements}
data={operatorData.fundings ?? []}
data={operatorData?.fundings ?? []}
rowSize="sm"
/>
</>

18
new-lamassu-admin/src/pages/Assets/Assets.js
View file

@ -30,7 +30,7 @@ const GET_OPERATOR_BY_USERNAME = gql`
cryptoBalances
machines
joined
assetValue
assets
preferredFiatCurrency
contactInfo {
name
@ -147,8 +147,7 @@ const Assets = () => {
{
id: 'fiatBalance',
display: 'Fiat balance',
amount:
operatorData?.fiatBalances[operatorData?.preferredFiatCurrency] ?? 0,
amount: operatorData?.assets.total ?? 0,
currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
class: 'Available balance'
},
@ -156,7 +155,7 @@ const Assets = () => {
id: 'hedgingReserve',
display: 'Hedging reserve',
amount:
operatorData?.fiatBalances[operatorData?.preferredFiatCurrency] ?? 0,
-R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
class: 'Available balance',
direction: 'out'
@ -167,7 +166,7 @@ const Assets = () => {
{
id: 'hedgedWalletAssets',
display: 'Hedged wallet assets',
amount: 0,
amount: R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
class: 'Wallet assets',
direction: 'in'
@ -175,7 +174,7 @@ const Assets = () => {
{
id: 'unhedgedWalletAssets',
display: 'Unhedged wallet assets',
amount: 0,
amount: R.sum(R.values(operatorData?.assets.values.unhedgedFiat)) ?? 0,
currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
class: 'Wallet assets',
direction: 'in'
@ -193,21 +192,22 @@ const Assets = () => {
{
id: 'hedgingReserve',
display: 'Hedging reserve',
amount: 0,
amount:
-R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
direction: 'out'
},
{
id: 'hedgedWalletAssets',
display: 'Market value of hedged wallet assets',
amount: 0,
amount: R.sum(R.values(operatorData?.assets.values.hedgedContracts)) ?? 0,
currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
direction: 'in'
},
{
id: 'unhedgedWalletAssets',
display: 'Unhedged wallet assets',
amount: 0,
amount: R.sum(R.values(operatorData?.assets.values.unhedgedFiat)) ?? 0,
currency: R.toUpper(operatorData?.preferredFiatCurrency ?? ''),
direction: 'in'
}

19
new-lamassu-admin/src/pages/Wizard/Wizard.js
View file

@ -2,6 +2,7 @@ import { useQuery } from '@apollo/react-hooks'
import { makeStyles, Dialog, DialogContent } from '@material-ui/core'
import classnames from 'classnames'
import gql from 'graphql-tag'
import * as R from 'ramda'
import React, { useState, useContext } from 'react'
import { useHistory } from 'react-router-dom'
@ -52,6 +53,18 @@ const Wizard = ({ fromAuthRegister }) => {
const [footerExp, setFooterExp] = useState(false)
const getSteps = STEPS => {
const buildTarget = process.env.REACT_APP_BUILD_TARGET
if (buildTarget === 'PAZUZ') {
return R.filter(step => step.id !== 'wallet' && step.id !== 'twilio')(
STEPS
)
}
return STEPS
}
const steps = getSteps(STEPS)
if (loading) {
return <></>
}
@ -78,7 +91,7 @@ const Wizard = ({ fromAuthRegister }) => {
}
const doContinue = () => {
if (step >= STEPS.length - 1) {
if (step >= steps.length - 1) {
setOpen(false)
history.push('/')
}
@ -89,7 +102,7 @@ const Wizard = ({ fromAuthRegister }) => {
setStep(nextStep)
}
const current = STEPS[step]
const current = steps[step]
return (
<Dialog fullScreen open={open}>
@ -99,7 +112,7 @@ const Wizard = ({ fromAuthRegister }) => {
{!isWelcome && (
<Footer
currentStep={step}
steps={STEPS.length - 1}
steps={steps.length - 1}
exImage={current.exImage}
subtitle={current.subtitle}
text={current.text}

16
new-lamassu-admin/src/routing/pazuz.routes.js
View file

@ -9,7 +9,6 @@ import Blacklist from 'src/pages/Blacklist'
import Cashout from 'src/pages/Cashout'
import Commissions from 'src/pages/Commissions'
import { Customers, CustomerProfile } from 'src/pages/Customers'
import Funding from 'src/pages/Funding'
import Locales from 'src/pages/Locales'
import IndividualDiscounts from 'src/pages/LoyaltyPanel/IndividualDiscounts'
import PromoCodes from 'src/pages/LoyaltyPanel/PromoCodes'
@ -23,7 +22,6 @@ import ReceiptPrinting from 'src/pages/OperatorInfo/ReceiptPrinting'
import SMSNotices from 'src/pages/OperatorInfo/SMSNotices/SMSNotices'
import TermsConditions from 'src/pages/OperatorInfo/TermsConditions'
import ServerLogs from 'src/pages/ServerLogs'
import Services from 'src/pages/Services/Services'
import SessionManagement from 'src/pages/SessionManagement/SessionManagement'
import Transactions from 'src/pages/Transactions/Transactions'
import Triggers from 'src/pages/Triggers'
@ -56,13 +54,6 @@ const getPazuzRoutes = () => [
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: CashCassettes
},
{
key: 'funding',
label: 'Funding',
route: '/maintenance/funding',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: Funding
},
{
key: 'logs',
label: 'Machine Logs',
@ -130,13 +121,6 @@ const getPazuzRoutes = () => [
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: Notifications
},
{
key: 'services',
label: '3rd Party Services',
route: '/settings/3rd-party-services',
allowedRoles: [ROLES.USER, ROLES.SUPERUSER],
component: Services
},
{
key: namespaces.OPERATOR_INFO,
label: 'Operator Info',

4
new-lamassu-admin/src/utils/apollo.js
View file

@ -13,7 +13,9 @@ const URI =
process.env.NODE_ENV === 'development' ? 'https://localhost:8070' : ''
const ALT_URI =
process.env.NODE_ENV === 'development' ? 'http://localhost:4001' : ''
process.env.NODE_ENV === 'development'
? 'https://localhost:4001'
: `https://${window.location.hostname}:4001`
const uploadLink = createUploadLink({
credentials: 'include',

10
new-lamassu-admin/src/utils/number.js
View file

@ -10,4 +10,12 @@ const defaultToZero = value =>
const numberToFiatAmount = value =>
value.toLocaleString('en-US', { maximumFractionDigits: 2 })
export { defaultToZero, transformNumber, numberToFiatAmount }
const numberToCryptoAmount = value =>
value.toLocaleString('en-US', { maximumFractionDigits: 5 })
export {
defaultToZero,
transformNumber,
numberToFiatAmount,
numberToCryptoAmount
}