Receive Payjoin V2

src/components/ActivityDetailsModal.tsx

@@ -520,8 +520,7 @@ export function ActivityDetailsModal(props: {
             } else {
                 console.debug("reading tx: ", id());
                 const tx = await state.mutiny_wallet?.get_transaction(id());
-
-                return tx;
+                return tx !== null ? tx : id(); // if no tx found still show id
             }
         } catch (e) {
             console.error(e);

src/routes/Receive.tsx

@@ -260,7 +260,9 @@ export function Receive() {
 
             const params = objectToSearchParams({
                 amount: raw?.btc_amount,
-                lightning: raw?.invoice
+                lightning: raw?.invoice,
+                pj: raw?.pj,
+                ohttp: raw?.ohttp,
             });
 
             setLoading(false);

src/utils/objectToSearchParams.ts

@@ -5,11 +5,17 @@ export function objectToSearchParams<
         Object.entries(obj)
             .filter(([_, value]) => value !== undefined)
             // Value shouldn't be null we just filtered it out but typescript is dumb
-            .map(([key, value]) =>
-                value
-                    ? `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
-                    : ""
-            )
+            .map(([key, value]) => {
+                if (value) {
+                    if (key === "pj") {
+                        return `${key}=${value}`
+                    } else {
+                        return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`
+                    }
+                } else {
+                    return ""
+                }
+            })
             .join("&")
     );
 }