From 9fee3b3bba78ade244ff1d9dda123d68a75c3bd1 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sat, 2 Dec 2023 17:41:47 +0000 Subject: [PATCH] Update temple of sats, new prettier format --- .../components/Charts/DepthChart/index.tsx | 4 +-- .../MakerForm/AutocompletePayments.tsx | 16 +++++----- .../src/components/MakerForm/MakerForm.tsx | 32 +++++++++---------- frontend/src/models/Settings.model.ts | 8 ++--- frontend/static/federation.json | 6 ++-- nodeapp/robosats-client.sh | 4 +-- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/frontend/src/components/Charts/DepthChart/index.tsx b/frontend/src/components/Charts/DepthChart/index.tsx index a84e2133..ce3b77cf 100644 --- a/frontend/src/components/Charts/DepthChart/index.tsx +++ b/frontend/src/components/Charts/DepthChart/index.tsx @@ -352,8 +352,8 @@ const DepthChart: React.FC = ({ ? 2.7 * em : 1.78 * em : width < 25 - ? 2.7 * em - : 1.78 * em, + ? 2.7 * em + : 1.78 * em, top: 0.714 * em, }} xFormat={(value) => Number(value).toFixed(0)} diff --git a/frontend/src/components/MakerForm/AutocompletePayments.tsx b/frontend/src/components/MakerForm/AutocompletePayments.tsx index 0400d99c..17e97a0e 100644 --- a/frontend/src/components/MakerForm/AutocompletePayments.tsx +++ b/frontend/src/components/MakerForm/AutocompletePayments.tsx @@ -34,8 +34,8 @@ const Label = styled('label')( ? '#f44336' : '#cfcfcf' : error === true - ? '#dd0000' - : '#717171' + ? '#dd0000' + : '#717171' }; pointer-events: none; position: relative; @@ -58,8 +58,8 @@ const InputWrapper = styled('div')( ? '#f44336' : '#434343' : error === '' - ? '#dd0000' - : '#c4c4c4' + ? '#dd0000' + : '#c4c4c4' }; background-color: ${theme.palette.mode === 'dark' ? '#141414' : '#fff'}; border-radius: 4px; @@ -77,8 +77,8 @@ const InputWrapper = styled('div')( ? '#f44336' : String(sx.hoverBorderColor) : error === true - ? '#dd0000' - : '#2f2f2f' + ? '#dd0000' + : '#2f2f2f' }; } @@ -89,8 +89,8 @@ const InputWrapper = styled('div')( ? '#f44336' : '#90caf9' : error === true - ? '#dd0000' - : '#1976d2' + ? '#dd0000' + : '#1976d2' }; } diff --git a/frontend/src/components/MakerForm/MakerForm.tsx b/frontend/src/components/MakerForm/MakerForm.tsx index 6a592da9..ebbfe08c 100644 --- a/frontend/src/components/MakerForm/MakerForm.tsx +++ b/frontend/src/components/MakerForm/MakerForm.tsx @@ -541,12 +541,12 @@ const MakerForm = ({ ? t('Order for ') : t('Swap of ') : fav.type === 1 - ? fav.mode === 'fiat' - ? t('Buy BTC for ') - : t('Swap into LN ') - : fav.mode === 'fiat' - ? t('Sell BTC for ') - : t('Swap out of LN ')} + ? fav.mode === 'fiat' + ? t('Buy BTC for ') + : t('Swap into LN ') + : fav.mode === 'fiat' + ? t('Sell BTC for ') + : t('Swap out of LN ')} {fav.mode === 'fiat' ? amountToString(maker.amount, makerHasAmountRange, maker.minAmount, maker.maxAmount) : amountToString( @@ -559,12 +559,12 @@ const MakerForm = ({ {maker.isExplicit ? t(' of {{satoshis}} Satoshis', { satoshis: pn(maker.satoshis) }) : maker.premium === 0 - ? fav.mode === 'fiat' - ? t(' at market price') - : '' - : maker.premium > 0 - ? t(' at a {{premium}}% premium', { premium: maker.premium }) - : t(' at a {{discount}}% discount', { discount: -maker.premium })} + ? fav.mode === 'fiat' + ? t(' at market price') + : '' + : maker.premium > 0 + ? t(' at a {{premium}}% premium', { premium: maker.premium }) + : t(' at a {{discount}}% discount', { discount: -maker.premium })} ); }; @@ -785,10 +785,10 @@ const MakerForm = ({ minAmount: pn(parseFloat(amountLimits[0].toPrecision(2))), }) : maker.amount > amountLimits[1] && maker.amount !== '' - ? t('Must be less than {{maxAmount}}', { - maxAmount: pn(parseFloat(amountLimits[1].toPrecision(2))), - }) - : null + ? t('Must be less than {{maxAmount}}', { + maxAmount: pn(parseFloat(amountLimits[1].toPrecision(2))), + }) + : null } label={amountLabel.label} required={true} diff --git a/frontend/src/models/Settings.model.ts b/frontend/src/models/Settings.model.ts index c9f89c15..203d979f 100644 --- a/frontend/src/models/Settings.model.ts +++ b/frontend/src/models/Settings.model.ts @@ -28,8 +28,8 @@ class BaseSettings { modeCookie !== '' ? modeCookie : window?.matchMedia('(prefers-color-scheme: dark)')?.matches - ? 'dark' - : 'light'; + ? 'dark' + : 'light'; this.lightQRs = systemClient.getItem('settings_light_qr') === 'true'; @@ -38,8 +38,8 @@ class BaseSettings { languageCookie !== '' ? languageCookie : i18n.resolvedLanguage == null - ? 'en' - : i18n.resolvedLanguage.substring(0, 2); + ? 'en' + : i18n.resolvedLanguage.substring(0, 2); const networkCookie = systemClient.getItem('settings_network'); this.network = networkCookie !== '' ? networkCookie : 'mainnet'; diff --git a/frontend/static/federation.json b/frontend/static/federation.json index 7c02a23b..9f3e41c9 100644 --- a/frontend/static/federation.json +++ b/frontend/static/federation.json @@ -49,8 +49,10 @@ "color": "#000", "contact": { "email": "cosmos178ftmm4edlahqzj376gwgqzd9re5x0x9h0tfsc@keplr.xyz", + "telegram": "@venividivici_fr", "simplex": "https://simplex.chat/contact/#/?v=1-4&smp=smp%3A%2F%2Fh--vW7ZSkXPeOUpfxlFGgauQmXNFOzGoizak7Ult7cw%3D%40smp15.simplex.im%2FTBkVW6au17zMxuwDvlhIpkMojh7PpZgN%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA2iXIDN6Su6zYqKWcgsdd8BA7HhIHYIEWHE-MUyJhSw4%253D%26srv%3Doauu4bgijybyhczbnxtlggo6hiubahmeutaqineuyy23aojpih3dajad.onion", "matrix": "@venividivici13:matrix.org", + "nostr": "npub1wsqpvgpfwq6a4fs5whqxn7gtd9gqsll2p5qnfdu4ltr43s6wwxgsgk4xtl", "pgp": "/static/federation/pgp/25791752E9661C1DE118A8C6F78CD3D6471B6789.asc", "fingerprint": "25791752E9661C1DE118A8C6F78CD3D6471B6789" }, @@ -70,12 +72,12 @@ "Rule 2:": "Keep stacking Sats and Enjoy your journey in the Temple of Sats!" }, "mainnet": { - "onion": "http://_TEMPORARY_SILENCED_MAINNET_zixoneehmz7z2ctsnpuubcni4kxw5gp6fkyzjd2spo5atie5awiuwmyd.onion", + "onion": "http://_TEMPORARY_SILENCED_MAINNET_ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion", "clearnet": "", "i2p": "" }, "testnet": { - "onion": "http://ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion", + "onion": "http://jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion", "clearnet": "", "i2p": "" }, diff --git a/nodeapp/robosats-client.sh b/nodeapp/robosats-client.sh index 27cbddeb..c82a574e 100644 --- a/nodeapp/robosats-client.sh +++ b/nodeapp/robosats-client.sh @@ -23,10 +23,10 @@ testnet_exp_socat="socat tcp4-LISTEN:${testnet_exp_port},reuseaddr,fork,keepaliv ################################ # Temple of Sats # Mainnet -mainnet_temple_onion=zixoneehmz7z2ctsnpuubcni4kxw5gp6fkyzjd2spo5atie5awiuwmyd.onion +mainnet_temple_onion=ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion mainnet_temple_port=102 # Testnet -testnet_temple_onion=ngdk7ocdzmz5kzsysa3om6du7ycj2evxp2f2olfkyq37htx3gllwp2yd.onion +testnet_temple_onion=jpp3w5tpxtyg6lifonisdszpriiapszzem4wod2zsdweyfenlsxeoxid.onion testnet_temple_port=1002 # socat cmd mainnet_temple_socat="socat tcp4-LISTEN:${mainnet_temple_port},reuseaddr,fork,keepalive,bind=127.0.0.1 SOCKS4A:${TOR_PROXY_IP:-127.0.0.1}:${mainnet_temple_onion}:80,socksport=${TOR_PROXY_PORT:-9050}"