diff --git a/frontend/src/components/Dialogs/Coordinator.tsx b/frontend/src/components/Dialogs/Coordinator.tsx index f4a18881..9981dbea 100644 --- a/frontend/src/components/Dialogs/Coordinator.tsx +++ b/frontend/src/components/Dialogs/Coordinator.tsx @@ -73,6 +73,7 @@ interface Props { const ContactButtons = ({ nostr, pgp, + fingerprint, email, telegram, twitter, @@ -120,8 +121,12 @@ const ContactButtons = ({ {pgp !== undefined && ( - - + + diff --git a/frontend/src/components/FederationTable/index.tsx b/frontend/src/components/FederationTable/index.tsx index a106d865..ce809cbe 100644 --- a/frontend/src/components/FederationTable/index.tsx +++ b/frontend/src/components/FederationTable/index.tsx @@ -6,11 +6,7 @@ import { type Coordinator } from '../../models'; import RobotAvatar from '../RobotAvatar'; import { Link, LinkOff } from '@mui/icons-material'; import { AppContext, type UseAppStoreType } from '../../contexts/AppContext'; -import { - type ActionFederation, - type UseFederationStoreType, - FederationContext, -} from '../../contexts/FederationContext'; +import { type UseFederationStoreType, FederationContext } from '../../contexts/FederationContext'; interface FederationTableProps { openCoordinator: () => void; diff --git a/frontend/src/components/RobotAvatar/index.tsx b/frontend/src/components/RobotAvatar/index.tsx index 1d8b2f81..ca50b4fa 100644 --- a/frontend/src/components/RobotAvatar/index.tsx +++ b/frontend/src/components/RobotAvatar/index.tsx @@ -54,7 +54,7 @@ const RobotAvatar: React.FC = ({ const [nicknameReady, setNicknameReady] = useState(false); const [activeBackground, setActiveBackground] = useState(true); - const path = coordinator ? '/static/federation/' : '/static/assets/avatars/'; + const path = coordinator ? '/static/federation/avatars/' : '/static/assets/avatars/'; const [backgroundData] = useState( placeholderType === 'generating' ? placeholder.generating : placeholder.loading, ); diff --git a/frontend/src/contexts/FederationContext.ts b/frontend/src/contexts/FederationContext.ts index 2d4810af..01fc8994 100644 --- a/frontend/src/contexts/FederationContext.ts +++ b/frontend/src/contexts/FederationContext.ts @@ -48,18 +48,6 @@ export interface fetchRobotProps { isRefresh?: boolean; } -export interface ActionFederation { - type: - | 'reset' - | 'enable' - | 'disable' - | 'updateBook' - | 'updateLimits' - | 'updateInfo' - | 'updateRobot'; - payload: any; // TODO -} - export interface CurrentOrder { shortAlias: string | null; id: number | null; diff --git a/frontend/src/pro/Widgets/Federation.tsx b/frontend/src/pro/Widgets/Federation.tsx index 49e93aed..6f9a44d1 100644 --- a/frontend/src/pro/Widgets/Federation.tsx +++ b/frontend/src/pro/Widgets/Federation.tsx @@ -28,7 +28,7 @@ const FederationWidget = React.forwardRef(function Component( ref, ) { const { open, setOpen } = useContext(AppContext); - const { federation, setFocusedCoordinator, coordinatorUpdatedAt } = + const { federation, coordinatorUpdatedAt } = useContext(FederationContext); return React.useMemo(() => { diff --git a/frontend/static/federation.json b/frontend/static/federation.json index b2916bae..0d13d70f 100644 --- a/frontend/static/federation.json +++ b/frontend/static/federation.json @@ -13,7 +13,7 @@ "matrix": "#robosats:matrix.org", "website": "https://learn.robosats.com", "nostr": "npub1p2psats79rypr8lpnl9t5qdekfp700x660qsgw284xvq4s09lqrqqk3m82", - "pgp": "keys.openpgp.org/vks/v1/by-fingerprint/B4AB5F19113D4125DDF217739C4585B561315571", + "pgp": "/static/federation/pgp/B4AB5F19113D4125DDF217739C4585B561315571.asc", "fingerprint": "B4AB5F19113D4125DDF217739C4585B561315571" }, "badges": { @@ -51,7 +51,7 @@ "email": "cosmos178ftmm4edlahqzj376gwgqzd9re5x0x9h0tfsc@keplr.xyz", "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", - "pgp": "keys.openpgp.org/vks/v1/by-fingerprint/25791752E9661C1DE118A8C6F78CD3D6471B6789", + "pgp": "/static/federation/pgp/25791752E9661C1DE118A8C6F78CD3D6471B6789.asc", "fingerprint": "25791752E9661C1DE118A8C6F78CD3D6471B6789" }, "badges": { @@ -93,7 +93,7 @@ "telegram": "@satstralia", "simplex": "https://simplex.chat/contact/#/?v=1-4&smp=smp%3A%2F%2FZKe4uxF4Z_aLJJOEsC-Y6hSkXgQS5-oc442JQGkyP8M%3D%40smp17.simplex.im%2Fq0pIyShcBl0EP8le0D0xy2OfSrP1mQWg%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAcwmsC9GQwQEt40UNpYp4vKPhU_UnWXsXcVl-OJ57lC4%253D%26srv%3Dogtwfxyi3h2h5weftjjpjmxclhb5ugufa5rcyrmg7j4xlch7qsr5nuqd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22vNcyZH9C3eE6MHzRNpR3xA%3D%3D%22%7D", "matrix": "#satstralia:matrix.org", - "pgp": "keys.openpgp.org/vks/v1/by-fingerprint/D1894C9862A9D02D47D96C84AE30B6904210DA14", + "pgp": "/static/federation/pgp/D1894C9862A9D02D47D96C84AE30B6904210DA14.asc", "nostr": "npub1z94lxjf7m5snda0qc6s3kmpy6r4nfw74h78da9j6j4y8ym08zrrs459wpr", "website": "https://satstralia.com", "fingerprint": "D1894C9862A9D02D47D96C84AE30B6904210DA14" diff --git a/frontend/static/federation/exp.small.webp b/frontend/static/federation/avatars/exp.small.webp similarity index 100% rename from frontend/static/federation/exp.small.webp rename to frontend/static/federation/avatars/exp.small.webp diff --git a/frontend/static/federation/exp.webp b/frontend/static/federation/avatars/exp.webp similarity index 100% rename from frontend/static/federation/exp.webp rename to frontend/static/federation/avatars/exp.webp diff --git a/frontend/static/federation/local.small.webp b/frontend/static/federation/avatars/local.small.webp similarity index 100% rename from frontend/static/federation/local.small.webp rename to frontend/static/federation/avatars/local.small.webp diff --git a/frontend/static/federation/local.webp b/frontend/static/federation/avatars/local.webp similarity index 100% rename from frontend/static/federation/local.webp rename to frontend/static/federation/avatars/local.webp diff --git a/frontend/static/federation/satstralia.small.webp b/frontend/static/federation/avatars/satstralia.small.webp similarity index 100% rename from frontend/static/federation/satstralia.small.webp rename to frontend/static/federation/avatars/satstralia.small.webp diff --git a/frontend/static/federation/satstralia.webp b/frontend/static/federation/avatars/satstralia.webp similarity index 100% rename from frontend/static/federation/satstralia.webp rename to frontend/static/federation/avatars/satstralia.webp diff --git a/frontend/static/federation/temple.small.webp b/frontend/static/federation/avatars/temple.small.webp similarity index 100% rename from frontend/static/federation/temple.small.webp rename to frontend/static/federation/avatars/temple.small.webp diff --git a/frontend/static/federation/temple.webp b/frontend/static/federation/avatars/temple.webp similarity index 100% rename from frontend/static/federation/temple.webp rename to frontend/static/federation/avatars/temple.webp diff --git a/frontend/static/federation/pgp/25791752E9661C1DE118A8C6F78CD3D6471B6789.asc b/frontend/static/federation/pgp/25791752E9661C1DE118A8C6F78CD3D6471B6789.asc new file mode 100644 index 00000000..6beeccd7 --- /dev/null +++ b/frontend/static/federation/pgp/25791752E9661C1DE118A8C6F78CD3D6471B6789.asc @@ -0,0 +1,43 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: 2579 1752 E966 1C1D E118 A8C6 F78C D3D6 471B 6789 +Comment: cosmos178ftmm4edlahqzj376gwgqzd9re5x0x9h0tfsc@keplr.xyz + +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 +=0i79 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/frontend/static/federation/pgp/B4AB5F19113D4125DDF217739C4585B561315571.asc b/frontend/static/federation/pgp/B4AB5F19113D4125DDF217739C4585B561315571.asc new file mode 100644 index 00000000..5283365e --- /dev/null +++ b/frontend/static/federation/pgp/B4AB5F19113D4125DDF217739C4585B561315571.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: B4AB 5F19 113D 4125 DDF2 1773 9C45 85B5 6131 5571 +Comment: Reckless_Satoshi + +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 +=WLFQ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/frontend/static/federation/pgp/D1894C9862A9D02D47D96C84AE30B6904210DA14.asc b/frontend/static/federation/pgp/D1894C9862A9D02D47D96C84AE30B6904210DA14.asc new file mode 100644 index 00000000..0aa54b62 --- /dev/null +++ b/frontend/static/federation/pgp/D1894C9862A9D02D47D96C84AE30B6904210DA14.asc @@ -0,0 +1,43 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: D189 4C98 62A9 D02D 47D9 6C84 AE30 B690 4210 DA14 +Comment: Satstralia (http://satstralia.com)