From db91b63c608ef691920d175381a8cdaf5b814aac Mon Sep 17 00:00:00 2001 From: "kody.low" Date: Thu, 14 Dec 2023 15:03:49 -0500 Subject: [PATCH] fix: thunderhub ui with sats only --- scripts/mprocs-nix-gateway.sh | 40 ------------------- .../views/home/account/NetworkIndicator.tsx | 6 ++- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/scripts/mprocs-nix-gateway.sh b/scripts/mprocs-nix-gateway.sh index 6389de2c..1bd376bc 100644 --- a/scripts/mprocs-nix-gateway.sh +++ b/scripts/mprocs-nix-gateway.sh @@ -1,4 +1,3 @@ -<<<<<<< HEAD # shellcheck shell=bash set -eo pipefail @@ -35,42 +34,3 @@ export FM_GATEWAY_API=$FM_GATEWAY_API_ADDR export FM_GATEWAY_PASSWORD=$FM_GATEWAY_PASSWORD npm run start:dev -||||||| parent of 3c08692a (devimint setup scripts) -======= -# shellcheck shell=bash - -set -eo pipefail - -eval "$(devimint env)" - -echo Waiting for devimint to start up fedimint and gateway - -STATUS="$(devimint wait)" -if [ "$STATUS" = "ERROR" ] -then - echo "fedimint didn't start correctly" - echo "See other panes for errors" - exit 1 -fi - -TEMP_FILE=$(mktemp) -FM_LND_RPC_STRIPPED=$(echo $FM_LND_RPC_ADDR | sed 's/http[s]\?:\/\///') - -cat << EOF > "$TEMP_FILE" -masterPassword: password -accounts: - - name: test-regtest - serverUrl: $FM_LND_RPC_STRIPPED - macaroonPath: $FM_LND_MACAROON - certificatePath: $FM_LND_TLS_CERT -EOF - -# ----------- -# Fedimint Config -# ----------- -export ACCOUNT_CONFIG_PATH=$TEMP_FILE -export FM_GATEWAY_API=$FM_GATEWAY_API_ADDR -export FM_GATEWAY_PASSWORD=$FM_GATEWAY_PASSWORD - -npm run start:dev ->>>>>>> 3c08692a (devimint setup scripts) diff --git a/src/client/src/views/home/account/NetworkIndicator.tsx b/src/client/src/views/home/account/NetworkIndicator.tsx index a3f5369b..a07c6fef 100644 --- a/src/client/src/views/home/account/NetworkIndicator.tsx +++ b/src/client/src/views/home/account/NetworkIndicator.tsx @@ -43,5 +43,9 @@ export const NetworkIndicator: FC = ({ // isMutinynet(bitcoinRpcUrl) ); - return {name}; + return ( +
+ Network: {name} +
+ ); };