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

Merge pull request #1130 from josepfo/fix/tx-direction-on-sms-receipt

Browse source 
fix: sms receipt tx direction
This commit is contained in:
Rafael Taranto 2022-03-03 15:06:24 +00:00 • committed by GitHub
commit b7e6dc2f02
4 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/plugins/wallet/bitcoind/bitcoind.js
View file

@ -65,10 +65,7 @@ function sendCoins (account, tx, settings, operatorId, feeMultiplier) {
return checkCryptoCode(cryptoCode)
.then(() => calculateFeeDiscount(feeMultiplier))
.then(newFee => {
logger.info('** DEBUG MINERS FEE ** - Calculated fee discount: ', newFee)
return fetch('settxfee', [newFee])
})
.then(newFee => fetch('settxfee', [newFee]))
.then(() => fetch('sendtoaddress', [toAddress, coins]))
.then((txId) => fetch('gettransaction', [txId]))
.then((res) => _.pick(['fee', 'txid'], res))
@ -87,10 +84,7 @@ function sendCoins (account, tx, settings, operatorId, feeMultiplier) {
function sendCoinsBatch (account, txs, cryptoCode, feeMultiplier) {
return checkCryptoCode(cryptoCode)
.then(() => calculateFeeDiscount(feeMultiplier))
.then(newFee => {
logger.info('** DEBUG MINERS FEE ** - Calculated fee discount: ', newFee)
return fetch('settxfee', [newFee])
})
.then(newFee => fetch('settxfee', [newFee]))
.then(() => _.reduce((acc, value) => ({
...acc,
[value.toAddress]: _.isNil(acc[value.toAddress])

2
lib/routes/customerRoutes.js
View file

@ -160,7 +160,7 @@ function buildSms (data, receiptOptions) {
customerPhone: customer.phone,
session: formattedTx.id,
time: dateString,
direction: formattedTx.direction === 'cashIn' ? 'Cash-in' : 'Cash-out',
direction: formattedTx.txClass === 'cashIn' ? 'Cash-in' : 'Cash-out',
fiat: `${formattedTx.fiat.toString()} ${formattedTx.fiatCode}`,
crypto: `${sms.toCryptoUnits(BN(formattedTx.cryptoAtoms), formattedTx.cryptoCode)} ${formattedTx.cryptoCode}`,
rate: `1 ${formattedTx.cryptoCode} = ${rate} ${formattedTx.fiatCode}`,

1
lib/wallet.js
View file

@ -63,7 +63,6 @@ function sendCoins (settings, tx) {
return fetchWallet(settings, tx.cryptoCode)
.then(r => {
const feeMultiplier = new BN(configManager.getWalletSettings(tx.cryptoCode, settings.config).feeMultiplier)
console.log('** DEBUG MINERS FEE ** - Fee multiplier: ', feeMultiplier)
return r.wallet.sendCoins(r.account, tx, settings, r.operatorId, feeMultiplier)
.then(res => {
mem.clear(module.exports.balance)

2
new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.js
View file

@ -27,7 +27,7 @@ const BooleanCell = ({ name }) => {
const BooleanPropertiesTable = memo(
({ title, disabled, data, elements, save, forcedEditing = false }) => {
const initialValues = R.fromPairs(
elements.map(it => [it.name, data[it.name].toString() ?? null])
elements.map(it => [it.name, data[it.name]?.toString() ?? null])
)
const schemaValidation = R.fromPairs(