Skip to content

Commit

Permalink
fix: thunderhub ui with sats only
Browse files Browse the repository at this point in the history
  • Loading branch information
Kodylow committed Dec 14, 2023
1 parent 46e5f01 commit db91b63
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 41 deletions.
40 changes: 0 additions & 40 deletions scripts/mprocs-nix-gateway.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<<<<<<< HEAD
# shellcheck shell=bash

set -eo pipefail
Expand Down Expand Up @@ -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)
6 changes: 5 additions & 1 deletion src/client/src/views/home/account/NetworkIndicator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,9 @@ export const NetworkIndicator: FC<NetworkIndicatorProps> = ({
// isMutinynet(bitcoinRpcUrl)
);

return <span style={{ color }}>{name}</span>;
return (
<div>
Network: <span style={{ color }}>{name}</span>
</div>
);
};

0 comments on commit db91b63

Please sign in to comment.