diff --git a/bfxbot/currency.py b/bfxbot/currency.py index a9c5866..09a5839 100644 --- a/bfxbot/currency.py +++ b/bfxbot/currency.py @@ -59,10 +59,13 @@ class Currency: def __init__(self, name: str, amount: float, price: float = None): self.__name: str = name self.__amount: float = amount - self.__price: float = price + self.__price: Optional[float] = price def __str__(self): - return f"{self.__name} {self.__amount} @ {self.__price}" + if self.__price: + return f"{self.__name} {self.__amount} @ {self.__price}" + else: + return f"{self.__name} {self.__amount}" def __repr__(self): return self.__str__() @@ -100,7 +103,7 @@ class Balance: self.__quote_equivalent: float = 0.0 self.__wallet: Optional[WalletKind] = wallet - if currency.name == quote.value: + if currency.name() == str(quote): self.__quote_equivalent = currency.amount() else: self.__quote_equivalent = currency.amount() * currency.price() @@ -139,7 +142,7 @@ class BalanceGroup: return self.__balances def currency_names(self) -> List[str]: - return list(map(lambda x: x.name, self.balances())) + return list(map(lambda x: x.currency().name(), self.balances())) def quote(self) -> Symbol: return self.__quote