+
-
-
-
- {receiveState() === "paid" &&
- paidState() === "lightning_paid"
- ? i18n.t("receive.payment_received")
- : i18n.t("receive.payment_initiated")}
-
-
-
-
+
+
+
+
+ {/*TODO: Confirmation time estimate still not possible needs to be implemented in mutiny-node first*/}
+
+
-
-
- {/*TODO: Confirmation time estimate still not possible needs to be implemented in mutiny-node first*/}
-
-
- {i18n.t("common.view_payment_details")}
-
-
-
-
-
-
-
-
+ {i18n.t("common.view_payment_details")}
+
+
+
+
+
+
+
);
}
diff --git a/src/routes/Search.tsx b/src/routes/Search.tsx
new file mode 100644
index 00000000..8b84c612
--- /dev/null
+++ b/src/routes/Search.tsx
@@ -0,0 +1,465 @@
+import { Clipboard } from "@capacitor/clipboard";
+import { Capacitor } from "@capacitor/core";
+import { TagItem } from "@mutinywallet/mutiny-wasm";
+import { A, useNavigate } from "@solidjs/router";
+import {
+ createMemo,
+ createResource,
+ createSignal,
+ For,
+ Match,
+ onMount,
+ Show,
+ Suspense,
+ Switch
+} from "solid-js";
+
+import close from "~/assets/icons/close.svg";
+import paste from "~/assets/icons/paste.svg";
+import scan from "~/assets/icons/scan.svg";
+import {
+ ContactEditor,
+ ContactFormValues,
+ LabelCircle,
+ LoadingShimmer,
+ NavBar,
+ showToast
+} from "~/components";
+import {
+ BackLink,
+ Button,
+ DefaultMain,
+ MutinyWalletGuard,
+ SafeArea
+} from "~/components/layout";
+import { useI18n } from "~/i18n/context";
+import { useMegaStore } from "~/state/megaStore";
+import {
+ actuallyFetchNostrProfile,
+ hexpubFromNpub,
+ profileToPseudoContact,
+ PseudoContact,
+ searchProfiles
+} from "~/utils";
+
+export function Search() {
+ return (
+
+
+
+
+
+
+ 
+ {" "}
+
+ );
+}
+
+function ActualSearch() {
+ const [searchValue, setSearchValue] = createSignal("");
+ const [state, actions] = useMegaStore();
+ const navigate = useNavigate();
+ const i18n = useI18n();
+
+ async function contactsFetcher() {
+ try {
+ const contacts: TagItem[] =
+ state.mutiny_wallet?.get_contacts_sorted();
+ return contacts || [];
+ } catch (e) {
+ console.error(e);
+ return [];
+ }
+ }
+
+ const [contacts] = createResource(contactsFetcher);
+
+ const filteredContacts = createMemo(() => {
+ const s = searchValue().toLowerCase();
+ return (
+ contacts()?.filter((c) => {
+ return (
+ c.ln_address &&
+ (c.name.toLowerCase().includes(s) ||
+ c.ln_address?.toLowerCase().includes(s) ||
+ c.npub?.includes(s))
+ );
+ }) || []
+ );
+ });
+
+ const foundNpubs = createMemo(() => {
+ return (
+ filteredContacts()
+ ?.map((c) => c.npub)
+ .filter((n) => !!n) || []
+ );
+ });
+
+ const showSendButton = createMemo(() => {
+ if (searchValue() === "") {
+ return false;
+ } else {
+ const text = searchValue().trim();
+ // Only want to check for something parseable if it's of reasonable length
+ if (text.length < 6) {
+ return false;
+ }
+ let success = false;
+ actions.handleIncomingString(
+ text,
+ (_error) => {
+ // noop
+ },
+ (_result) => {
+ success = true;
+ }
+ );
+ return success;
+ }
+ });
+
+ function handleContinue() {
+ actions.handleIncomingString(
+ searchValue().trim(),
+ (error) => {
+ showToast(error);
+ },
+ (result) => {
+ if (result) {
+ actions.setScanResult(result);
+ navigate("/send", { state: { previous: "/search" } });
+ } else {
+ showToast(new Error(i18n.t("send.error_address")));
+ }
+ }
+ );
+ }
+
+ function sendToContact(contact: TagItem) {
+ const address = contact.ln_address || contact.lnurl;
+ if (address) {
+ actions.handleIncomingString(
+ (address || "").trim(),
+ (error) => {
+ showToast(error);
+ },
+ (result) => {
+ actions.setScanResult({
+ ...result,
+ contact_id: contact.id
+ });
+ navigate("/send", { state: { previous: "/search" } });
+ }
+ );
+ } else {
+ console.error("no ln_address or lnurl");
+ }
+ }
+
+ async function createContact(contact: ContactFormValues) {
+ try {
+ const contactId = await state.mutiny_wallet?.create_new_contact(
+ contact.name,
+ contact.npub ? contact.npub.trim() : undefined,
+ contact.ln_address ? contact.ln_address.trim() : undefined,
+ undefined,
+ undefined
+ );
+
+ if (!contactId) {
+ throw new Error("no contact id returned");
+ }
+
+ const tagItem = await state.mutiny_wallet?.get_tag_item(contactId);
+
+ if (!tagItem) {
+ throw new Error("no contact returned");
+ }
+
+ sendToContact(tagItem);
+ } catch (e) {
+ console.error(e);
+ }
+ }
+
+ // Search input stuff
+ async function handlePaste() {
+ try {
+ let text;
+
+ if (Capacitor.isNativePlatform()) {
+ const { value } = await Clipboard.read();
+ text = value;
+ } else {
+ if (!navigator.clipboard.readText) {
+ return showToast(new Error(i18n.t("send.error_clipboard")));
+ }
+ text = await navigator.clipboard.readText();
+ }
+
+ const trimText = text.trim();
+ setSearchValue(trimText);
+ parsePaste(trimText);
+ } catch (e) {
+ console.error(e);
+ }
+ }
+
+ function parsePaste(text: string) {
+ actions.handleIncomingString(
+ text,
+ (error) => {
+ showToast(error);
+ },
+ (result) => {
+ actions.setScanResult(result);
+ navigate("/send", { state: { previous: "/search" } });
+ }
+ );
+ }
+
+ let searchInputRef!: HTMLInputElement;
+
+ onMount(() => {
+ searchInputRef.focus();
+ });
+
+ return (
+ <>
+
+
setSearchValue(e.currentTarget.value)}
+ placeholder="Name, address, invoice..."
+ autofocus
+ ref={(el) => (searchInputRef = el)}
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+function GlobalSearch(props: {
+ searchValue: string;
+ sendToContact: (contact: TagItem) => void;
+ foundNpubs: (string | undefined)[];
+}) {
+ const hexpubs = createMemo(() => {
+ const hexpubs: string[] = [];
+ for (const npub of props.foundNpubs) {
+ hexpubFromNpub(npub)
+ .then((h) => {
+ if (h) {
+ hexpubs.push(h);
+ }
+ })
+ .catch((e) => {
+ console.error(e);
+ });
+ }
+ return hexpubs;
+ });
+
+ async function searchFetcher(args: { value?: string; hexpubs?: string[] }) {
+ try {
+ // Handling case when value starts with "npub"
+ if (args.value?.startsWith("npub")) {
+ const hexpub = await hexpubFromNpub(args.value);
+ if (!hexpub) return [];
+
+ const profile = await actuallyFetchNostrProfile(hexpub);
+ if (!profile) return [];
+
+ const contact = profileToPseudoContact(profile);
+ return contact.ln_address ? [contact] : [];
+ }
+
+ // Handling case for other values (name, nip-05, whatever else primal searches)
+ const contacts = await searchProfiles(args.value!.toLowerCase());
+ return contacts.filter(
+ (c) => c.ln_address && !args.hexpubs?.includes(c.hexpub)
+ );
+ } catch (e) {
+ console.error(e);
+ return [];
+ }
+ }
+
+ const searchArgs = createMemo(() => {
+ if (props.searchValue) {
+ return {
+ value: props.searchValue,
+ hexpubs: hexpubs()
+ };
+ } else {
+ return {
+ value: "",
+ hexpubs: undefined
+ };
+ }
+ });
+
+ const [searchResults] = createResource(searchArgs, searchFetcher);
+
+ return (
+
+
+
+ No results found for "{props.searchValue}"
+
+
+
+
+ {(contact) => (
+
+ )}
+
+
+
+ );
+}
+
+function SingleContact(props: {
+ contact: PseudoContact;
+ sendToContact: (contact: TagItem) => void;
+}) {
+ const [state, _actions] = useMegaStore();
+ async function createContactFromSearchResult(contact: PseudoContact) {
+ try {
+ const contactId = await state.mutiny_wallet?.create_new_contact(
+ contact.name,
+ contact.hexpub ? contact.hexpub : undefined,
+ contact.ln_address ? contact.ln_address : undefined,
+ undefined,
+ contact.image_url ? contact.image_url : undefined
+ );
+
+ if (!contactId) {
+ throw new Error("no contact id returned");
+ }
+
+ const tagItem = await state.mutiny_wallet?.get_tag_item(contactId);
+
+ if (!tagItem) {
+ throw new Error("no contact returned");
+ }
+
+ props.sendToContact(tagItem);
+ } catch (e) {
+ console.error(e);
+ }
+ }
+
+ return (
+
+ );
+}
diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx
index 0223ad45..d9a7c532 100644
--- a/src/routes/Send.tsx
+++ b/src/routes/Send.tsx
@@ -1,48 +1,46 @@
-import { Clipboard } from "@capacitor/clipboard";
-import { Capacitor } from "@capacitor/core";
-import { MutinyInvoice, TagItem } from "@mutinywallet/mutiny-wasm";
+import { MutinyInvoice } from "@mutinywallet/mutiny-wasm";
import { A, useNavigate, useSearchParams } from "@solidjs/router";
import {
createEffect,
createMemo,
+ createResource,
createSignal,
+ JSX,
Match,
onMount,
Show,
+ Suspense,
Switch
} from "solid-js";
-import { Paste } from "~/assets/svg/Paste";
-import { Scan } from "~/assets/svg/Scan";
+import bolt from "~/assets/icons/bolt.svg";
+import chain from "~/assets/icons/chain.svg";
+import close from "~/assets/icons/close.svg";
import {
ActivityDetailsModal,
- AmountCard,
+ AmountEditable,
AmountFiat,
AmountSats,
- BackButton,
- BackLink,
+ BackPop,
Button,
- ButtonLink,
- Card,
DefaultMain,
Fee,
- GiftLink,
+ FeeDisplay,
HackActivityType,
- HStack,
InfoBox,
- LargeHeader,
+ LabelCircle,
+ LoadingShimmer,
MegaCheck,
MegaClock,
MegaEx,
MutinyWalletGuard,
NavBar,
- SafeArea,
showToast,
+ SimpleInput,
SmallHeader,
StringShower,
- StyledRadioGroup,
SuccessModal,
- TagEditor,
+ UnstyledBackPop,
VStack
} from "~/components";
import { useI18n } from "~/i18n/context";
@@ -65,115 +63,6 @@ type SentDetails = {
fee_estimate?: bigint | number;
};
-export function MethodChooser(props: {
- source: SendSource;
- setSource: (source: string) => void;
- both?: boolean;
-}) {
- const [store, _actions] = useMegaStore();
-
- const methods = createMemo(() => {
- const lnBalance =
- (store.balance?.lightning || 0n) +
- (store.balance?.federation || 0n);
- const onchainBalance =
- (store.balance?.confirmed || 0n) +
- (store.balance?.unconfirmed || 0n);
- return [
- {
- value: "lightning",
- label: "Lightning Balance",
- caption:
- lnBalance > 0n
- ? `${lnBalance.toLocaleString()} SATS`
- : "No balance",
- disabled: lnBalance === 0n
- },
- {
- value: "onchain",
- label: "On-chain Balance",
- caption:
- onchainBalance > 0n
- ? `${onchainBalance.toLocaleString()} SATS`
- : "No balance",
- disabled: onchainBalance === 0n
- }
- ];
- });
- return (
-
-
-
-
-
-
-
-
-
-
-
- );
-}
-
-function DestinationInput(props: {
- fieldDestination: string;
- setFieldDestination: (destination: string) => void;
- handleDecode: () => void;
- handlePaste: () => void;
-}) {
- const i18n = useI18n();
- return (
-
- {i18n.t("send.destination")}
- 
- 
- 
-