(chatScrollRef = el)}>
-
-
- {/*
- {}}
- />
-
-
-
- {/* +{ + if (el instanceof HTMLElement) el.style.opacity = "100"; + }} + onEnter={(el, done) => { + el.animate( + [ + { transform: "translate(50vw)" }, + { transform: "translate(0)" } + ], + { duration: 100, fill: "both" } + ) + .finished.then(done) + .catch(done); + }} + onExit={(el, done) => { + el.animate( + [ + { transform: `translate(0)` }, + { transform: "translate(-50vw)" } + ], + { duration: 100 } + ) + .finished.then(done) + .catch(done); + }} + > + + + (chatScrollRef = el)} + > +-+ {/*+ + {/**/} + + + +{}} + /> + {JSON.stringify(convo(), null, 2)}*/} --- + + )} + + + - - {/* */} + {/* */} +}> - - {(combined) => ( - <> - + > +- ---+ + + }> + + {(combined) => ( + <> + + ++++ - - - - )} -- +
- setMessageValue(e.currentTarget.value)}
- placeholder="Message"
- />
-
-
-
+
+
+
+
+
);
}
diff --git a/src/routes/Main.tsx b/src/routes/Main.tsx
index 744ba597c..7286156d4 100644
--- a/src/routes/Main.tsx
+++ b/src/routes/Main.tsx
@@ -1,21 +1,11 @@
-import { TagItem } from "@mutinywallet/mutiny-wasm";
-import { useNavigate, useSearchParams } from "@solidjs/router";
-import {
- createMemo,
- createResource,
- createSignal,
- For,
- Show,
- Suspense
-} from "solid-js";
+import { createAsync, useNavigate } from "@solidjs/router";
+import { createMemo, createSignal, Show, Suspense } from "solid-js";
import receive from "~/assets/icons/receive.svg";
import scan from "~/assets/icons/scan.svg";
-import search from "~/assets/icons/search.svg";
import send from "~/assets/icons/send.svg";
import wave from "~/assets/wave.gif";
import {
- BackButton,
BalanceBox,
BetaWarningModal,
Circle,
@@ -27,54 +17,11 @@ import {
LoadingIndicator,
NavBar,
OverlayScanner,
- SafeArea
+ SafeArea,
+ SocialActionRow
} from "~/components";
import { useMegaStore } from "~/state/megaStore";
-import { ActualSearch } from "./Search";
-
-function SocialActionRow(props: { onSearch: () => void; onScan: () => void }) {
- const [state, _actions] = useMegaStore();
- const navigate = useNavigate();
-
- const [contacts] = createResource(async () => {
- try {
- const contacts: TagItem[] =
- await state.mutiny_wallet?.get_contacts_sorted();
-
- return contacts || [];
- } catch (e) {
- console.error(e);
- return [];
- }
- });
- return (
-
@@ -233,45 +175,22 @@ export function Main() {
- {/* Hidden while searching so we don't have to reload it when exiting search */}
-
+ {/*
*/} + setSearching(true)}
+ onSearch={() => navigate("/search")}
onScan={() => setScanner(true)}
/>
diff --git a/src/routes/NewProfile.tsx b/src/routes/NewProfile.tsx
index 04a44afdf..6fb79975b 100644
--- a/src/routes/NewProfile.tsx
+++ b/src/routes/NewProfile.tsx
@@ -1,36 +1,12 @@
import { Camera, CameraResultType } from "@capacitor/camera";
-import { Capacitor } from "@capacitor/core";
-import { A, useNavigate } from "@solidjs/router";
-import { createSignal, For, Match, Show, Switch } from "solid-js";
+import { useNavigate } from "@solidjs/router";
+import { createSignal, Match, Switch } from "solid-js";
-import forward from "~/assets/icons/forward.svg";
-import {
- BackLink,
- BalanceBox,
- Button,
- ButtonLink,
- CopyButton,
- DefaultMain,
- ExternalLink,
- IntegratedQr,
- LabelCircle,
- LargeHeader,
- MiniStringShower,
- MutinyPlusCta,
- NavBar,
- NiceP,
- SafeArea,
- SettingsCard,
- SimpleInput,
- TinyText,
- VStack
-} from "~/components";
-import { useI18n } from "~/i18n/context";
+import { Button, ButtonLink, DefaultMain, SimpleInput } from "~/components";
import { useMegaStore } from "~/state/megaStore";
-import { isFreeGiftingDay } from "~/utils";
export function NewProfile() {
- const [state, actions] = useMegaStore();
+ const [state, _actions] = useMegaStore();
const [nym, setNym] = createSignal("");
const [imageUri, setImageUri] = createSignal();
diff --git a/src/routes/Profile.tsx b/src/routes/Profile.tsx
index 9397813c9..b466fadfc 100644
--- a/src/routes/Profile.tsx
+++ b/src/routes/Profile.tsx
@@ -30,8 +30,6 @@ export function Profile() {
};
});
- console.log("profile", profile());
-
return (
diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx
index 513606238..f284f44e9 100644
--- a/src/routes/Receive.tsx
+++ b/src/routes/Receive.tsx
@@ -186,8 +186,8 @@ export function Receive() {
? paymentTx()?.txid
: undefined
: paymentInvoice()
- ? paymentInvoice()?.payment_hash
- : undefined;
+ ? paymentInvoice()?.payment_hash
+ : undefined;
const kind = paidState() === "onchain_paid" ? "OnChain" : "Lightning";
console.log("Opening details modal: ", paymentTxId, kind);
diff --git a/src/routes/Request.tsx b/src/routes/Request.tsx
index 648a60361..ad0b95a69 100644
--- a/src/routes/Request.tsx
+++ b/src/routes/Request.tsx
@@ -24,7 +24,7 @@ import { eify } from "~/utils";
import { DestinationItem } from "./Send";
export function RequestRoute() {
- const [state, actions] = useMegaStore();
+ const [state, _actions] = useMegaStore();
const navigate = useNavigate();
const i18n = useI18n();
diff --git a/src/routes/Search.tsx b/src/routes/Search.tsx
index 98529d720..18a4a0527 100644
--- a/src/routes/Search.tsx
+++ b/src/routes/Search.tsx
@@ -1,52 +1,14 @@
-import { Clipboard } from "@capacitor/clipboard";
-import { Capacitor } from "@capacitor/core";
-import { TagItem } from "@mutinywallet/mutiny-wasm";
-import { A, useNavigate, useSearchParams } from "@solidjs/router";
-import {
- createEffect,
- createMemo,
- createResource,
- createSignal,
- For,
- Match,
- onMount,
- Show,
- Suspense,
- Switch
-} from "solid-js";
+import { A } from "@solidjs/router";
+import { Suspense } from "solid-js";
-import close from "~/assets/icons/close.svg";
-import paste from "~/assets/icons/paste.svg";
-import receive from "~/assets/icons/receive.svg";
import scan from "~/assets/icons/scan.svg";
-import send from "~/assets/icons/send.svg";
-import {
- CombinedActivity,
- ContactEditor,
- ContactFormValues,
- LabelCircle,
- LoadingShimmer,
- NavBar,
- showToast
-} from "~/components";
+import { ActualSearch, NavBar } from "~/components";
import {
BackLink,
- Button,
DefaultMain,
MutinyWalletGuard,
SafeArea
} from "~/components/layout";
-import { useI18n } from "~/i18n/context";
-import { ParsedParams } from "~/logic/waila";
-import { useMegaStore } from "~/state/megaStore";
-import {
- actuallyFetchNostrProfile,
- debounce,
- hexpubFromNpub,
- profileToPseudoContact,
- PseudoContact,
- searchProfiles
-} from "~/utils";
export function Search() {
return (
@@ -72,459 +34,3 @@ export function Search() {
);
}
-
-export function ActualSearch(props: { initialValue?: string }) {
- const [searchValue, setSearchValue] = createSignal("");
- const [debouncedSearchValue, setDebouncedSearchValue] = createSignal("");
- const [state, actions] = useMegaStore();
- const navigate = useNavigate();
- const i18n = useI18n();
-
- const trigger = debounce((message: string) => {
- setDebouncedSearchValue(message);
- }, 250);
-
- createEffect(() => {
- trigger(searchValue());
- });
-
- 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 = debouncedSearchValue().toLowerCase();
- return (
- contacts()?.filter((c) => {
- return (
- c.name.toLowerCase().includes(s) ||
- c.ln_address?.toLowerCase().includes(s) ||
- c.lnurl?.toLowerCase().includes(s) ||
- c.npub?.includes(s)
- );
- }) || []
- );
- });
-
- const foundNpubs = createMemo(() => {
- return (
- filteredContacts()
- ?.map((c) => c.npub)
- .filter((n) => !!n) || []
- );
- });
-
- type SearchState = "notsendable" | "sendable" | "sendableWithContact";
-
- const searchState = createMemo(() => {
- if (debouncedSearchValue() === "") {
- return "notsendable";
- }
- const text = debouncedSearchValue().trim();
- // Only want to check for something parseable if it's of reasonable length
- if (text.length < 6) {
- return "notsendable";
- }
- let state: SearchState = "notsendable";
- actions.handleIncomingString(
- text,
- (_error) => {
- // noop
- },
- (result) => {
- if (result.lightning_address || result.lnurl) {
- state = "sendableWithContact";
- } else {
- state = "sendable";
- }
- }
- );
- return state;
- });
-
- function navWithSearchValue(to: string) {
- navigate(to, {
- state: {
- previous: searchValue()
- ? `/search/?search=${searchValue().trim()}`
- : "/search"
- }
- });
- }
-
- function handleContinue() {
- actions.handleIncomingString(
- debouncedSearchValue().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) {
- navWithSearchValue(`/chat/${contact.id}`);
- }
-
- 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;
-
- const [params, setParams] = useSearchParams();
-
- onMount(() => {
- setSearchValue(props.initialValue || "");
- setParams({ search: "" });
- searchInputRef.focus();
- });
-
- return (
- <>
-
- */}
-
-
-
-
-
-
- );
-}
-
-function GlobalSearch(props: {
- searchValue: string;
- sendToContact: (contact: TagItem) => void;
- foundNpubs: (string | undefined)[];
-}) {
- const hexpubs = createMemo(() => {
- const hexpubs: Set = new Set();
- for (const npub of props.foundNpubs) {
- hexpubFromNpub(npub)
- .then((h) => {
- if (h) {
- hexpubs.add(h);
- }
- })
- .catch((e) => {
- console.error(e);
- });
- }
- return hexpubs;
- });
-
- async function searchFetcher(args: {
- value?: string;
- hexpubs?: Set;
- }) {
- try {
- // Handling case when value starts with "npub"
- if (args.value?.toLowerCase().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];
- }
-
- // Handling case for other values (name, nip-05, whatever else primal searches)
- const contacts = await searchProfiles(args.value!.toLowerCase());
- return contacts.filter((c) => !args.hexpubs?.has(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 (
-
-
-
-
-
- {(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 (
- createContactFromSearchResult(props.contact)}
- />
- );
-}
-
-export function ContactButton(props: {
- contact: PseudoContact | TagItem;
- onClick: () => void;
- inList?: boolean;
-}) {
- const i18n = useI18n();
-
- const canSend = createMemo(() => {
- return !!props.contact.ln_address || !!props.contact.lnurl;
- });
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
- 
{" "}
-
-
- 
{" "}
-
-
-
- {(contact) => (
- {
- navigate(`/chat/${contact.id}`);
- }}
- />
- )}
-
-
-
- );
-}
-
function Fab(props: { onSearch: () => void; onScan: () => void }) {
const [open, setOpen] = createSignal(false);
const navigate = useNavigate();
@@ -158,7 +105,7 @@ export function WalletHeader(props: { loading: boolean }) {
const [state, _actions] = useMegaStore();
const npub = () => state.mutiny_wallet?.get_npub();
- const profile = createMemo(() => {
+ async function getProfile() {
const profile = state.mutiny_wallet?.get_nostr_profile();
return {
@@ -167,15 +114,17 @@ export function WalletHeader(props: { loading: boolean }) {
// TODO: this but for real
lud16: profile?.lud16 || "elegant-giraffe@mutiny.plus"
};
- });
+ }
+
+ const profile = createAsync(() => getProfile());
const profileImage = createMemo(() => {
if (props.loading) {
return undefined;
}
- if (profile().picture) {
- return profile().picture;
+ if (profile() && profile()!.picture) {
+ return profile()!.picture;
}
return `https://bitcoinfaces.xyz/api/get-image?name=${npub()}&onchain=false`;
@@ -209,18 +158,11 @@ export function WalletHeader(props: { loading: boolean }) {
export function Main() {
const [state, _actions] = useMegaStore();
- const [params] = useSearchParams();
- const navigate = useNavigate();
- const [searching, setSearching] = createSignal(
- params.search ? true : false
- );
+ const navigate = useNavigate();
const [scanner, setScanner] = createSignal(false);
- const npub = () => state.mutiny_wallet?.get_npub();
- const profile = () => state.mutiny_wallet?.get_nostr_profile();
-
return (
+
-
- setScanner(true)}
- onSearch={() => setSearching(true)}
- />
-
- {/*
*/} -
- */} -
- setSearching(false)}
- showOnDesktop
- />
-
+ setScanner(true)}
+ onSearch={() => navigate("/search")}
/>
-
+ */} +
- setSearchValue(e.currentTarget.value)}
- placeholder="Name, address, invoice..."
- autofocus
- ref={(el) => (searchInputRef = el)}
- />
-
-
-
-
-
-
-
- {/*
-
- 0
- }
- >
-
- {(contact) => (
- sendToContact(contact)}
- inList
- />
- )}
-
-
-
-
-
-
-
-
-
-
- Contacts
-- Global Search -
-- No results found for "{props.searchValue}" -
-
- props.onClick()}
- />
-
-
-
- );
-}
diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx
index 45565d1db..03bfe42f1 100644
--- a/src/routes/Send.tsx
+++ b/src/routes/Send.tsx
@@ -286,8 +286,8 @@ export function Send() {
? sentDetails()?.txid
: undefined
: sentDetails()
- ? sentDetails()?.payment_hash
- : undefined;
+ ? sentDetails()?.payment_hash
+ : undefined;
const kind = sentDetails()?.txid ? "OnChain" : "Lightning";
console.log("Opening details modal: ", paymentTxId, kind);
diff --git a/src/routes/Setup.tsx b/src/routes/Setup.tsx
index 47dec786b..102b354ff 100644
--- a/src/routes/Setup.tsx
+++ b/src/routes/Setup.tsx
@@ -1,35 +1,12 @@
-import { Capacitor } from "@capacitor/core";
-import { A, useNavigate } from "@solidjs/router";
-import { createSignal, For, Show } from "solid-js";
+import { useNavigate } from "@solidjs/router";
+import { createSignal } from "solid-js";
-import forward from "~/assets/icons/forward.svg";
import logo from "~/assets/mutiny-pixel-logo.png";
-import {
- BackLink,
- BalanceBox,
- Button,
- ButtonLink,
- CopyButton,
- DefaultMain,
- ExternalLink,
- IntegratedQr,
- LabelCircle,
- LargeHeader,
- MiniStringShower,
- MutinyPlusCta,
- NavBar,
- NiceP,
- SafeArea,
- SettingsCard,
- TinyText,
- VStack
-} from "~/components";
-import { useI18n } from "~/i18n/context";
+import { Button, DefaultMain, NiceP } from "~/components";
import { useMegaStore } from "~/state/megaStore";
-import { isFreeGiftingDay } from "~/utils";
export function Setup() {
- const [state, actions] = useMegaStore();
+ const [_state, actions] = useMegaStore();
const [isCreatingNewWallet, setIsCreatingNewWallet] = createSignal(false);
const navigate = useNavigate();
diff --git a/src/routes/index.ts b/src/routes/index.ts
index 8d0a94802..71ad6ef19 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -1,5 +1,4 @@
export * from "./[...404]";
-export * from "./Activity";
export * from "./Feedback";
export * from "./Gift";
export * from "./Main";
-
- - {props.contact.name} -
-- {props.contact.ln_address || - props.contact.lnurl - ?.toLowerCase() - .substring(0, 15) - .concat("...") || - i18n.t("send.no_payment_info")} -
-
-
-
-
-