From 13e0f42f6c2b640029077c3a12d53baab3062b21 Mon Sep 17 00:00:00 2001 From: "kody.low" Date: Thu, 14 Dec 2023 14:16:49 -0500 Subject: [PATCH] fix: network indicator --- .../src/views/home/account/AccountInfo.tsx | 4 +- .../views/home/account/NetworkIndicator.tsx | 47 +++++++++++++++++++ src/client/src/views/home/account/network.tsx | 29 ------------ 3 files changed, 49 insertions(+), 31 deletions(-) create mode 100644 src/client/src/views/home/account/NetworkIndicator.tsx delete mode 100644 src/client/src/views/home/account/network.tsx diff --git a/src/client/src/views/home/account/AccountInfo.tsx b/src/client/src/views/home/account/AccountInfo.tsx index 4055b15b..82738148 100644 --- a/src/client/src/views/home/account/AccountInfo.tsx +++ b/src/client/src/views/home/account/AccountInfo.tsx @@ -19,7 +19,7 @@ import { FedimintGatewayCard } from './gateway/FedimintGatewayCard'; // import { useGatewayEcashTotal } from '../../../hooks/UseGatewayEcashTotal'; import { useGatewayState } from '../../../context/GatewayContext'; import { GatewayInfo } from '../../../api/types'; -import { getNetworkIndicator } from './network'; +import { NetworkIndicator } from './NetworkIndicator'; const S = { grid: styled.div<{ gatewayInfo?: GatewayInfo | null }>` @@ -56,7 +56,7 @@ export const AccountInfo = () => { <> - Network: {getNetworkIndicator(gatewayInfo?.network || 'unknown')} + {/* diff --git a/src/client/src/views/home/account/NetworkIndicator.tsx b/src/client/src/views/home/account/NetworkIndicator.tsx new file mode 100644 index 00000000..a3f5369b --- /dev/null +++ b/src/client/src/views/home/account/NetworkIndicator.tsx @@ -0,0 +1,47 @@ +import React, { FC } from 'react'; + +interface NetworkIndicatorProps { + network: string; + // bitcoinRpcUrl: string; +} + +const getNetworkDetails = ( + network: string + // isMutinynet: boolean +) => { + const networkDetails: { [key: string]: { color: string; name: string } } = { + bitcoin: { color: '#FF9900', name: 'Mainnet' }, + main: { color: '#FF9900', name: 'Mainnet' }, + testnet: { color: '#6BED33', name: 'Testnet' }, + test: { color: '#6BED33', name: 'Testnet' }, + signet: { color: 'purple', name: 'Signet' }, + // isMutinynet + // ? { color: 'red', name: 'Mutinynet' } + // : { color: 'purple', name: 'Signet' }, + regtest: { color: '#33C6EC', name: 'Regtest' }, + default: { color: 'gray', name: 'Unknown' }, + }; + + return networkDetails[network] || networkDetails['default']; +}; + +// const isMutinynet = (bitcoinRpcUrl: string) => { +// try { +// const url = new URL(bitcoinRpcUrl); +// return url.host === 'mutinynet.com'; +// } catch (e) { +// return false; +// } +// }; + +export const NetworkIndicator: FC = ({ + network, + // bitcoinRpcUrl, +}) => { + const { color, name } = getNetworkDetails( + network + // isMutinynet(bitcoinRpcUrl) + ); + + return {name}; +}; diff --git a/src/client/src/views/home/account/network.tsx b/src/client/src/views/home/account/network.tsx deleted file mode 100644 index 49fba345..00000000 --- a/src/client/src/views/home/account/network.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import React from 'react'; - -export const getNetworkIndicator = (network: string) => { - let color: string; - let name: string; - switch (network) { - case 'bitcoin': - color = 'orange'; - name = 'Mainnet'; - break; - case 'testnet': - color = 'limegreen'; - name = 'Testnet'; - break; - case 'signet': - color = 'purple'; - name = 'Signet'; - break; - case 'regtest': - color = 'skyblue'; - name = 'Regtest'; - break; - default: - color = 'gray'; - name = 'Unknown'; - } - - return {name}; -};