aljaz/mutiny-web
1
0
Fork 0
mirror of https://github.com/aljazceru/mutiny-web.git synced 2025-12-17 06:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "warn about bad dns federations"

Browse Source 
This reverts commit 625c0f6de7.
This commit is contained in:
Tony Giorgio
2024-07-09 12:45:13 -05:00
committed by Tony Giorgio
parent 06dbff8fda
commit 0b224f4a8d
7 changed files with 58 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/i18n/en.json
View File

@@ -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",

2
src/components/Activity.tsx
View File

@@ -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,

53
src/components/FederationPopup.tsx
View File

@@ -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 (
<SimpleDialog
title={`${i18n.t("activity.federation_message")} ${name ? `: ${name}` : ""}`}
title={`${i18n.t("activity.federation_message")}: ${state.expiration_warning?.federationName}`}
open={showFederationExpirationWarning()}
setOpen={(open: boolean) => {
if (!open) {
@@ -34,41 +27,7 @@ export function FederationPopup() {
}
}}
>
<NiceP>
{state.expiration_warning?.expiresMessage ||
i18n.t("home.federations_warn_generic")}
</NiceP>
<Show when={!name}>
<NiceP>
<ExternalLink href="https://x.com/MutinyWallet/status/1805346636660429021">
{i18n.t("settings.manage_federations.learn_more")}
</ExternalLink>
</NiceP>
</Show>
<ButtonCard
onClick={() => {
actions.clearExpirationWarning();
setShowFederationExpirationWarning(false);
navigate("/swaplightning");
}}
>
<div class="flex items-center gap-2">
<ArrowLeftRight class="inline-block text-m-red" />
<NiceP>{i18n.t("home.transfer_lightning")}</NiceP>
</div>
</ButtonCard>
<ButtonCard
onClick={() => {
actions.clearExpirationWarning();
setShowFederationExpirationWarning(false);
navigate("/send");
}}
>
<div class="flex items-center gap-2">
<ArrowUpRight class="inline-block text-m-red" />
<NiceP>{i18n.t("home.sent_to_another_wallet")}</NiceP>
</div>
</ButtonCard>
<NiceP>{state.expiration_warning?.expiresMessage}</NiceP>
<ButtonCard
onClick={() => {
actions.clearExpirationWarning();
@@ -78,7 +37,7 @@ export function FederationPopup() {
>
<div class="flex items-center gap-2">
<Users class="inline-block text-m-red" />
<NiceP>{i18n.t("profile.leave_federation")}</NiceP>
<NiceP>{i18n.t("profile.manage_federation")}</NiceP>
</div>
</ButtonCard>
</SimpleDialog>

20
src/routes/settings/ManageFederations.tsx
View File

@@ -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}
/>
</KeyValue>
<SubtleButton onClick={transferFunds}>
<ArrowLeftRight class="h-4 w-4" />
{i18n.t("settings.manage_federations.transfer_funds")}
</SubtleButton>
<Suspense>
<RecommendButton fed={props.fed} />
</Suspense>

40
src/state/megaStore.tsx
View File

@@ -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 });
}
};

37
src/utils/federationWarning.ts
View File

@@ -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;
}

1
src/utils/index.ts
View File

@@ -21,4 +21,3 @@ export * from "./bech32";
export * from "./keypad";
export * from "./debounce";
export * from "./blobToBase64";
export * from "./federationWarning";