From 0b224f4a8d78a9db280b82f35c0c7cb4f657bb47 Mon Sep 17 00:00:00 2001 From: Tony Giorgio Date: Tue, 9 Jul 2024 12:45:13 -0500 Subject: [PATCH] Revert "warn about bad dns federations" This reverts commit 625c0f6de7526b17cff923ccb2b74dc83535bdfe. --- public/i18n/en.json | 6 +-- src/components/Activity.tsx | 2 +- src/components/FederationPopup.tsx | 53 +++-------------------- src/routes/settings/ManageFederations.tsx | 20 +++++++-- src/state/megaStore.tsx | 40 ++++++++++++++--- src/utils/federationWarning.ts | 37 ---------------- src/utils/index.ts | 1 - 7 files changed, 58 insertions(+), 101 deletions(-) delete mode 100644 src/utils/federationWarning.ts diff --git a/public/i18n/en.json b/public/i18n/en.json index 8994bbd1e..ad4432f6a 100644 --- a/public/i18n/en.json +++ b/public/i18n/en.json @@ -40,10 +40,7 @@ "just_me": "Just Me", "friends": "Friends", "requests": "Requests" - }, - "federations_warn_generic": "Due to temporary issues with your current federation, we recommend you transfer your funds to a lightning channel or withdraw to another bitcoin wallet.", - "transfer_lightning": "Transfer to lightning", - "sent_to_another_wallet": "Send to another wallet" + } }, "profile": { "profile": "Profile", @@ -52,7 +49,6 @@ "edit_profile": "Edit Profile", "join_federation": "Join a federation", "manage_federation": "Manage Federations", - "leave_federation": "Leave Federation", "federated_custody": "Federated Custody", "self_custody": "Self Custody", "social": "Social", diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx index 588a7d4ee..e9781991c 100644 --- a/src/components/Activity.tsx +++ b/src/components/Activity.tsx @@ -1,6 +1,6 @@ import { TagItem } from "@mutinywallet/mutiny-wasm"; import { cache, createAsync, useNavigate } from "@solidjs/router"; -import { Plus, Save, Search, Shuffle } from "lucide-solid"; +import { Plus, Save, Search, Shuffle, Users } from "lucide-solid"; import { createEffect, createMemo, diff --git a/src/components/FederationPopup.tsx b/src/components/FederationPopup.tsx index 074259d08..44d465161 100644 --- a/src/components/FederationPopup.tsx +++ b/src/components/FederationPopup.tsx @@ -1,13 +1,8 @@ import { useNavigate } from "@solidjs/router"; -import { ArrowLeftRight, ArrowUpRight, Users } from "lucide-solid"; -import { createSignal, Show } from "solid-js"; +import { Users } from "lucide-solid"; +import { createSignal } from "solid-js"; -import { - ButtonCard, - ExternalLink, - NiceP, - SimpleDialog -} from "~/components/layout"; +import { ButtonCard, NiceP, SimpleDialog } from "~/components/layout"; import { useI18n } from "~/i18n/context"; import { useMegaStore } from "~/state/megaStore"; @@ -21,11 +16,9 @@ export function FederationPopup() { const i18n = useI18n(); const navigate = useNavigate(); - const name = state.expiration_warning?.federationName; - return ( { if (!open) { @@ -34,41 +27,7 @@ export function FederationPopup() { } }} > - - {state.expiration_warning?.expiresMessage || - i18n.t("home.federations_warn_generic")} - - - - - {i18n.t("settings.manage_federations.learn_more")} - - - - { - actions.clearExpirationWarning(); - setShowFederationExpirationWarning(false); - navigate("/swaplightning"); - }} - > -
- - {i18n.t("home.transfer_lightning")} -
- - { - actions.clearExpirationWarning(); - setShowFederationExpirationWarning(false); - navigate("/send"); - }} - > -
- - {i18n.t("home.sent_to_another_wallet")} -
- + {state.expiration_warning?.expiresMessage} { actions.clearExpirationWarning(); @@ -78,7 +37,7 @@ export function FederationPopup() { >
- {i18n.t("profile.leave_federation")} + {i18n.t("profile.manage_federation")}
diff --git a/src/routes/settings/ManageFederations.tsx b/src/routes/settings/ManageFederations.tsx index 24b529cb5..87dfca6b4 100644 --- a/src/routes/settings/ManageFederations.tsx +++ b/src/routes/settings/ManageFederations.tsx @@ -7,7 +7,7 @@ import { } from "@modular-forms/solid"; import { FederationBalance, TagItem } from "@mutinywallet/mutiny-wasm"; import { A, useNavigate, useSearchParams } from "@solidjs/router"; -import { BadgeCheck, LogOut, Scan, Trash } from "lucide-solid"; +import { ArrowLeftRight, BadgeCheck, LogOut, Scan, Trash } from "lucide-solid"; import { createResource, createSignal, @@ -152,8 +152,6 @@ export function AddFederationForm(props: { setSuccess( i18n.t("settings.manage_federations.federation_added_success") ); - // Reset the expiration warning seen state - actions.resetExpirationWarning(); await actions.refreshFederations(); if (props.refetch) { await props.refetch(); @@ -305,7 +303,8 @@ function FederationListItem(props: { balance?: bigint; }) { const i18n = useI18n(); - const [_state, actions, sw] = useMegaStore(); + const [state, actions, sw] = useMegaStore(); + const navigate = useNavigate(); async function removeFederation() { setConfirmLoading(true); @@ -324,6 +323,15 @@ function FederationListItem(props: { const [transferDialogOpen, setTransferDialogOpen] = createSignal(false); + async function transferFunds() { + // If there's only one federation we need to let them know to add another + if (state.federations?.length && state.federations.length < 2) { + setTransferDialogOpen(true); + } else { + navigate("/transfer?from=" + props.fed.federation_id); + } + } + const [confirmOpen, setConfirmOpen] = createSignal(false); const [confirmLoading, setConfirmLoading] = createSignal(false); @@ -385,6 +393,10 @@ function FederationListItem(props: { inviteCode={props.fed.invite_code} /> + + + {i18n.t("settings.manage_federations.transfer_funds")} + diff --git a/src/state/megaStore.tsx b/src/state/megaStore.tsx index 8221ab058..ec0245e07 100644 --- a/src/state/megaStore.tsx +++ b/src/state/megaStore.tsx @@ -28,7 +28,6 @@ import { BTC_OPTION, Currency, eify, - federationWarning, subscriptionValid, USD_OPTION } from "~/utils"; @@ -303,7 +302,23 @@ export const makeMegaStoreContext = () => { // Get federations const federations = await sw.list_federations(); - const expiration_warning = federationWarning(federations); + let expiration_warning: + | { + expiresTimestamp: number; + expiresMessage: string; + federationName: string; + } + | undefined = undefined; + + federations.forEach((f) => { + if (f.popup_countdown_message && f.popup_end_timestamp) { + expiration_warning = { + expiresTimestamp: f.popup_end_timestamp, + expiresMessage: f.popup_countdown_message, + federationName: f.federation_name + }; + } + }); setState({ wallet_loading: false, @@ -561,7 +576,23 @@ export const makeMegaStoreContext = () => { async refreshFederations() { const federations = await sw.list_federations(); - const expiration_warning = federationWarning(federations); + let expiration_warning: + | { + expiresTimestamp: number; + expiresMessage: string; + federationName: string; + } + | undefined = undefined; + + federations.forEach((f) => { + if (f.popup_countdown_message && f.popup_end_timestamp) { + expiration_warning = { + expiresTimestamp: f.popup_end_timestamp, + expiresMessage: f.popup_countdown_message, + federationName: f.federation_name + }; + } + }); setState({ federations, expiration_warning }); }, @@ -607,9 +638,6 @@ export const makeMegaStoreContext = () => { // Only show the expiration warning once per session clearExpirationWarning() { setState({ expiration_warning_seen: true }); - }, - resetExpirationWarning() { - setState({ expiration_warning_seen: false }); } }; diff --git a/src/utils/federationWarning.ts b/src/utils/federationWarning.ts deleted file mode 100644 index 8b13d53c2..000000000 --- a/src/utils/federationWarning.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { MutinyFederationIdentity } from "~/routes/settings"; - -export function federationWarning(federations: MutinyFederationIdentity[]) { - const FEDERATIONS_WITH_WARNINGS = [ - // Freedom One - "c944b2fd1e7fe04ca87f9a57d7894cb69116cec6264cb52faa71228f4ec54cd6", - // Bitcoin Principles - "b21068c84f5b12ca4fdf93f3e443d3bd7c27e8642d0d52ea2e4dce6fdbbee9df" - ]; - - let expiration_warning: - | { - expiresTimestamp: number; - expiresMessage: string; - federationName: string; - } - | undefined = undefined; - - federations.forEach((f) => { - if (f.popup_countdown_message && f.popup_end_timestamp) { - expiration_warning = { - expiresTimestamp: f.popup_end_timestamp, - expiresMessage: f.popup_countdown_message, - federationName: f.federation_name - }; - } else if (FEDERATIONS_WITH_WARNINGS.includes(f.federation_id)) { - // If the federation has no expiration warning we'll do a generic one - expiration_warning = { - expiresTimestamp: 0, - expiresMessage: "", - federationName: "" - }; - } - }); - - return expiration_warning; -} diff --git a/src/utils/index.ts b/src/utils/index.ts index c79b328b3..fbd8ef85e 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -21,4 +21,3 @@ export * from "./bech32"; export * from "./keypad"; export * from "./debounce"; export * from "./blobToBase64"; -export * from "./federationWarning";