Add Simplex contact method to coordinator dialog

2025-02-20 12:19:00 +00:00 · 2023-11-03 12:13:59 +00:00 · 2023-11-03 12:13:59 +00:00 · 013ca083c4
commit 013ca083c4
parent 9d87bf6bd6
21 changed files with 74 additions and 37 deletions
--- a/frontend/src/components/Dialogs/Coordinator.tsx
+++ b/frontend/src/components/Dialogs/Coordinator.tsx
@ -57,6 +57,7 @@ import {
  BadgeLoved,
  BadgeLimits,
  NostrIcon,
+  SimplexIcon,
 } from '../Icons';
 import { AppContext } from '../../contexts/AppContext';
 import { systemClient } from '../../services/System';
@ -76,6 +77,7 @@ const ContactButtons = ({
  telegram,
  twitter,
  matrix,
+  simplex,
  website,
  reddit,
 }: Contact): JSX.Element => {
@ -215,6 +217,16 @@ const ContactButtons = ({
          </Tooltip>
        </Grid>
      )}
+
+      {simplex !== undefined && (
+        <Grid item>
+          <Tooltip enterTouchDelay={0} enterNextDelay={2000} title={t('Simplex')}>
+            <IconButton component='a' target='_blank' href={`${simplex}`} rel='noreferrer'>
+              <SimplexIcon sx={{ width: '0.7em', height: '0.7em' }} />
+            </IconButton>
+          </Tooltip>
+        </Grid>
+      )}
    </Grid>
  );
 };
@ -712,7 +724,10 @@ const CoordinatorDialog = ({ open = false, onClose, coordinator, network }: Prop
                        }}
                      >
                        {pn(parseFloat(coordinator?.info?.last_day_volume).toFixed(8))}
-                        <BitcoinSignIcon sx={{ width: 14, height: 14 }} color={'text.secondary'} />
+                        <BitcoinSignIcon
+                          sx={{ width: '1em', height: '1em' }}
+                          color={'text.secondary'}
+                        />
                      </div>
                    </ListItemText>
                  </ListItem>
@ -733,7 +748,10 @@ const CoordinatorDialog = ({ open = false, onClose, coordinator, network }: Prop
                        }}
                      >
                        {pn(parseFloat(coordinator?.info?.lifetime_volume).toFixed(8))}
-                        <BitcoinSignIcon sx={{ width: 14, height: 14 }} color={'text.secondary'} />
+                        <BitcoinSignIcon
+                          sx={{ width: '1em', height: '1em' }}
+                          color={'text.secondary'}
+                        />
                      </div>
                    </ListItemText>
                  </ListItem>
--- a/frontend/src/components/FederationTable/index.tsx
+++ b/frontend/src/components/FederationTable/index.tsx
@ -13,10 +13,6 @@ import {
 } from '../../contexts/FederationContext';

 interface FederationTableProps {
-  federation: Record<string, Coordinator>;
-  dispatchFederation: (action: ActionFederation) => void;
-  fetchCoordinatorInfo: (coordinator: Coordinator) => Promise<void>;
-  setFocusedCoordinator: (state: number) => void;
  openCoordinator: () => void;
  maxWidth?: number;
  maxHeight?: number;
@ -30,7 +26,7 @@ const FederationTable = ({
  fillContainer = false,
 }: FederationTableProps): JSX.Element => {
  const { t } = useTranslation();
-  const { federation, setFocusedCoordinator, coordinatorUpdatedAt } =
+  const { federation, sortedCoordinators, setFocusedCoordinator, coordinatorUpdatedAt } =
    useContext<UseFederationStoreType>(FederationContext);
  const { hostUrl } = useContext<UseAppStoreType>(AppContext);
  const theme = useTheme();
@ -120,34 +116,37 @@ const FederationTable = ({
        },
      };
    },
-    [federation],
+    [coordinatorUpdatedAt],
  );

-  const upObj = useCallback((width: number) => {
-    return {
-      field: 'up',
-      headerName: t('Up'),
-      width: width * fontSize,
-      renderCell: (params: any) => {
-        return (
-          <div
-            style={{ cursor: 'pointer' }}
-            onClick={() => {
-              onClickCoordinator(params.row.shortAlias);
-            }}
-          >
-            {Boolean(params.row.loadingInfo) && Boolean(params.row.enabled) ? (
-              <CircularProgress thickness={0.35 * fontSize} size={1.5 * fontSize} />
-            ) : params.row.info !== undefined ? (
-              <Link color='success' />
-            ) : (
-              <LinkOff color='error' />
-            )}
-          </div>
-        );
-      },
-    };
-  }, []);
+  const upObj = useCallback(
+    (width: number) => {
+      return {
+        field: 'up',
+        headerName: t('Up'),
+        width: width * fontSize,
+        renderCell: (params: any) => {
+          return (
+            <div
+              style={{ cursor: 'pointer' }}
+              onClick={() => {
+                onClickCoordinator(params.row.shortAlias);
+              }}
+            >
+              {Boolean(params.row.loadingInfo) && Boolean(params.row.enabled) ? (
+                <CircularProgress thickness={0.35 * fontSize} size={1.5 * fontSize} />
+              ) : params.row.info !== undefined ? (
+                <Link color='success' />
+              ) : (
+                <LinkOff color='error' />
+              )}
+            </div>
+          );
+        },
+      };
+    },
+    [coordinatorUpdatedAt],
+  );

  const columnSpecs = {
    alias: {
@ -220,6 +219,11 @@ const FederationTable = ({
    }
  };

+  const reorderedCoordinators = sortedCoordinators.reduce((coordinators, key) => {
+    coordinators[key] = federation.coordinators[key];
+    return coordinators;
+  }, {});
+
  return (
    <Box
      sx={
@ -232,7 +236,7 @@ const FederationTable = ({
        localeText={localeText}
        rowHeight={3.714 * theme.typography.fontSize}
        headerHeight={3.25 * theme.typography.fontSize}
-        rows={Object.values(federation.coordinators)}
+        rows={Object.values(reorderedCoordinators)}
        getRowId={(params: Coordinator) => params.shortAlias}
        columns={columns}
        checkboxSelection={false}
--- a/frontend/src/models/Coordinator.model.ts
+++ b/frontend/src/models/Coordinator.model.ts
@ -18,6 +18,7 @@ export interface Contact {
  telegram?: string | undefined;
  reddit?: string | undefined;
  matrix?: string | undefined;
+  simplex?: string | undefined;
  twitter?: string | undefined;
  website?: string | undefined;
 }
--- a/frontend/src/pro/Widgets/Federation.tsx
+++ b/frontend/src/pro/Widgets/Federation.tsx
@ -35,9 +35,6 @@ const FederationWidget = React.forwardRef(function Component(
    return (
      <Paper elevation={3} style={{ width: '100%', height: '100%' }}>
        <FederationTable
-          federation={federation.coordinators}
-          // setFederation={setFederation}
-          setFocusedCoordinator={setFocusedCoordinator}
          openCoordinator={() => setOpen({ ...open, coordinator: true })}
          maxWidth={layout.w * gridCellSize} // EM units
          maxHeight={layout.h * gridCellSize} // EM units
--- a/frontend/static/locales/ca.json
+++ b/frontend/static/locales/ca.json
@ -268,6 +268,7 @@
  "RoboSats version": "Versió de RoboSats",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Comissió del prenedor",
--- a/frontend/static/locales/cs.json
+++ b/frontend/static/locales/cs.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Poplatek příjemce",
--- a/frontend/static/locales/de.json
+++ b/frontend/static/locales/de.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Takergebühr",
--- a/frontend/static/locales/en.json
+++ b/frontend/static/locales/en.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Taker fee",
--- a/frontend/static/locales/es.json
+++ b/frontend/static/locales/es.json
@ -268,6 +268,7 @@
  "RoboSats version": "Versión de RoboSats",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Comisión del tomador",
--- a/frontend/static/locales/eu.json
+++ b/frontend/static/locales/eu.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats bersioa",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Hartzaile kuota",
--- a/frontend/static/locales/fr.json
+++ b/frontend/static/locales/fr.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Frais du preneur",
--- a/frontend/static/locales/it.json
+++ b/frontend/static/locales/it.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Commissione dell'acquirente",
--- a/frontend/static/locales/ja.json
+++ b/frontend/static/locales/ja.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSatsバージョン",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "テイカー手数料",
--- a/frontend/static/locales/pl.json
+++ b/frontend/static/locales/pl.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Opłata takera",
--- a/frontend/static/locales/pt.json
+++ b/frontend/static/locales/pt.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Taxa do tomador",
--- a/frontend/static/locales/ru.json
+++ b/frontend/static/locales/ru.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Комиссия тейкера",
--- a/frontend/static/locales/sv.json
+++ b/frontend/static/locales/sv.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Takeravgift",
--- a/frontend/static/locales/sw.json
+++ b/frontend/static/locales/sw.json
@ -268,6 +268,7 @@
  "RoboSats version": "Toleo la RoboSats",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "Ada ya Kuchukua",
--- a/frontend/static/locales/th.json
+++ b/frontend/static/locales/th.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats version",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "ค่าธรรมเนียม Taker",
--- a/frontend/static/locales/zh-SI.json
+++ b/frontend/static/locales/zh-SI.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats 版本",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "吃单方费用",
--- a/frontend/static/locales/zh-TR.json
+++ b/frontend/static/locales/zh-TR.json
@ -268,6 +268,7 @@
  "RoboSats version": "RoboSats 版本",
  "See PGP Key": "See PGP Key",
  "Send Email": "Send Email",
+  "Simplex": "Simplex",
  "Stats for Nerds": "Stats for Nerds",
  "Summary": "Summary",
  "Taker fee": "吃單方費用",