diff --git a/frontend/src/components/Dialogs/Coordinator.tsx b/frontend/src/components/Dialogs/Coordinator.tsx index 46c3d82a..425b2f58 100644 --- 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 = ({ )} + + {simplex !== undefined && ( + + + + + + + + )} ); }; @@ -712,7 +724,10 @@ const CoordinatorDialog = ({ open = false, onClose, coordinator, network }: Prop }} > {pn(parseFloat(coordinator?.info?.last_day_volume).toFixed(8))} - + @@ -733,7 +748,10 @@ const CoordinatorDialog = ({ open = false, onClose, coordinator, network }: Prop }} > {pn(parseFloat(coordinator?.info?.lifetime_volume).toFixed(8))} - + diff --git a/frontend/src/components/FederationTable/index.tsx b/frontend/src/components/FederationTable/index.tsx index 18befdd9..a106d865 100644 --- 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; - dispatchFederation: (action: ActionFederation) => void; - fetchCoordinatorInfo: (coordinator: Coordinator) => Promise; - 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(FederationContext); const { hostUrl } = useContext(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 ( -
{ - onClickCoordinator(params.row.shortAlias); - }} - > - {Boolean(params.row.loadingInfo) && Boolean(params.row.enabled) ? ( - - ) : params.row.info !== undefined ? ( - - ) : ( - - )} -
- ); - }, - }; - }, []); + const upObj = useCallback( + (width: number) => { + return { + field: 'up', + headerName: t('Up'), + width: width * fontSize, + renderCell: (params: any) => { + return ( +
{ + onClickCoordinator(params.row.shortAlias); + }} + > + {Boolean(params.row.loadingInfo) && Boolean(params.row.enabled) ? ( + + ) : params.row.info !== undefined ? ( + + ) : ( + + )} +
+ ); + }, + }; + }, + [coordinatorUpdatedAt], + ); const columnSpecs = { alias: { @@ -220,6 +219,11 @@ const FederationTable = ({ } }; + const reorderedCoordinators = sortedCoordinators.reduce((coordinators, key) => { + coordinators[key] = federation.coordinators[key]; + return coordinators; + }, {}); + return ( params.shortAlias} columns={columns} checkboxSelection={false} diff --git a/frontend/src/models/Coordinator.model.ts b/frontend/src/models/Coordinator.model.ts index 8369acad..c02bb561 100644 --- 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; } diff --git a/frontend/src/pro/Widgets/Federation.tsx b/frontend/src/pro/Widgets/Federation.tsx index 0573085a..49e93aed 100644 --- 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 ( setOpen({ ...open, coordinator: true })} maxWidth={layout.w * gridCellSize} // EM units maxHeight={layout.h * gridCellSize} // EM units diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json index f6dc8f2d..86d080ee 100644 --- 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", diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json index 2f64c83d..44eef86b 100644 --- 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", diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json index 266ae8ac..9332a663 100644 --- 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", diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json index a4473145..7b99608d 100644 --- 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", diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json index ae43ebb2..09dd7e0c 100644 --- 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", diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json index 4ef876c7..7ed2c1ec 100644 --- 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", diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json index 73aada3d..3e08a257 100644 --- 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", diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json index 22e42b0a..44a76110 100644 --- 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", diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json index aa2807ef..5126acb0 100644 --- 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": "テイカー手数料", diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json index 17a0b03d..53465d07 100644 --- 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", diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json index e0e56ace..c6c0f931 100644 --- 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", diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json index b378728e..3ac20e00 100644 --- 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": "Комиссия тейкера", diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json index 15079513..8111c928 100644 --- 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", diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json index 99550349..aefd9ee2 100644 --- 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", diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json index 86523e1a..c2217091 100644 --- 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", diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json index 5421636c..b57a3b46 100644 --- 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": "吃单方费用", diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json index ce2d324f..0db0a48e 100644 --- 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": "吃單方費用",