diff --git a/basicswap/chainparams.py b/basicswap/chainparams.py index 09d284d..0a5d8e3 100644 --- a/basicswap/chainparams.py +++ b/basicswap/chainparams.py @@ -280,13 +280,13 @@ chainparams = { Coins.PIVX: { 'name': 'pivx', 'ticker': 'PIVX', + 'display_name': 'PIVX', 'message_magic': 'DarkNet Signed Message:\n', 'blocks_target': 60 * 1, 'decimal_places': 8, 'has_cltv': True, 'has_csv': False, 'has_segwit': False, - 'use_ticker_as_name': True, 'mainnet': { 'rpcport': 51473, 'pubkey_address': 30, @@ -437,6 +437,7 @@ chainparams = { Coins.BCH: { 'name': 'bitcoincash', 'ticker': 'BCH', + 'display_name': 'Bitcoin Cash', 'message_magic': 'Bitcoin Signed Message:\n', 'blocks_target': 60 * 2, 'decimal_places': 8, diff --git a/basicswap/interface/base.py b/basicswap/interface/base.py index dbd4fb4..6c4afac 100644 --- a/basicswap/interface/base.py +++ b/basicswap/interface/base.py @@ -66,10 +66,8 @@ class CoinInterface: def coin_name(self) -> str: coin_chainparams = chainparams[self.coin_type()] - if coin_chainparams.get('use_ticker_as_name', False): - return coin_chainparams['ticker'] - if coin_chainparams['name'] == 'bitcoincash': - return 'Bitcoin Cash' + if 'display_name' in coin_chainparams: + return coin_chainparams['display_name'] return coin_chainparams['name'].capitalize() def ticker(self) -> str: diff --git a/basicswap/interface/ltc.py b/basicswap/interface/ltc.py index ddcb4ed..19f5bf3 100644 --- a/basicswap/interface/ltc.py +++ b/basicswap/interface/ltc.py @@ -95,8 +95,6 @@ class LTCInterfaceMWEB(LTCInterface): def coin_name(self) -> str: coin_chainparams = chainparams[Coins.LTC] - if coin_chainparams.get('use_ticker_as_name', False): - return coin_chainparams['ticker'] + ' MWEB' return coin_chainparams['name'].capitalize() + ' MWEB' def ticker(self) -> str: diff --git a/basicswap/ui/util.py b/basicswap/ui/util.py index c7157d8..589f682 100644 --- a/basicswap/ui/util.py +++ b/basicswap/ui/util.py @@ -435,8 +435,8 @@ def getCoinName(c): return chainparams[Coins.LTC]['name'].capitalize() + ' MWEB' coin_chainparams = chainparams[c] - if coin_chainparams.get('use_ticker_as_name', False): - return coin_chainparams['ticker'] + if 'display_name' in coin_chainparams: + return coin_chainparams['display_name'] return coin_chainparams['name'].capitalize()