adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't show fiat-currency if not set

Browse Source
This commit is contained in:
Matthias
2018-07-24 08:20:32 +01:00
parent 1a9ead45eb
commit 30b72ad98a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
freqtrade/rpc/telegram.py
View File

@@ -125,9 +125,11 @@ class Telegram(RPC):
message = "*{exchange}:* Buying [{pair}]({market_url})\n" \ message = "*{exchange}:* Buying [{pair}]({market_url})\n" \
"with limit `{limit:.8f}\n" \ "with limit `{limit:.8f}\n" \
"({stake_amount:.6f} {stake_currency}," \ "({stake_amount:.6f} {stake_currency}".format(**msg)
"{stake_amount_fiat:.3f} {fiat_currency})`" \
.format(**msg) if msg.get('fiat_currency', None):
message += ",{stake_amount_fiat:.3f} {fiat_currency}".format(**msg)
message += ")`"
elif msg['type'] == RPCMessageType.SELL_NOTIFICATION: elif msg['type'] == RPCMessageType.SELL_NOTIFICATION:
msg['amount'] = round(msg['amount'], 8) msg['amount'] = round(msg['amount'], 8)

4
freqtrade/tests/rpc/test_rpc_telegram.py
View File

@@ -1219,12 +1219,12 @@ def test_send_msg_buy_notification_no_fiat(default_conf, mocker) -> None:
'stake_amount': 0.001, 'stake_amount': 0.001,
'stake_amount_fiat': 0.0, 'stake_amount_fiat': 0.0,
'stake_currency': 'BTC', 'stake_currency': 'BTC',
'fiat_currency': 'USD' 'fiat_currency': None
}) })
assert msg_mock.call_args[0][0] \ assert msg_mock.call_args[0][0] \
== '*Bittrex:* Buying [ETH/BTC](https://bittrex.com/Market/Index?MarketName=BTC-ETH)\n' \ == '*Bittrex:* Buying [ETH/BTC](https://bittrex.com/Market/Index?MarketName=BTC-ETH)\n' \
'with limit `0.00001099\n' \ 'with limit `0.00001099\n' \
'(0.001000 BTC,0.000 USD)`' '(0.001000 BTC)`'
def test_send_msg_sell_notification_no_fiat(default_conf, mocker) -> None: def test_send_msg_sell_notification_no_fiat(default_conf, mocker) -> None: