Merge remote-tracking branch 'upstream/release-8.1' into release-8.6

This commit is contained in:
Taranto 2023-07-07 21:15:01 +01:00
commit 8b1cf46f77
5 changed files with 46 additions and 24 deletions

View file

@ -440,13 +440,6 @@ function plugins (settings, deviceId) {
return wallet.newAddress(settings, info, tx)
}
function dispenseAck (tx) {
const cashOutConfig = configManager.getCashOut(deviceId, settings.config)
const cassettes = [cashOutConfig.cassette1, cashOutConfig.cassette2, cashOutConfig.cassette3, cashOutConfig.cassette4]
return dbm.addDispense(deviceId, tx, cassettes)
}
function fiatBalance (fiatCode, cryptoCode) {
const commissions = configManager.getCommissions(cryptoCode, deviceId, settings.config)
return Promise.all([
@ -1062,7 +1055,6 @@ function plugins (settings, deviceId) {
isHd,
isZeroConf,
getStatus,
dispenseAck,
getPhoneCode,
executeTrades,
pong,