Merge branch 'develop' into rpc-refactor

This commit is contained in:
kryofly
2018-01-26 11:08:20 +01:00
50 changed files with 2906 additions and 852 deletions

View File

@@ -136,8 +136,8 @@ def _status(bot: Bot, update: Update) -> None:
if error:
send_msg(trades, bot=bot)
else:
for message in trades:
send_msg(message, bot=bot)
for trademsg in trades:
send_msg(trademsg, bot=bot)
@authorized_only
@@ -252,11 +252,11 @@ def _balance(bot: Bot, update: Update) -> None:
(currencys, total, symbol, value) = result
output = ''
for currency in currencys:
output += """*Currency*: {Currency}
*Available*: {Available}
*Balance*: {Balance}
*Pending*: {Pending}
*Est. BTC*: {BTC: .8f}
output += """*Currency*: {currency}
*Available*: {available}
*Balance*: {balance}
*Pending*: {pending}
*Est. BTC*: {est_btc: .8f}
""".format(**currency)