From 3f916b4fbd27b619017a66c8cceb83ff6d016ed6 Mon Sep 17 00:00:00 2001
From: mrxcell <42675247+mrxcell@users.noreply.github.com>
Date: Tue, 20 Dec 2022 21:50:48 -0500
Subject: Update and rename de.json to esp.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hi Guys, i´ve made a couple of changes.

Let me know if there is a way to preview the website in spanish so i can make some adjustments.

Regards!

Yulian R.
---
 src/locales/de.json  | 277 --------------------------------------------------
 src/locales/esp.json | 282 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 282 insertions(+), 277 deletions(-)
 delete mode 100644 src/locales/de.json
 create mode 100644 src/locales/esp.json

(limited to 'src')

diff --git a/src/locales/de.json b/src/locales/de.json
deleted file mode 100644
index 2262dea3..00000000
--- a/src/locales/de.json
+++ /dev/null
@@ -1,277 +0,0 @@
-{
-	"404": {
-		"404": "404",
-		"pageNotFound": "Diese Seite konnte nicht gefunden werden."
-	},
-	"about": {
-		"header": "Über uns",
-		"p1": "Coinos ist eine Open-Source-Bitcoin-Bezahl-App. Im September 2012 starteten wir die Entwicklung in Vancouver, um lokalen Händlern eine bequeme Möglichkeit zu bieten, Bitcoin-Zahlungen zu akzeptieren.",
-		"p2": "Sie können den Quellcode herunterladen, um die Coinos-App mit Ihrem eigenen Bitcoin- und Lightning-Node zu verbinden. Gerne helfen wir Ihnen dabei, ein wertvoller Dienstleister sowie Zahlungsanbieter für Ihre Kunden zu werden.",
-		"p3": "Transaktionen zwischen Nutzerkonten auf unserem Server werden Off-Chain durchgeführt. Diese werden sofort abgewickelt und sind völlig kostenlos sowie unlimitiert.",
-		"team": {
-			"header": "Das Team",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Chief Technical Officer",
-				"bio": "Adam ist ein Webentwickler und Bitcoin-Enthusiast, der davon überzeugt ist, dass hartes Geld der Schlüssel zur Steigerung des globalen Wohlstands ist. Er lebt mit seiner Frau Chelsea und seinen zwei Kindern in North Vancouver."
-			},
-			"secondl1ght": {
-				"name": "secondl1ght",
-				"position": "Web Developer",
-				"bio": "Secondl1ght hat sich das Programmieren selbst beigebracht, ist kopfüber in den Bitcoin-Kaninchenbau gesprungen und hat seinen Fiat-Job aufgegeben, um sich voll und ganz auf die Bitcoin-Entwicklung zu konzentrieren. Er wirkt bei Open-Source-Projekten mit, ist ein Verfechter der Privatsphäre und ein Freiheitsliebhaber."
-			},
-
-			"karnage": {
-				"name": "Karnage",
-				"position": "Product Designer",
-				"bio": "Meine Mission ist es, Startup-Gründern zum Erfolg zu verhelfen. Ich entwickle Produkte, die dabei helfen, dieses Ziel zu erreichen."
-			},
-			"shauna": {
-				"name": "Shauna",
-				"position": "Operations & Marketing",
-				"bio": "Strategie- & Projektmanagement. Unser Universalgenie in allen Bereichen. Findet immer Zeit, um sich auf einen Kaffee zu treffen."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Bitcoin Experte",
-				"bio": "Als zertifizierter Bitcoin-Experte ist Cole ein engagierter Mensch mit großer Leidenschaft für Freiheit. Er entdeckte Bitcoin im Jahr 2016 und beschäftigte sich eingehend damit. Jetzt möchte er das Lightning-Netzwerk so vielen Nutzern wie möglich näherbringen."
-			},
-			"john": {
-				"name": "John Barratt",
-				"position": "Full Stack Web Developer",
-				"bio": "Wenn er nicht gerade programmiert, findet man John in der Natur beim Entdecken der vielen, großartigen Wanderwege, die BC zu bieten hat."
-			}
-		},
-		"locations": {
-			"header": "Standorte",
-			"description": "Hier finden Sie einige Unternehmen, welche bereits Zahlungen mit Bitcoin über Coinos akzeptieren. Wir hoffen, dass Ihr Unternehmen das nächste sein wird!"
-		}
-	},
-	"error": {
-		"header": "Error",
-		"message": "Bitte versuchen Sie es erneut oder kontaktieren Sie unseren Support.",
-		"signIn": "Bitte melden Sie sich an, um fortzufahren."
-	},
-	"faq": {
-		"header": "FAQ",
-		"cost": {
-			"question": "Welche Gebühren fallen an?",
-			"answer": "Die Registrierung eines Kontos sowie Zahlungen über das Lightning-Netzwerk zu erhalten ist vollkommen kostenlos. Wir erheben eine Gebühr von 0.1%, um Lightning-Bitcoin in Bitcoin umzuwandeln."
-		},
-		"compatibility": {
-			"question": "Benötige ich ein bestimmtes Gerät oder eine spezielle Software dafür?",
-			"answer": "Nein. Coinos ist web-basiert, das bedeutet, solange Sie über eine aktive Internetverbindung verfügen, können Sie Coinos auf jedem Endgerät nutzen. Einzelhändlern empfehlen wir, ein Telefon oder Tablet zu verwenden."
-		},
-		"safety": {
-			"question": "Wann wird mein Guthaben ausgezahlt?",
-			"answer": "Lightning-Zahlungen werden sofort abgewickelt. Sie können Ihr Guthaben somit unmittelbar nach Zahlungseingang auf eine andere Wallet übertragen."
-		}
-	},
-	"footer": {
-		"company": "Unternehmen",
-		"followUs": "Folge uns",
-		"github": "GitHub",
-		"jobs": "Jobs",
-		"support": "Support",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"news": "Neuigkeiten"
-	},
-	"howItWorks": {
-		"header": "So funktioniert's",
-		"step1": {
-			"header": "1. Erstellen Sie Ihr Konto",
-			"description": "Sie benötigen nur einen Benutzernamen und ein Passwort - und schon geht's los!"
-		},
-		"step2": {
-			"header": "2. Zahlungen anfordern",
-			"description": "Ganz gleich, wie Sie es normalerweise machen würden, allerdings mit Bitcoin."
-		},
-		"step3": {
-			"header": "3. Das war's!",
-			"description": "Bezahlen Sie mit Ihrem Bitcoin-Bestand bei anderen Händlern oder sparen Sie diese für schlechtere Zeiten - Sie allein haben die Wahl."
-		}
-	},
-	"invoice": {
-		"addTip": "Trinkgeld hinzufügen",
-		"addTipq": "Trinkgeld hinzufügen?",
-		"done": "Fertig",
-		"paymentSuccessful": "Zahlung erhalten!",
-		"invoice": "Rechnung",
-		"total": "Gesamtbetrag",
-		"tip": "Trinkgeld"
-	},
-	"jobs": {
-		"header": "Jobs",
-		"subheader": "Offene Stellen",
-		"pitch1": "Wir sind stets auf der Suche nach Entwicklern, die unser wachsendes Team verstärken möchten (Vollzeit oder Teilzeit, Homeoffice möglich).",
-		"pitch2": "Möchten Sie mit uns an Open-Source-Bitcoin-Projekten arbeiten? Dann werfen Sie doch einen Blick auf unsere offenen Stellen auf",
-		"github": "GitHub",
-		"pitch3": "Wenn wir Ihr Interesse geweckt haben, würden wir uns freuen, von Ihnen zu hören. Schicken Sie uns gerne Ihren Lebenslauf an"
-	},
-	"landing": {
-		"header_before_icon": "Der",
-		"header_with_icon": "einfachste",
-		"header_after_icon": "Weg um Bitcoin in Ihrem Unternehmen zu akzeptieren.",
-		"subheader": "Erweitern Sie Ihren Kundenstamm und Ihren Umsatz, indem Sie Bitcoin mit einer einfach zu bedienenden Web-App akzeptieren. Keine Software oder Hardware ist dafür erforderlich.",
-		"info1": {
-			"title": "Sofortzahlungen über Lightning",
-			"description": "Unmittelbar nachdem die Zahlung von Ihrem Kunden abgeschlossen wurde, ist diese auch bei Ihnen ersichtlich. Sie müssen sich weder um Rücklastschriften kümmern, noch auf Banküberweisungen warten. Sekundenschnelle Abrechnung - und das Beste daran: Es fallen keine 3% Kreditkartenbearbeitungsgebühren an."
-		},
-		"info2": {
-			"title": "Einfache Handhabung",
-			"description1": "Geben Sie einfach einen Betrag in Ihrer Landeswährung ein, teilen Sie den QR-Code mit Ihrem Kunden und schon sind Sie fertig.",
-			"description2": "Wir nehmen Ihnen die ganze Arbeit ab, damit Sie sich auf Ihr Geschäft konzentrieren können.",
-			"description3": "Sie haben jederzeit die Möglichkeit, selbst über Ihr Geld zu verfügen und es sofort abzuheben."
-		},
-		"info3": {
-			"title": "Gestalten Sie Ihre Übersicht nach Ihrem Geschmack",
-			"description": "Passen Sie die Übersicht dem Branding Ihres Unternehmens an oder nutzen Sie unser Standard-Design."
-		}
-	},
-	"login": {
-		"optional": "Optional",
-		"token": "2FA Token",
-		"username": "Benutzername",
-		"password": "Passwort",
-		"email": "E-Mail",
-		"passwordRecommendation": "Wir empfehlen ein langes, zufälliges Passwort, welches mit einem Passwortgenerator erstellt wurde.",
-		"forgotUserOrPassword": "Benutzername oder Passwort vergessen?",
-		"haveAccount": "Bereits registriert?",
-		"noAccount": "Noch nicht registriert?",
-		"register": "Registrieren",
-		"signIn": "Einloggen",
-		"failed": "Login fehlgeschlagen"
-	},
-	"nav": {
-		"profile": "Profil",
-		"startInSeconds": "Jetzt loslegen",
-		"account": "Konto",
-		"signIn": "Einloggen",
-		"signOut": "Ausloggen",
-		"dashboard": "Übersicht",
-		"settings": "Einstellungen",
-		"support": "Support"
-	},
-	"newSiteHeader": "Kommen Sie zu unserer <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">Eröffnungsfeier</a> in Vancouver am 26. Oktober! Auf der Suche nach der alten Coinos-Version? Besuchen Sie <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
-	"news": {
-		"header": "News",
-		"subheader": "Letzte Updates",
-		"update1": ""
-	},
-	"user": {
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Rechnung",
-		"unfollow": "Nicht mehr folgen",
-		"following": "Folgen",
-		"follow": "Folgen",
-		"remove": "Entfernen",
-		"scanToPayBTC": "Den QR-Code scannen um mit Bitcoin zu zahlen",
-		"this": "Das",
-		"lightningAddress": "Lightning Adresse",
-		"likeAnEmail": "ist wie eine E-Mail Adresse für Bitcoin. Sie können diese auf Ihrer Website oder auf Ihren Visitenkarten veröffentlichen und mehrfach verwenden.",
-		"dashboard": {
-			"go": "Los",
-			"dashboard": "Übersicht",
-			"accountBalance": "Kontostand",
-			"bitcoinPrice": "Bitcoin Preis:",
-			"conversionFeeWarning": "Es wird eine Abhebungsgebühr von 1% des Gesambetrags erhoben.",
-			"dataFromBinance": "Daten von <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "Abfragen...",
-			"optionalNote": "Notiz (optional)",
-			"send": "Senden",
-			"receive": "Erhalten",
-			"withdraw": "Senden",
-			"deposit": "Einzahlung",
-			"voucher": "Beleg"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Bitte geben Sie einen Betrag unter 1 Bitcoin ein.",
-			"showQR": "QR-Code zeigen"
-		},
-		"send": {
-			"contacts": "Kontakte",
-			"scan": "Scannen",
-			"paste": "Einfügen",
-			"next": "Weiter",
-			"placeholder": "Geben Sie eine Bitcoin-Adresse, eine Lightning-Rechnung oder einen Coinos-Benutzernamen ein"
-		},
-		"settings": {
-			"bannerImage": "Logo",
-			"profileImage": "Profilbild",
-			"oneTimeCode": "Code eingeben",
-			"accountId": "Kontoverbindung",
-			"header": "Einstellungen",
-			"ACCOUNT": "KONTO",
-			"POINT_OF_SALE": "VERKAUFSSTELLE",
-			"SECURITY": "SICHERHEIT",
-			"locale": "Sprache",
-			"username": "Benutzername",
-			"email": "E-Mail",
-			"newPassword": "Neues Passwort",
-			"businessAddress": "Unternehmensadresse",
-			"emailNotifications": "E-Mail-Benachrichtigungen",
-			"emailNotificationsDescription": "Sie werden per E-Mail benachrichtigt, wenn eine Änderung auf Ihrem Konto vorgenommen wurde oder Ihnen jemand Zahlungen sendet.",
-			"smsNotifications": "SMS-Benachrichtigungen",
-			"smsNotificationsDescription": "Coinos wird Benachrichtigungen per SMS zusenden, wenn diese Funktion aktiviert ist.",
-			"theme": "Farbdesign",
-			"themeDescription": "Wählen Sie aus unseren Standard-Farbdesigns.",
-			"localCurrency": "Landeswährung",
-			"btcUnit": "Bitcoin anzeigen in:",
-			"bitcoin": "Bitcoin",
-			"satoshis": "Satoshis",
-			"securityPIN": "Sicherheitscode",
-			"securityPINDescription": "Legen Sie einen Sicherheitscode fest, der zum Entsperren Ihrer Einstellungen und zum Senden ausgehender Zahlungen verwendet wird.",
-			"setPIN": "Set PIN",
-			"autoLock": "Timer für automatische Sperre",
-			"autoLockDescription": "Ihr Konto wird nach einer bestimmten Zeit automatisch in einen sicheren Modus versetzt:",
-			"twofa": "2-Faktor Authentifizierung",
-			"twofaDescription": "Erhöhen Sie das Sicherheitslevel Ihres Geräts, indem Sie die 2-Faktor-Authentifizierung aktivieren.",
-			"twofaSetup": "2FA einrichten",
-			"twofaDisable": "2FA deaktivieren",
-			"select": "Auswählen",
-			"verifyPIN": "Sicherheitscode verifizieren",
-			"enablePIN": "PIN aktivieren",
-			"disablePIN": "PIN deaktivieren"
-		},
-		"support": {
-			"header": "Support",
-			"email": "E-Mail",
-			"accountName": "Kontoname",
-			"message": "Nachricht",
-			"send": "Senden"
-		}
-	},
-	"transactions": {
-		"header": "Transaktionen",
-		"AMOUNT": "GESAMTBETRAG",
-		"TYPE": "TYP",
-		"TIME": "ZEIT",
-		"sent": "Gesendet",
-		"received": "Erhalten",
-		"empty": "Noch keine Transaktionen erhalten.",
-		"send": "Senden",
-		"next": "Weiter",
-		"sendersChoice": "Absender",
-		"sendTo": "Senden an",
-		"to": "an",
-		"pay": "Bezahlen",
-		"requesting": "ersucht um",
-		"sentInvoiceTo": "Rechnung senden an",
-		"sentRequestTo": "Anfrage senden an",
-		"pleasePay": "Bitte bezahlen Sie",
-		"day": "Tag",
-		"week": "Woche",
-		"month": "Monat",
-		"all": "Alles",
-		"export": "Exportieren",
-		"invoice": "Rechnung",
-		"readyToPay": "Steht zur Zahlung bereit",
-		"describeOrder": "Benutzen Sie dieses Feld um Ihre Bestellung zu beschreiben",
-		"requestAnInvoice": "Rechnung anfordern",
-		"submit": "Übermitteln",
-		"isRequesting": "Anfragen",
-		"awaiting": "Warten auf"
-	}
-}
diff --git a/src/locales/esp.json b/src/locales/esp.json
new file mode 100644
index 00000000..87de05d2
--- /dev/null
+++ b/src/locales/esp.json
@@ -0,0 +1,282 @@
+{
+	"404": {
+		"404": "404",
+		"pageNotFound": "Pagina no encontrada."
+	},
+	"about": {
+		"header": "Sobre Nosotros",
+		"p1": "Coinos es una aplicación de pagos en bitcoin de código abierto. Este desarrollo comenzó en septiembre de 2012 en Vancouver como una forma de proporcionar a los comerciantes locales una forma conveniente de aceptar pagos con bitcoin.",
+		"p2": "Descarga el código fuente para ejecutar una instancia y conectarla a tu propio nodo bitcoin y lightning. Te ayudaremos a convertirte en un excelente custodio y proveedor de pagos para tu comunidad.",
+		"p3": "Las transferencias de bitcoin entre usuarios en nuestro servidor se realizan off-chain, por lo que son completamente gratuitas, instantáneas e ilimitadas.",
+		"team": {
+			"header": "Nuestro Equipo",
+			"adam": {
+				"name": "Adam Soltys",
+				"position": "Director de Tecnología",
+				"bio": "Adam es un desarrollador web y un entusiasta de bitcoin que cree que el dinero sólido es clave para aumentar la prosperidad global. Vive en la ciudad de North Vancouver con su esposa Chelsea y sus dos hijos."
+			},
+			"secondl1ght": {
+				"name": "secondl1ght",
+				"position": "Desarrollador Web",
+				"bio": "Desarrollador web autodidacta, se sumergió de cabeza en con el bitcoin y dejó su trabajo fiduciario para concentrarse en el desarrollo de bitcoin a tiempo completo. Contribuye en proyectos de código abierto, es un defensor de la privacidad y un amante de la libertad."
+			},
+
+			"karnage": {
+				"name": "Karnage",
+				"position": "Diseñador de Producto",
+				"bio": "Mi misión es ayudar a los fundadores de startups a tener éxito. Creo productos para lograr estos objetivos. Diseño de producto con píxeles perfectos. Haz que te lo envíen."
+			},
+			"shauna": {
+				"name": "Shauna",
+				"position": "Operaciones y Mercadeo",
+				"bio": "Gestión Estratégica y de Proyectos. Sé un poco de todo. Siempre habrá tiempo para compartir un buen café."
+			},
+			"cole": {
+				"name": "Cole",
+				"position": "Profesional de Bitcoin",
+				"bio": "Como profesional certificado de Bitcoin, Cole es una persona motivada y apasionada por la libertad. Conoció el bitcoin en 2016 y lo estudió en profundidad. Ahora quiere presentarle la Red Lightning a tantos usuarios como sea posible."
+			},
+			"john": {
+				"name": "John Barratt",
+				"position": "Desarrollador Web Full Stack",
+				"bio": "Cuando no está programando, podemos encontrar a John en el bosque recorriendo todos los grandes senderos que British Columbia tiene para ofrecer."
+			}
+		},
+		"locations": {
+			"header": "Locaciones",
+			"description": "Aquí algunas empresas que aceptan bitcoin con Coinos. ¡Esperamos que el tuyo sea el próximo!"
+		}
+	},
+	"error": {
+		"header": "Error",
+		"message": "Vuelva a intentarlo o póngase en contacto con el soporte.",
+		"signIn": "Por favor inicie sesión para continuar."
+	},
+	"faq": {
+		"header": "FAQ",
+		"cost": {
+			"question": "¿Cuánto cuesta?",
+			"answer": "Registrar una cuenta y recibir pagos a través de Red Lightning es gratis. Cobramos una tarifa del 0,1% por convertir de lightning a bitcoin."
+		},
+		"compatibility": {
+			"question": "¿Necesito algún dispositivo o software especial?",
+			"answer": "No. Coinos es una aplicación web, por lo que siempre que tenga conexión a Internet, podrá usarlo desde cualquier dispositivo. Las tiendas minoristas pueden usarlo desde un teléfono o una tableta."
+		},
+		"safety": {
+			"question": "¿Cuándo se liquidan mis fondos?",
+			"answer": "Los pagos en Red Lightning se liquidan al instante. Puede retirar su saldo a otra billetera o exchange inmediatamente después de recibir el pago."
+		}
+	},
+	"footer": {
+		"company": "Empresa",
+		"followUs": "Síguenos",
+		"github": "GitHub",
+		"jobs": "Trabaje con nosotros",
+		"support": "Soporte",
+		"telegram": "Telegram",
+		"twitter": "Twitter",
+		"news": "Noticias"
+	},
+	"howItWorks": {
+		"header": "Cómo funciona",
+		"step1": {
+			"header": "1. Crea tu cuenta",
+			"description": "Un nombre de usuario y una contraseña es todo lo que necesita para comenzar."
+		},
+		"step2": {
+			"header": "2. Cobra tus pagos",
+			"description": "Lo mismo que harías normalmente, pero con bitcoin."
+		},
+		"step3": {
+			"header": "3. ¡Eso es todo!",
+			"description": "Haz pagos con otros comerciantes o guarda tu bitcoin para días difíciles, la elección es tuya."
+		}
+	},
+	"invoice": {
+		"addTip": "Añadir propina,
+		"addTipq": "Añadir propina?",
+		"done": "Hecho",
+		"paymentSuccessful": "¡Pago recibido!",
+		"invoice": "Factura",
+		"total": "Total",
+		"tip": "Propina"
+	},
+	"jobs": {
+		"header": "Trabaje con nosotros",
+		"subheader": "Ofertas de Trabajo",
+		"pitch1": "Coinos está activamente buscando desarrolladores para unirse a nuestro equipo en crecimiento (tiempo completo o medio tiempo, trabajo remoto OK).",
+		"pitch2": "¿Emocionado por trabajar en bitcoin de código abierto? Entonces eche un vistazo a nuestros repositorios en",
+		"github": "GitHub",
+		"pitch3": "Si crees que puedes generar impacto, nos encantaría saber de ti. Envíanos tu currículum a"
+	},
+	"landing": {
+		"header_before_icon": "La",
+		"header_with_icon": "manera",
+		"header_after_icon": "más fácil de aceptar bitcoins en tu tienda.",
+		"subheader": "Aumenta tu número de clientes e ingresos al aceptar bitcoin con una aplicación web fácil de usar. No requiere software ni hardware.",
+		"info1": {
+			"title": "Pagos instantáneos a través de Lightning",
+			"description": "El momento en que su cliente envía un pago, este llega inmediatamente. Sin esperar liquidaciones bancarias ni preocuparse por cargos extras. Liquidación instantánea, en segundos. Diga adiós a los cargos del 3% de las tarifas en tarjetas de crédito."
+		},
+		"info2": {
+			"title": "Fácil de usar",
+			"description1": "Solo ingrese una cantidad en su moneda local, comparta el código QR y listo.",
+			"description2": "Hacemos todo el trabajo pesado para que pueda concentrarse en su negocio.",
+			"description3": "Siempre tiene la opción de tomar la custodia de sus fondos al retirarlos instantáneamente en cualquier momento"."
+		},
+		"info3": {
+			"title": "Maneja tu marca a tu manera!",
+			"description": "Personalice la apariencia y el estilo del punto de venta de tu negocio a tu gusto: depende totalmente de ti."
+		}
+	},
+	"login": {
+		"optional": "Opcional",
+		"token": "Token 2FA",
+		"username": "Usuario",
+		"password": "Contraseña",
+		"email": "Correo",
+		"passwordRecommendation": "Recomendamos una contraseña larga y aleatoria generada con un administrador de contraseñas.",
+		"forgotUserOrPassword": "¿Olvidaste tu nombre de usuario o contraseña?",
+		"haveAccount": "¿Ya tienes una cuenta?",
+		"noAccount": "¿No tienes una cuenta?",
+		"register": "Registro",
+		"signIn": "Registrarse",
+		"failed": "Fallo en Inicio"
+	},
+	"nav": {
+		"profile": "Perfil",
+		"startInSeconds": "Comience en segundos",
+		"account": "Cuenta",
+		"signIn": "Registrarse",
+		"signOut": "Desconectar",
+		"dashboard": "Panel",
+		"settings": "Ajustes",
+		"support": "Soporte"
+	},
+	"newSiteHeader": "Acompañanos en nuestra <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> en Vancouver el 26 de Octubre! Buscando la version anterior de coinos? Visita <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+	"news": {
+		"header": "Noticias",
+		"subheader": "Últimas Actualizaciones",
+		"update1": ""
+	},
+	"user": {
+		"bitcoin": "Bitcoin",
+		"lightning": "Lightning",
+		"invoice": "Factura",
+		"unfollow": "Dejar de seguir",
+		"following": "Siguiendo",
+		"follow": "Seguir",
+		"remove": "Eliminar",
+		"scanToPayBTC": "Escanear para pagar con bitcoin",
+		"this": "Esta",
+		"lightningAddress": "dirección lightning",
+		"likeAnEmail": "es como un correo electrónico para bitcoin. Puede publicarlo en su sitio web o tarjetas de presentación y usarlo múltiples veces.",
+		"dashboard": {
+			"go": "Ir",
+			"dashboard": "Panel",
+			"accountBalance": "Saldo de la cuenta",
+			"bitcoinPrice": "Precio de Bitcoin:",
+			"conversionFeeWarning": "Se le cobrará una tarifa de retiro del 1% sobre el monto.",
+			"dataFromBinance": "Datos de <span class=\"text-black\">Binance</span>.",
+			"fetchingRate": "calculando tasa...",
+			"optionalNote": "Nota (Opcional)",
+			"send": "Enviar",
+			"receive": "Recibir",
+			"withdraw": "Retirar",
+			"deposit": "Depositar",
+			"voucher": "Comprobante"
+		},
+		"receive": {
+			"lessThan1BTCWarning": "Introduzca una cantidad inferior a 1 bitcoin.",
+			"showQR": "Mostrar código QR"
+		},
+		"send": {
+			"contacts": "Contactos",
+			"scan": "Escanear",
+			"paste": "Pegar",
+			"next": "Siguiente",
+			"placeholder": "Asigne una dirección de bitcoin, una factura lightning o un usuario de coinos"
+		},
+		"settings": {
+			"bannerImage": "Imagen del Banner",
+			"profileImage": "Imagen de perfil",
+			"oneTimeCode": "Ingrese el código de un solo uso",
+			"accountId": "Id Cuenta",
+			"header": "Ajustes",
+			"ACCOUNT": "CUENTA",
+			"POINT_OF_SALE": "PUNTO DE VENTA",
+			"SECURITY": "SEGURIDAD",
+			"locale": "Idioma",
+			"username": "Usuario",
+			"email": "Correo",
+			"newPassword": "Nueva contraseña",
+			"businessAddress": "Dirección Negocio",
+			"emailNotifications": "Notificaciones de Correo Electrónico",
+			"emailNotificationsDescription": "Reciba notificaciones por correo electrónico cuando se produzca un cambio en su cuenta o cuando las personas le envíen pagos.",
+			"smsNotifications": "Notificaciones SMS",
+			"smsNotificationsDescription": "Coinos enviará notificaciones de texto cuando esto esté habilitado.",
+			"theme": "Color Tema",
+			"themeDescription": "Seleccione entre los temas de color predeterminados.",
+			"localCurrency": "Moneda Local",
+			"btcUnit": "Ver bitcoin en:",
+			"bitcoin": "bitcoin",
+			"satoshis": "Satoshis",
+			"securityPIN": "PIN de Seguridad",
+			"securityPINDescription": "Establezca un pin de seguridad para desbloquear la configuración y enviar pagos.",
+			"setPIN": "Establecer PIN",
+			"autoLock": "Temporizador de bloqueo automático",
+			"autoLockDescription": "Su cuenta entrará en modo seguro automáticamente después del tiempo especificado:",
+			"twofa": "Autenticación de 2 factores",
+			"twofaDescription": "Agregue una capa extra de seguridad a su dispositivo habilitando la autenticación de 2 factores.",
+			"twofaSetup": "Configurar 2FA",
+			"twofaDisable": "Deshabilitar 2FA",
+			"select": "Seleccionar",
+			"verifyPIN": "Verificar PIN",
+			"enablePIN": "Habilitar PIN",
+			"disablePIN": "Deshabilitar PIN"
+		},
+		"support": {
+			"header": "Soporte",
+			"email": "Correo",
+			"accountName": "Nombre Cuenta",
+			"message": "Mensaje",
+			"send": "Enviar"
+		}
+	},
+	"transactions": {
+		"header": "Transacciones",
+		"AMOUNT": "CANTIDAD",
+		"TYPE": "TIPO",
+		"TIME": "HORA",
+		"sent": "Enviado",
+		"received": "Recibido",
+		"empty": "Aún no hay transacciones.",
+		"send": "Enviado",
+		"next": "Siguiente",
+		"sendersChoice": "Sender's choice",
+		"sendTo": "Enviar a",
+		"to": "para",
+		"pay": "Pagar",
+		"requesting": "está solicitando",
+		"sentInvoiceTo": "Enviar factura a",
+		"sentRequestTo": "Enviar solicitud a",
+		"pleasePay": "Por favor pague",
+		"day": "Día",
+		"week": "Semana",
+		"month": "Mes",
+		"all": "Todo",
+		"export": "Exportar",
+		"invoice": "Factura",
+		"readyToPay": "está listo para pagar",
+		"describeOrder": "Utilice este campo para describir su orden",
+		"requestAnInvoice": "Solicitar factura",
+		"submit": "Enviar",
+		"isRequesting": "está solicitando",
+		"awaiting": "Esperando",
+		"tapAnywhere": "Toca en cualquier lugar",
+		"from": "de",
+		"redeem": "Redimir",
+		"redeemed": "Redimido",
+		"redeemedBy": "Redimido por"
+	}
+}
-- 
cgit v1.2.3


From 055119feb0f856069ce4210a90fabcffb1454dd1 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 20 Dec 2022 23:00:12 -0800
Subject: restore de translation

---
 src/locales/de.json | 277 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/locales/es.json | 257 ++++++++++++++++++++++++------------------------
 2 files changed, 409 insertions(+), 125 deletions(-)
 create mode 100644 src/locales/de.json

(limited to 'src')

diff --git a/src/locales/de.json b/src/locales/de.json
new file mode 100644
index 00000000..2262dea3
--- /dev/null
+++ b/src/locales/de.json
@@ -0,0 +1,277 @@
+{
+	"404": {
+		"404": "404",
+		"pageNotFound": "Diese Seite konnte nicht gefunden werden."
+	},
+	"about": {
+		"header": "Über uns",
+		"p1": "Coinos ist eine Open-Source-Bitcoin-Bezahl-App. Im September 2012 starteten wir die Entwicklung in Vancouver, um lokalen Händlern eine bequeme Möglichkeit zu bieten, Bitcoin-Zahlungen zu akzeptieren.",
+		"p2": "Sie können den Quellcode herunterladen, um die Coinos-App mit Ihrem eigenen Bitcoin- und Lightning-Node zu verbinden. Gerne helfen wir Ihnen dabei, ein wertvoller Dienstleister sowie Zahlungsanbieter für Ihre Kunden zu werden.",
+		"p3": "Transaktionen zwischen Nutzerkonten auf unserem Server werden Off-Chain durchgeführt. Diese werden sofort abgewickelt und sind völlig kostenlos sowie unlimitiert.",
+		"team": {
+			"header": "Das Team",
+			"adam": {
+				"name": "Adam Soltys",
+				"position": "Chief Technical Officer",
+				"bio": "Adam ist ein Webentwickler und Bitcoin-Enthusiast, der davon überzeugt ist, dass hartes Geld der Schlüssel zur Steigerung des globalen Wohlstands ist. Er lebt mit seiner Frau Chelsea und seinen zwei Kindern in North Vancouver."
+			},
+			"secondl1ght": {
+				"name": "secondl1ght",
+				"position": "Web Developer",
+				"bio": "Secondl1ght hat sich das Programmieren selbst beigebracht, ist kopfüber in den Bitcoin-Kaninchenbau gesprungen und hat seinen Fiat-Job aufgegeben, um sich voll und ganz auf die Bitcoin-Entwicklung zu konzentrieren. Er wirkt bei Open-Source-Projekten mit, ist ein Verfechter der Privatsphäre und ein Freiheitsliebhaber."
+			},
+
+			"karnage": {
+				"name": "Karnage",
+				"position": "Product Designer",
+				"bio": "Meine Mission ist es, Startup-Gründern zum Erfolg zu verhelfen. Ich entwickle Produkte, die dabei helfen, dieses Ziel zu erreichen."
+			},
+			"shauna": {
+				"name": "Shauna",
+				"position": "Operations & Marketing",
+				"bio": "Strategie- & Projektmanagement. Unser Universalgenie in allen Bereichen. Findet immer Zeit, um sich auf einen Kaffee zu treffen."
+			},
+			"cole": {
+				"name": "Cole",
+				"position": "Bitcoin Experte",
+				"bio": "Als zertifizierter Bitcoin-Experte ist Cole ein engagierter Mensch mit großer Leidenschaft für Freiheit. Er entdeckte Bitcoin im Jahr 2016 und beschäftigte sich eingehend damit. Jetzt möchte er das Lightning-Netzwerk so vielen Nutzern wie möglich näherbringen."
+			},
+			"john": {
+				"name": "John Barratt",
+				"position": "Full Stack Web Developer",
+				"bio": "Wenn er nicht gerade programmiert, findet man John in der Natur beim Entdecken der vielen, großartigen Wanderwege, die BC zu bieten hat."
+			}
+		},
+		"locations": {
+			"header": "Standorte",
+			"description": "Hier finden Sie einige Unternehmen, welche bereits Zahlungen mit Bitcoin über Coinos akzeptieren. Wir hoffen, dass Ihr Unternehmen das nächste sein wird!"
+		}
+	},
+	"error": {
+		"header": "Error",
+		"message": "Bitte versuchen Sie es erneut oder kontaktieren Sie unseren Support.",
+		"signIn": "Bitte melden Sie sich an, um fortzufahren."
+	},
+	"faq": {
+		"header": "FAQ",
+		"cost": {
+			"question": "Welche Gebühren fallen an?",
+			"answer": "Die Registrierung eines Kontos sowie Zahlungen über das Lightning-Netzwerk zu erhalten ist vollkommen kostenlos. Wir erheben eine Gebühr von 0.1%, um Lightning-Bitcoin in Bitcoin umzuwandeln."
+		},
+		"compatibility": {
+			"question": "Benötige ich ein bestimmtes Gerät oder eine spezielle Software dafür?",
+			"answer": "Nein. Coinos ist web-basiert, das bedeutet, solange Sie über eine aktive Internetverbindung verfügen, können Sie Coinos auf jedem Endgerät nutzen. Einzelhändlern empfehlen wir, ein Telefon oder Tablet zu verwenden."
+		},
+		"safety": {
+			"question": "Wann wird mein Guthaben ausgezahlt?",
+			"answer": "Lightning-Zahlungen werden sofort abgewickelt. Sie können Ihr Guthaben somit unmittelbar nach Zahlungseingang auf eine andere Wallet übertragen."
+		}
+	},
+	"footer": {
+		"company": "Unternehmen",
+		"followUs": "Folge uns",
+		"github": "GitHub",
+		"jobs": "Jobs",
+		"support": "Support",
+		"telegram": "Telegram",
+		"twitter": "Twitter",
+		"news": "Neuigkeiten"
+	},
+	"howItWorks": {
+		"header": "So funktioniert's",
+		"step1": {
+			"header": "1. Erstellen Sie Ihr Konto",
+			"description": "Sie benötigen nur einen Benutzernamen und ein Passwort - und schon geht's los!"
+		},
+		"step2": {
+			"header": "2. Zahlungen anfordern",
+			"description": "Ganz gleich, wie Sie es normalerweise machen würden, allerdings mit Bitcoin."
+		},
+		"step3": {
+			"header": "3. Das war's!",
+			"description": "Bezahlen Sie mit Ihrem Bitcoin-Bestand bei anderen Händlern oder sparen Sie diese für schlechtere Zeiten - Sie allein haben die Wahl."
+		}
+	},
+	"invoice": {
+		"addTip": "Trinkgeld hinzufügen",
+		"addTipq": "Trinkgeld hinzufügen?",
+		"done": "Fertig",
+		"paymentSuccessful": "Zahlung erhalten!",
+		"invoice": "Rechnung",
+		"total": "Gesamtbetrag",
+		"tip": "Trinkgeld"
+	},
+	"jobs": {
+		"header": "Jobs",
+		"subheader": "Offene Stellen",
+		"pitch1": "Wir sind stets auf der Suche nach Entwicklern, die unser wachsendes Team verstärken möchten (Vollzeit oder Teilzeit, Homeoffice möglich).",
+		"pitch2": "Möchten Sie mit uns an Open-Source-Bitcoin-Projekten arbeiten? Dann werfen Sie doch einen Blick auf unsere offenen Stellen auf",
+		"github": "GitHub",
+		"pitch3": "Wenn wir Ihr Interesse geweckt haben, würden wir uns freuen, von Ihnen zu hören. Schicken Sie uns gerne Ihren Lebenslauf an"
+	},
+	"landing": {
+		"header_before_icon": "Der",
+		"header_with_icon": "einfachste",
+		"header_after_icon": "Weg um Bitcoin in Ihrem Unternehmen zu akzeptieren.",
+		"subheader": "Erweitern Sie Ihren Kundenstamm und Ihren Umsatz, indem Sie Bitcoin mit einer einfach zu bedienenden Web-App akzeptieren. Keine Software oder Hardware ist dafür erforderlich.",
+		"info1": {
+			"title": "Sofortzahlungen über Lightning",
+			"description": "Unmittelbar nachdem die Zahlung von Ihrem Kunden abgeschlossen wurde, ist diese auch bei Ihnen ersichtlich. Sie müssen sich weder um Rücklastschriften kümmern, noch auf Banküberweisungen warten. Sekundenschnelle Abrechnung - und das Beste daran: Es fallen keine 3% Kreditkartenbearbeitungsgebühren an."
+		},
+		"info2": {
+			"title": "Einfache Handhabung",
+			"description1": "Geben Sie einfach einen Betrag in Ihrer Landeswährung ein, teilen Sie den QR-Code mit Ihrem Kunden und schon sind Sie fertig.",
+			"description2": "Wir nehmen Ihnen die ganze Arbeit ab, damit Sie sich auf Ihr Geschäft konzentrieren können.",
+			"description3": "Sie haben jederzeit die Möglichkeit, selbst über Ihr Geld zu verfügen und es sofort abzuheben."
+		},
+		"info3": {
+			"title": "Gestalten Sie Ihre Übersicht nach Ihrem Geschmack",
+			"description": "Passen Sie die Übersicht dem Branding Ihres Unternehmens an oder nutzen Sie unser Standard-Design."
+		}
+	},
+	"login": {
+		"optional": "Optional",
+		"token": "2FA Token",
+		"username": "Benutzername",
+		"password": "Passwort",
+		"email": "E-Mail",
+		"passwordRecommendation": "Wir empfehlen ein langes, zufälliges Passwort, welches mit einem Passwortgenerator erstellt wurde.",
+		"forgotUserOrPassword": "Benutzername oder Passwort vergessen?",
+		"haveAccount": "Bereits registriert?",
+		"noAccount": "Noch nicht registriert?",
+		"register": "Registrieren",
+		"signIn": "Einloggen",
+		"failed": "Login fehlgeschlagen"
+	},
+	"nav": {
+		"profile": "Profil",
+		"startInSeconds": "Jetzt loslegen",
+		"account": "Konto",
+		"signIn": "Einloggen",
+		"signOut": "Ausloggen",
+		"dashboard": "Übersicht",
+		"settings": "Einstellungen",
+		"support": "Support"
+	},
+	"newSiteHeader": "Kommen Sie zu unserer <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">Eröffnungsfeier</a> in Vancouver am 26. Oktober! Auf der Suche nach der alten Coinos-Version? Besuchen Sie <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+	"news": {
+		"header": "News",
+		"subheader": "Letzte Updates",
+		"update1": ""
+	},
+	"user": {
+		"bitcoin": "Bitcoin",
+		"lightning": "Lightning",
+		"invoice": "Rechnung",
+		"unfollow": "Nicht mehr folgen",
+		"following": "Folgen",
+		"follow": "Folgen",
+		"remove": "Entfernen",
+		"scanToPayBTC": "Den QR-Code scannen um mit Bitcoin zu zahlen",
+		"this": "Das",
+		"lightningAddress": "Lightning Adresse",
+		"likeAnEmail": "ist wie eine E-Mail Adresse für Bitcoin. Sie können diese auf Ihrer Website oder auf Ihren Visitenkarten veröffentlichen und mehrfach verwenden.",
+		"dashboard": {
+			"go": "Los",
+			"dashboard": "Übersicht",
+			"accountBalance": "Kontostand",
+			"bitcoinPrice": "Bitcoin Preis:",
+			"conversionFeeWarning": "Es wird eine Abhebungsgebühr von 1% des Gesambetrags erhoben.",
+			"dataFromBinance": "Daten von <span class=\"text-black\">Binance</span>.",
+			"fetchingRate": "Abfragen...",
+			"optionalNote": "Notiz (optional)",
+			"send": "Senden",
+			"receive": "Erhalten",
+			"withdraw": "Senden",
+			"deposit": "Einzahlung",
+			"voucher": "Beleg"
+		},
+		"receive": {
+			"lessThan1BTCWarning": "Bitte geben Sie einen Betrag unter 1 Bitcoin ein.",
+			"showQR": "QR-Code zeigen"
+		},
+		"send": {
+			"contacts": "Kontakte",
+			"scan": "Scannen",
+			"paste": "Einfügen",
+			"next": "Weiter",
+			"placeholder": "Geben Sie eine Bitcoin-Adresse, eine Lightning-Rechnung oder einen Coinos-Benutzernamen ein"
+		},
+		"settings": {
+			"bannerImage": "Logo",
+			"profileImage": "Profilbild",
+			"oneTimeCode": "Code eingeben",
+			"accountId": "Kontoverbindung",
+			"header": "Einstellungen",
+			"ACCOUNT": "KONTO",
+			"POINT_OF_SALE": "VERKAUFSSTELLE",
+			"SECURITY": "SICHERHEIT",
+			"locale": "Sprache",
+			"username": "Benutzername",
+			"email": "E-Mail",
+			"newPassword": "Neues Passwort",
+			"businessAddress": "Unternehmensadresse",
+			"emailNotifications": "E-Mail-Benachrichtigungen",
+			"emailNotificationsDescription": "Sie werden per E-Mail benachrichtigt, wenn eine Änderung auf Ihrem Konto vorgenommen wurde oder Ihnen jemand Zahlungen sendet.",
+			"smsNotifications": "SMS-Benachrichtigungen",
+			"smsNotificationsDescription": "Coinos wird Benachrichtigungen per SMS zusenden, wenn diese Funktion aktiviert ist.",
+			"theme": "Farbdesign",
+			"themeDescription": "Wählen Sie aus unseren Standard-Farbdesigns.",
+			"localCurrency": "Landeswährung",
+			"btcUnit": "Bitcoin anzeigen in:",
+			"bitcoin": "Bitcoin",
+			"satoshis": "Satoshis",
+			"securityPIN": "Sicherheitscode",
+			"securityPINDescription": "Legen Sie einen Sicherheitscode fest, der zum Entsperren Ihrer Einstellungen und zum Senden ausgehender Zahlungen verwendet wird.",
+			"setPIN": "Set PIN",
+			"autoLock": "Timer für automatische Sperre",
+			"autoLockDescription": "Ihr Konto wird nach einer bestimmten Zeit automatisch in einen sicheren Modus versetzt:",
+			"twofa": "2-Faktor Authentifizierung",
+			"twofaDescription": "Erhöhen Sie das Sicherheitslevel Ihres Geräts, indem Sie die 2-Faktor-Authentifizierung aktivieren.",
+			"twofaSetup": "2FA einrichten",
+			"twofaDisable": "2FA deaktivieren",
+			"select": "Auswählen",
+			"verifyPIN": "Sicherheitscode verifizieren",
+			"enablePIN": "PIN aktivieren",
+			"disablePIN": "PIN deaktivieren"
+		},
+		"support": {
+			"header": "Support",
+			"email": "E-Mail",
+			"accountName": "Kontoname",
+			"message": "Nachricht",
+			"send": "Senden"
+		}
+	},
+	"transactions": {
+		"header": "Transaktionen",
+		"AMOUNT": "GESAMTBETRAG",
+		"TYPE": "TYP",
+		"TIME": "ZEIT",
+		"sent": "Gesendet",
+		"received": "Erhalten",
+		"empty": "Noch keine Transaktionen erhalten.",
+		"send": "Senden",
+		"next": "Weiter",
+		"sendersChoice": "Absender",
+		"sendTo": "Senden an",
+		"to": "an",
+		"pay": "Bezahlen",
+		"requesting": "ersucht um",
+		"sentInvoiceTo": "Rechnung senden an",
+		"sentRequestTo": "Anfrage senden an",
+		"pleasePay": "Bitte bezahlen Sie",
+		"day": "Tag",
+		"week": "Woche",
+		"month": "Monat",
+		"all": "Alles",
+		"export": "Exportieren",
+		"invoice": "Rechnung",
+		"readyToPay": "Steht zur Zahlung bereit",
+		"describeOrder": "Benutzen Sie dieses Feld um Ihre Bestellung zu beschreiben",
+		"requestAnInvoice": "Rechnung anfordern",
+		"submit": "Übermitteln",
+		"isRequesting": "Anfragen",
+		"awaiting": "Warten auf"
+	}
+}
diff --git a/src/locales/es.json b/src/locales/es.json
index 5043243e..87de05d2 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -1,275 +1,282 @@
 {
 	"404": {
 		"404": "404",
-		"pageNotFound": "La página no existe."
+		"pageNotFound": "Pagina no encontrada."
 	},
 	"about": {
-		"header": "Sobre",
-		"p1": "coinos es una aplicación de código abierto para pagos con bitcoin. Su desarrollo comezó en Vancouver allá por Septiembre de 2012 como una solución para que comerciantes locales puedan aceptar pagos con bitcoin.",
-		"p3": "Si lo desea, puede descargar el código fuente de Coinos para ejecutar su propia instancia y tenerla conectada a sus propios nodos bitcoin y lightning. Estaremos encantados de ayudarle a en un proveedor de pagos y en un custodio benevolente para su comunidad.",
-		"p4": "Las transferencias entre cuentas de usuario en nuestro servidor son realizadas off-chain, esto hace que sean instantáneas, ilimitadas, y gratuitas.",
+		"header": "Sobre Nosotros",
+		"p1": "Coinos es una aplicación de pagos en bitcoin de código abierto. Este desarrollo comenzó en septiembre de 2012 en Vancouver como una forma de proporcionar a los comerciantes locales una forma conveniente de aceptar pagos con bitcoin.",
+		"p2": "Descarga el código fuente para ejecutar una instancia y conectarla a tu propio nodo bitcoin y lightning. Te ayudaremos a convertirte en un excelente custodio y proveedor de pagos para tu comunidad.",
+		"p3": "Las transferencias de bitcoin entre usuarios en nuestro servidor se realizan off-chain, por lo que son completamente gratuitas, instantáneas e ilimitadas.",
 		"team": {
-			"header": "El Equipo",
+			"header": "Nuestro Equipo",
 			"adam": {
 				"name": "Adam Soltys",
-				"position": "Director (CTO)",
-				"bio": "Adam es desarrollador web y entusiasta de bitcoin, cree que el dinero sólido es clave para aumentar la prosperidad global. Vive en Vancouver junto a su esposa Chelsea y sus dos hijos."
+				"position": "Director de Tecnología",
+				"bio": "Adam es un desarrollador web y un entusiasta de bitcoin que cree que el dinero sólido es clave para aumentar la prosperidad global. Vive en la ciudad de North Vancouver con su esposa Chelsea y sus dos hijos."
 			},
 			"secondl1ght": {
 				"name": "secondl1ght",
-				"position": "Desarrollador web",
-				"bio": "Es un desarrollador web autodidacta, que se zambulló de cabeza en la madriguera del conejo de bitcoin al dejar su trabajo pagado en fiat para concentrarse en el desarrollo de bitcoin a tiempo completo. Contribuyente en proyectos de código abierto, defensor de la privacidad y amante de la libertad."
+				"position": "Desarrollador Web",
+				"bio": "Desarrollador web autodidacta, se sumergió de cabeza en con el bitcoin y dejó su trabajo fiduciario para concentrarse en el desarrollo de bitcoin a tiempo completo. Contribuye en proyectos de código abierto, es un defensor de la privacidad y un amante de la libertad."
 			},
 
 			"karnage": {
 				"name": "Karnage",
 				"position": "Diseñador de Producto",
-				"bio": "¨Mi misión es ayudar a los fundadores de startups a tener éxito. Creo productos para lograr este objetivo. Diseño de producto con píxeles perfectos. Recibe lo que buscas.¨"
+				"bio": "Mi misión es ayudar a los fundadores de startups a tener éxito. Creo productos para lograr estos objetivos. Diseño de producto con píxeles perfectos. Haz que te lo envíen."
 			},
 			"shauna": {
 				"name": "Shauna",
-				"position": "Marketing & Operaciones",
-				"bio": "Gestión Estratégica y de Proyectos. Ella es una todóloga. Siempre encuentra tiempo para reunirse a tomar un café."
+				"position": "Operaciones y Mercadeo",
+				"bio": "Gestión Estratégica y de Proyectos. Sé un poco de todo. Siempre habrá tiempo para compartir un buen café."
 			},
 			"cole": {
 				"name": "Cole",
-				"position": "Profesional en Bitcoin",
-				"bio": "Como profesional certificado de Bitcoin, Cole es una persona motivada y apasionada por la libertad. Encontró bitcoin en el año 2016 bitcoin y se dedicó a estudiarlo en profundidad. Ahora quiere presentar Lightning Network a tantos usuarios como sea posible."
+				"position": "Profesional de Bitcoin",
+				"bio": "Como profesional certificado de Bitcoin, Cole es una persona motivada y apasionada por la libertad. Conoció el bitcoin en 2016 y lo estudió en profundidad. Ahora quiere presentarle la Red Lightning a tantos usuarios como sea posible."
 			},
 			"john": {
 				"name": "John Barratt",
-				"position": "Desarrollador web Full Stack",
-				"bio": "Cuando no está programando, John puede ser encontrado en el bosque recorriendo todos los grandes senderos que Colombia Británica tiene para ofrecer."
+				"position": "Desarrollador Web Full Stack",
+				"bio": "Cuando no está programando, podemos encontrar a John en el bosque recorriendo todos los grandes senderos que British Columbia tiene para ofrecer."
 			}
 		},
 		"locations": {
-			"header": "Locales",
-			"description": "Estos son comercios que aceptan bitcoin con coinos. Si estás utilizando nuestra aplicación, por favor \"<a href=\"mailto:contact@coinos.io\" class=\"underline underline-offset-4 hover:opacity-80\">cuéntenos!</a>"
+			"header": "Locaciones",
+			"description": "Aquí algunas empresas que aceptan bitcoin con Coinos. ¡Esperamos que el tuyo sea el próximo!"
 		}
 	},
 	"error": {
 		"header": "Error",
-		"message": "Por favor inténtelo nuevamente o contacte a nuestro soporte.",
+		"message": "Vuelva a intentarlo o póngase en contacto con el soporte.",
 		"signIn": "Por favor inicie sesión para continuar."
 	},
 	"faq": {
-		"header": "PMF",
+		"header": "FAQ",
 		"cost": {
-			"question": "Cuanto cuesta?",
-			"answer": "Coinos es gratis. No hay costos de registro ni mantenimiento. Puede enviar y recibir pagos de forma ilimitada por medio de Lightning Network sin costo alguno. Sin embargo, si quieres tus fondos hacia  una dirección de bitcoin on-chain existe una tarifa del 0,1%."
+			"question": "¿Cuánto cuesta?",
+			"answer": "Registrar una cuenta y recibir pagos a través de Red Lightning es gratis. Cobramos una tarifa del 0,1% por convertir de lightning a bitcoin."
 		},
 		"compatibility": {
-			"question": "Necesito un dispositivo o software especial?",
-			"answer": "No. Al estar basado en web, Coinos está disponible en cualquier dispositivo con conexión a internet. Puede usarlo directamente desde un celular o una tableta."
+			"question": "¿Necesito algún dispositivo o software especial?",
+			"answer": "No. Coinos es una aplicación web, por lo que siempre que tenga conexión a Internet, podrá usarlo desde cualquier dispositivo. Las tiendas minoristas pueden usarlo desde un teléfono o una tableta."
 		},
 		"safety": {
-			"question": "Qué puedo hacer con el bitcoin que recibo?",
-			"answer": "Usarlo para pagar personal y proveedores, apoyar otras empresas y comerciantes que acepten bitcoin. O puede mantenerlo durante algunos años y ver crecer su poder adquisitivo."
+			"question": "¿Cuándo se liquidan mis fondos?",
+			"answer": "Los pagos en Red Lightning se liquidan al instante. Puede retirar su saldo a otra billetera o exchange inmediatamente después de recibir el pago."
 		}
 	},
 	"footer": {
 		"company": "Empresa",
-		"followUs": "Síganos",
+		"followUs": "Síguenos",
 		"github": "GitHub",
-		"jobs": "Empleos",
+		"jobs": "Trabaje con nosotros",
 		"support": "Soporte",
 		"telegram": "Telegram",
 		"twitter": "Twitter",
 		"news": "Noticias"
 	},
 	"howItWorks": {
-		"header": "¿Cómo funciona?",
+		"header": "Cómo funciona",
 		"step1": {
-			"header": "1. Abra una cuenta",
-			"description": "Para empezar, solo debe elegir un nombre de usuario y crear una contraseña."
+			"header": "1. Crea tu cuenta",
+			"description": "Un nombre de usuario y una contraseña es todo lo que necesita para comenzar."
 		},
 		"step2": {
-			"header": "2. Solicitar pagos",
-			"description": "Lo mismo que hace normalmente, ¡pero con bitcoin!"
+			"header": "2. Cobra tus pagos",
+			"description": "Lo mismo que harías normalmente, pero con bitcoin."
 		},
 		"step3": {
-			"header": "3. ¡y listo!",
-			"description": "Ahora puede disponer libremente de su bitcoin como guste."
+			"header": "3. ¡Eso es todo!",
+			"description": "Haz pagos con otros comerciantes o guarda tu bitcoin para días difíciles, la elección es tuya."
 		}
 	},
 	"invoice": {
-		"addTip": "Agregar propina",
-		"addTipq": "Agregar propina?",
-		"done": "Listo",
-		"paymentSuccessful": "Pago exitoso!",
+		"addTip": "Añadir propina,
+		"addTipq": "Añadir propina?",
+		"done": "Hecho",
+		"paymentSuccessful": "¡Pago recibido!",
 		"invoice": "Factura",
 		"total": "Total",
 		"tip": "Propina"
 	},
 	"jobs": {
-		"header": "Empleos",
-		"subheader": "Puestos disponibles",
-		"pitch1": "coinos se encuentra buscando a desarrolladores que quieran unirse a nuestro equipo de trabajo en crecimiento (tiempo medio o tiempo completo, APROBAMOS el trabajo remoto).",
-		"pitch2": "Emocionado por trabajar en un proyecto de código abierto con bitcoin? Entonces mira nuestros repositorios en",
+		"header": "Trabaje con nosotros",
+		"subheader": "Ofertas de Trabajo",
+		"pitch1": "Coinos está activamente buscando desarrolladores para unirse a nuestro equipo en crecimiento (tiempo completo o medio tiempo, trabajo remoto OK).",
+		"pitch2": "¿Emocionado por trabajar en bitcoin de código abierto? Entonces eche un vistazo a nuestros repositorios en",
 		"github": "GitHub",
-		"pitch3": "Nos encantaría saber de usted si cree que tiene algo impactante para mostrar. Envíenos su CV a"
+		"pitch3": "Si crees que puedes generar impacto, nos encantaría saber de ti. Envíanos tu currículum a"
 	},
 	"landing": {
-		"header_before_icon": "La manera",
-		"header_with_icon": "más simple",
-		"header_after_icon": "de aceptar bitcoin en su negocio.",
-		"subheader": "Aumente sus posibilidades de ingreso agregando bitcoin como forma de pago mediante una aplicación web muy fácil de usar. No se requiere ningún software o hardware adicional.",
+		"header_before_icon": "La",
+		"header_with_icon": "manera",
+		"header_after_icon": "más fácil de aceptar bitcoins en tu tienda.",
+		"subheader": "Aumenta tu número de clientes e ingresos al aceptar bitcoin con una aplicación web fácil de usar. No requiere software ni hardware.",
 		"info1": {
-			"title": "Pagos instantáneos con Lightning",
-			"description": "Cuando su cliente envíe un pago, el mismo estará disponible en forma inmediata. Liquidación instantánea en segundos. Diga adiós al 3% de interés que le cobran por tarifas de procesamiento de tarjetas de crédito."
+			"title": "Pagos instantáneos a través de Lightning",
+			"description": "El momento en que su cliente envía un pago, este llega inmediatamente. Sin esperar liquidaciones bancarias ni preocuparse por cargos extras. Liquidación instantánea, en segundos. Diga adiós a los cargos del 3% de las tarifas en tarjetas de crédito."
 		},
 		"info2": {
 			"title": "Fácil de usar",
-			"description1": "Ingrese un monto en su moneda local, comparta el QR y listo.",
-			"description2": "Coinos le ofrece acceso gratuito para usar los nodos bitcoin y lightning alojados, sin que deba comprender cómo funcionan bitcoin o lightning. Hacemos todo el trabajo pesado para que pueda concentrarse en su negocio.",
-			"description3": "Usted siempre tendrá la opción de retirar sus fondos para retomar su custodia de forma inmediata."
+			"description1": "Solo ingrese una cantidad en su moneda local, comparta el código QR y listo.",
+			"description2": "Hacemos todo el trabajo pesado para que pueda concentrarse en su negocio.",
+			"description3": "Siempre tiene la opción de tomar la custodia de sus fondos al retirarlos instantáneamente en cualquier momento"."
 		},
 		"info3": {
-			"title": "Personalícelo!",
-			"description": "Puede personalizar la apariencia y el estilo de su punto de venta o mantenerlo por defecto. Depende de usted."
+			"title": "Maneja tu marca a tu manera!",
+			"description": "Personalice la apariencia y el estilo del punto de venta de tu negocio a tu gusto: depende totalmente de ti."
 		}
 	},
 	"login": {
 		"optional": "Opcional",
 		"token": "Token 2FA",
-		"username": "Nombre de usuario",
+		"username": "Usuario",
 		"password": "Contraseña",
-		"email": "Email",
-		"passwordRecommendation": "Recomendamos utilizar un administrador de contraseñas para generar una clave larga y aleatoria.",
-		"forgotUserOrPassword": "Olvidó su nombre de usuario o su contraseña?",
-		"haveAccount": "Ya tiene una cuenta?",
-		"noAccount": "No tiene una cuenta?",
-		"register": "Registrarse",
-		"signIn": "Iniciar sesión",
-		"failed": "Inicio de sesión fallido"
+		"email": "Correo",
+		"passwordRecommendation": "Recomendamos una contraseña larga y aleatoria generada con un administrador de contraseñas.",
+		"forgotUserOrPassword": "¿Olvidaste tu nombre de usuario o contraseña?",
+		"haveAccount": "¿Ya tienes una cuenta?",
+		"noAccount": "¿No tienes una cuenta?",
+		"register": "Registro",
+		"signIn": "Registrarse",
+		"failed": "Fallo en Inicio"
 	},
 	"nav": {
 		"profile": "Perfil",
-		"startInSeconds": "Comience de inmediato",
+		"startInSeconds": "Comience en segundos",
 		"account": "Cuenta",
-		"signIn": "Iniciar sesión",
-		"signOut": "Cerrar sesión",
+		"signIn": "Registrarse",
+		"signOut": "Desconectar",
 		"dashboard": "Panel",
 		"settings": "Ajustes",
 		"support": "Soporte"
 	},
+	"newSiteHeader": "Acompañanos en nuestra <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> en Vancouver el 26 de Octubre! Buscando la version anterior de coinos? Visita <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
 	"news": {
 		"header": "Noticias",
-		"subheader": "Últimas novedades",
+		"subheader": "Últimas Actualizaciones",
 		"update1": ""
 	},
 	"user": {
 		"bitcoin": "Bitcoin",
-		"lightning": "Relámpago",
+		"lightning": "Lightning",
 		"invoice": "Factura",
 		"unfollow": "Dejar de seguir",
 		"following": "Siguiendo",
 		"follow": "Seguir",
 		"remove": "Eliminar",
-		"scanToPayBTC": "Escanea para pagar en bitcoin",
+		"scanToPayBTC": "Escanear para pagar con bitcoin",
 		"this": "Esta",
-		"lightningAddress": "dirección relámpago",
-		"likeAnEmail": "es como un correo electrónico para bitcoin. Puede publicarlo en su sitio web o tarjetas de presentación y usarlo varias veces.",
+		"lightningAddress": "dirección lightning",
+		"likeAnEmail": "es como un correo electrónico para bitcoin. Puede publicarlo en su sitio web o tarjetas de presentación y usarlo múltiples veces.",
 		"dashboard": {
-			"dashboard": "Tablero",
-			"accountBalance": "Saldo",
-			"bitcoinPrice": "Precio de bitcoin:",
-			"conversionFeeWarning": "Cobraremos una tarifa de retiro del 1% sobre el monto",
+			"go": "Ir",
+			"dashboard": "Panel",
+			"accountBalance": "Saldo de la cuenta",
+			"bitcoinPrice": "Precio de Bitcoin:",
+			"conversionFeeWarning": "Se le cobrará una tarifa de retiro del 1% sobre el monto.",
 			"dataFromBinance": "Datos de <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "Tasa...",
+			"fetchingRate": "calculando tasa...",
 			"optionalNote": "Nota (Opcional)",
 			"send": "Enviar",
-			"receive": "Recibir un pago",
+			"receive": "Recibir",
 			"withdraw": "Retirar",
-			"deposit": "Depósito",
-			"voucher": "Vale"
+			"deposit": "Depositar",
+			"voucher": "Comprobante"
 		},
 		"receive": {
-			"lessThan1BTCWarning": "Ingrese una cantidad menor a 1 bitcoin.",
-			"showQR": "Ver QR"
+			"lessThan1BTCWarning": "Introduzca una cantidad inferior a 1 bitcoin.",
+			"showQR": "Mostrar código QR"
 		},
 		"send": {
 			"contacts": "Contactos",
 			"scan": "Escanear",
 			"paste": "Pegar",
-			"next": "Próxima",
-			"placeholder": "Pegue una dirección de bitcoin, una factura relámpago o un nombre de usuario de coinos"
+			"next": "Siguiente",
+			"placeholder": "Asigne una dirección de bitcoin, una factura lightning o un usuario de coinos"
 		},
 		"settings": {
-			"bannerImage": "Imagen de portada",
+			"bannerImage": "Imagen del Banner",
 			"profileImage": "Imagen de perfil",
 			"oneTimeCode": "Ingrese el código de un solo uso",
-			"accountId": "",
+			"accountId": "Id Cuenta",
 			"header": "Ajustes",
 			"ACCOUNT": "CUENTA",
 			"POINT_OF_SALE": "PUNTO DE VENTA",
 			"SECURITY": "SEGURIDAD",
-			"locale": "Languaje",
-			"username": "Nombre de usuario",
-			"email": "Email",
+			"locale": "Idioma",
+			"username": "Usuario",
+			"email": "Correo",
 			"newPassword": "Nueva contraseña",
-			"businessAddress": "Dirección comercial",
-			"emailNotifications": "Notificar por email",
-			"emailNotificationsDescription": "Recibe notificaciones cuando alguien le envíe un pago o cuando ocurra algún cambio en su cuenta.",
-			"smsNotifications": "Notificar pr SMS",
-			"smsNotificationsDescription": "coinos le enviará notificaciones por mensaje de texto cuando esté habilitado.",
-			"theme": "Tema de color",
-			"themeDescription": "Elija el tema de color predeterminado.",
-			"localCurrency": "Moneda local",
-			"btcUnit": "Mostrar bitcoin en:",
-			"bitcoin": "Bitcoin",
+			"businessAddress": "Dirección Negocio",
+			"emailNotifications": "Notificaciones de Correo Electrónico",
+			"emailNotificationsDescription": "Reciba notificaciones por correo electrónico cuando se produzca un cambio en su cuenta o cuando las personas le envíen pagos.",
+			"smsNotifications": "Notificaciones SMS",
+			"smsNotificationsDescription": "Coinos enviará notificaciones de texto cuando esto esté habilitado.",
+			"theme": "Color Tema",
+			"themeDescription": "Seleccione entre los temas de color predeterminados.",
+			"localCurrency": "Moneda Local",
+			"btcUnit": "Ver bitcoin en:",
+			"bitcoin": "bitcoin",
 			"satoshis": "Satoshis",
-			"securityPIN": "PIN de seguridad",
-			"securityPINDescription": "Ingrese un pin de seguridad y úselo para desbloquear coinos o enviar pagos.",
-			"setPIN": "Crear PIN",
-			"autoLock": "Tiempo de auto bloqueo",
-			"autoLockDescription": "Se le pedirá el pin para reanudar la sesión luego de el tiempo especificado:",
+			"securityPIN": "PIN de Seguridad",
+			"securityPINDescription": "Establezca un pin de seguridad para desbloquear la configuración y enviar pagos.",
+			"setPIN": "Establecer PIN",
+			"autoLock": "Temporizador de bloqueo automático",
+			"autoLockDescription": "Su cuenta entrará en modo seguro automáticamente después del tiempo especificado:",
 			"twofa": "Autenticación de 2 factores",
-			"twofaDescription": "Agregue un nivel extra de seguridad a su cuenta con la autenticación de 2 factores (2FA).",
+			"twofaDescription": "Agregue una capa extra de seguridad a su dispositivo habilitando la autenticación de 2 factores.",
 			"twofaSetup": "Configurar 2FA",
-			"twofaDisable": "Desactivar 2FA",
-			"select": "Seleccione",
+			"twofaDisable": "Deshabilitar 2FA",
+			"select": "Seleccionar",
 			"verifyPIN": "Verificar PIN",
 			"enablePIN": "Habilitar PIN",
 			"disablePIN": "Deshabilitar PIN"
 		},
 		"support": {
 			"header": "Soporte",
-			"email": "Correo electrónico",
-			"accountName": "Nombre de cuenta",
+			"email": "Correo",
+			"accountName": "Nombre Cuenta",
 			"message": "Mensaje",
 			"send": "Enviar"
 		}
 	},
 	"transactions": {
-		"header": "Historial de transacciones",
-		"AMOUNT": "MONTO",
+		"header": "Transacciones",
+		"AMOUNT": "CANTIDAD",
 		"TYPE": "TIPO",
 		"TIME": "HORA",
-		"sent": "Enviada",
-		"received": "Recibida",
-		"empty": "No hay transacciones.",
-		"send": "Enviar",
-		"next": "Próxima",
-		"sendersChoice": "Elección del remitente",
+		"sent": "Enviado",
+		"received": "Recibido",
+		"empty": "Aún no hay transacciones.",
+		"send": "Enviado",
+		"next": "Siguiente",
+		"sendersChoice": "Sender's choice",
 		"sendTo": "Enviar a",
-		"to": "a",
+		"to": "para",
 		"pay": "Pagar",
 		"requesting": "está solicitando",
-		"sentInvoiceTo": "Factura enviada a",
-		"sentRequestTo": "Solicitud enviada a",
+		"sentInvoiceTo": "Enviar factura a",
+		"sentRequestTo": "Enviar solicitud a",
 		"pleasePay": "Por favor pague",
-		"day": "Dia",
+		"day": "Día",
 		"week": "Semana",
 		"month": "Mes",
 		"all": "Todo",
 		"export": "Exportar",
 		"invoice": "Factura",
 		"readyToPay": "está listo para pagar",
-		"describeOrder": "Utilice este campo para describir su pedido",
-		"requestAnInvoice": "Solicitar una factura",
+		"describeOrder": "Utilice este campo para describir su orden",
+		"requestAnInvoice": "Solicitar factura",
 		"submit": "Enviar",
 		"isRequesting": "está solicitando",
-		"awaiting": "Esperando"
+		"awaiting": "Esperando",
+		"tapAnywhere": "Toca en cualquier lugar",
+		"from": "de",
+		"redeem": "Redimir",
+		"redeemed": "Redimido",
+		"redeemedBy": "Redimido por"
 	}
 }
-- 
cgit v1.2.3


From da5841750d1068761a1a88633327f657b0219fa3 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 20 Dec 2022 23:02:39 -0800
Subject: rm esp.json

---
 src/locales/esp.json | 282 ---------------------------------------------------
 1 file changed, 282 deletions(-)
 delete mode 100644 src/locales/esp.json

(limited to 'src')

diff --git a/src/locales/esp.json b/src/locales/esp.json
deleted file mode 100644
index 87de05d2..00000000
--- a/src/locales/esp.json
+++ /dev/null
@@ -1,282 +0,0 @@
-{
-	"404": {
-		"404": "404",
-		"pageNotFound": "Pagina no encontrada."
-	},
-	"about": {
-		"header": "Sobre Nosotros",
-		"p1": "Coinos es una aplicación de pagos en bitcoin de código abierto. Este desarrollo comenzó en septiembre de 2012 en Vancouver como una forma de proporcionar a los comerciantes locales una forma conveniente de aceptar pagos con bitcoin.",
-		"p2": "Descarga el código fuente para ejecutar una instancia y conectarla a tu propio nodo bitcoin y lightning. Te ayudaremos a convertirte en un excelente custodio y proveedor de pagos para tu comunidad.",
-		"p3": "Las transferencias de bitcoin entre usuarios en nuestro servidor se realizan off-chain, por lo que son completamente gratuitas, instantáneas e ilimitadas.",
-		"team": {
-			"header": "Nuestro Equipo",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Director de Tecnología",
-				"bio": "Adam es un desarrollador web y un entusiasta de bitcoin que cree que el dinero sólido es clave para aumentar la prosperidad global. Vive en la ciudad de North Vancouver con su esposa Chelsea y sus dos hijos."
-			},
-			"secondl1ght": {
-				"name": "secondl1ght",
-				"position": "Desarrollador Web",
-				"bio": "Desarrollador web autodidacta, se sumergió de cabeza en con el bitcoin y dejó su trabajo fiduciario para concentrarse en el desarrollo de bitcoin a tiempo completo. Contribuye en proyectos de código abierto, es un defensor de la privacidad y un amante de la libertad."
-			},
-
-			"karnage": {
-				"name": "Karnage",
-				"position": "Diseñador de Producto",
-				"bio": "Mi misión es ayudar a los fundadores de startups a tener éxito. Creo productos para lograr estos objetivos. Diseño de producto con píxeles perfectos. Haz que te lo envíen."
-			},
-			"shauna": {
-				"name": "Shauna",
-				"position": "Operaciones y Mercadeo",
-				"bio": "Gestión Estratégica y de Proyectos. Sé un poco de todo. Siempre habrá tiempo para compartir un buen café."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Profesional de Bitcoin",
-				"bio": "Como profesional certificado de Bitcoin, Cole es una persona motivada y apasionada por la libertad. Conoció el bitcoin en 2016 y lo estudió en profundidad. Ahora quiere presentarle la Red Lightning a tantos usuarios como sea posible."
-			},
-			"john": {
-				"name": "John Barratt",
-				"position": "Desarrollador Web Full Stack",
-				"bio": "Cuando no está programando, podemos encontrar a John en el bosque recorriendo todos los grandes senderos que British Columbia tiene para ofrecer."
-			}
-		},
-		"locations": {
-			"header": "Locaciones",
-			"description": "Aquí algunas empresas que aceptan bitcoin con Coinos. ¡Esperamos que el tuyo sea el próximo!"
-		}
-	},
-	"error": {
-		"header": "Error",
-		"message": "Vuelva a intentarlo o póngase en contacto con el soporte.",
-		"signIn": "Por favor inicie sesión para continuar."
-	},
-	"faq": {
-		"header": "FAQ",
-		"cost": {
-			"question": "¿Cuánto cuesta?",
-			"answer": "Registrar una cuenta y recibir pagos a través de Red Lightning es gratis. Cobramos una tarifa del 0,1% por convertir de lightning a bitcoin."
-		},
-		"compatibility": {
-			"question": "¿Necesito algún dispositivo o software especial?",
-			"answer": "No. Coinos es una aplicación web, por lo que siempre que tenga conexión a Internet, podrá usarlo desde cualquier dispositivo. Las tiendas minoristas pueden usarlo desde un teléfono o una tableta."
-		},
-		"safety": {
-			"question": "¿Cuándo se liquidan mis fondos?",
-			"answer": "Los pagos en Red Lightning se liquidan al instante. Puede retirar su saldo a otra billetera o exchange inmediatamente después de recibir el pago."
-		}
-	},
-	"footer": {
-		"company": "Empresa",
-		"followUs": "Síguenos",
-		"github": "GitHub",
-		"jobs": "Trabaje con nosotros",
-		"support": "Soporte",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"news": "Noticias"
-	},
-	"howItWorks": {
-		"header": "Cómo funciona",
-		"step1": {
-			"header": "1. Crea tu cuenta",
-			"description": "Un nombre de usuario y una contraseña es todo lo que necesita para comenzar."
-		},
-		"step2": {
-			"header": "2. Cobra tus pagos",
-			"description": "Lo mismo que harías normalmente, pero con bitcoin."
-		},
-		"step3": {
-			"header": "3. ¡Eso es todo!",
-			"description": "Haz pagos con otros comerciantes o guarda tu bitcoin para días difíciles, la elección es tuya."
-		}
-	},
-	"invoice": {
-		"addTip": "Añadir propina,
-		"addTipq": "Añadir propina?",
-		"done": "Hecho",
-		"paymentSuccessful": "¡Pago recibido!",
-		"invoice": "Factura",
-		"total": "Total",
-		"tip": "Propina"
-	},
-	"jobs": {
-		"header": "Trabaje con nosotros",
-		"subheader": "Ofertas de Trabajo",
-		"pitch1": "Coinos está activamente buscando desarrolladores para unirse a nuestro equipo en crecimiento (tiempo completo o medio tiempo, trabajo remoto OK).",
-		"pitch2": "¿Emocionado por trabajar en bitcoin de código abierto? Entonces eche un vistazo a nuestros repositorios en",
-		"github": "GitHub",
-		"pitch3": "Si crees que puedes generar impacto, nos encantaría saber de ti. Envíanos tu currículum a"
-	},
-	"landing": {
-		"header_before_icon": "La",
-		"header_with_icon": "manera",
-		"header_after_icon": "más fácil de aceptar bitcoins en tu tienda.",
-		"subheader": "Aumenta tu número de clientes e ingresos al aceptar bitcoin con una aplicación web fácil de usar. No requiere software ni hardware.",
-		"info1": {
-			"title": "Pagos instantáneos a través de Lightning",
-			"description": "El momento en que su cliente envía un pago, este llega inmediatamente. Sin esperar liquidaciones bancarias ni preocuparse por cargos extras. Liquidación instantánea, en segundos. Diga adiós a los cargos del 3% de las tarifas en tarjetas de crédito."
-		},
-		"info2": {
-			"title": "Fácil de usar",
-			"description1": "Solo ingrese una cantidad en su moneda local, comparta el código QR y listo.",
-			"description2": "Hacemos todo el trabajo pesado para que pueda concentrarse en su negocio.",
-			"description3": "Siempre tiene la opción de tomar la custodia de sus fondos al retirarlos instantáneamente en cualquier momento"."
-		},
-		"info3": {
-			"title": "Maneja tu marca a tu manera!",
-			"description": "Personalice la apariencia y el estilo del punto de venta de tu negocio a tu gusto: depende totalmente de ti."
-		}
-	},
-	"login": {
-		"optional": "Opcional",
-		"token": "Token 2FA",
-		"username": "Usuario",
-		"password": "Contraseña",
-		"email": "Correo",
-		"passwordRecommendation": "Recomendamos una contraseña larga y aleatoria generada con un administrador de contraseñas.",
-		"forgotUserOrPassword": "¿Olvidaste tu nombre de usuario o contraseña?",
-		"haveAccount": "¿Ya tienes una cuenta?",
-		"noAccount": "¿No tienes una cuenta?",
-		"register": "Registro",
-		"signIn": "Registrarse",
-		"failed": "Fallo en Inicio"
-	},
-	"nav": {
-		"profile": "Perfil",
-		"startInSeconds": "Comience en segundos",
-		"account": "Cuenta",
-		"signIn": "Registrarse",
-		"signOut": "Desconectar",
-		"dashboard": "Panel",
-		"settings": "Ajustes",
-		"support": "Soporte"
-	},
-	"newSiteHeader": "Acompañanos en nuestra <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> en Vancouver el 26 de Octubre! Buscando la version anterior de coinos? Visita <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
-	"news": {
-		"header": "Noticias",
-		"subheader": "Últimas Actualizaciones",
-		"update1": ""
-	},
-	"user": {
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Factura",
-		"unfollow": "Dejar de seguir",
-		"following": "Siguiendo",
-		"follow": "Seguir",
-		"remove": "Eliminar",
-		"scanToPayBTC": "Escanear para pagar con bitcoin",
-		"this": "Esta",
-		"lightningAddress": "dirección lightning",
-		"likeAnEmail": "es como un correo electrónico para bitcoin. Puede publicarlo en su sitio web o tarjetas de presentación y usarlo múltiples veces.",
-		"dashboard": {
-			"go": "Ir",
-			"dashboard": "Panel",
-			"accountBalance": "Saldo de la cuenta",
-			"bitcoinPrice": "Precio de Bitcoin:",
-			"conversionFeeWarning": "Se le cobrará una tarifa de retiro del 1% sobre el monto.",
-			"dataFromBinance": "Datos de <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "calculando tasa...",
-			"optionalNote": "Nota (Opcional)",
-			"send": "Enviar",
-			"receive": "Recibir",
-			"withdraw": "Retirar",
-			"deposit": "Depositar",
-			"voucher": "Comprobante"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Introduzca una cantidad inferior a 1 bitcoin.",
-			"showQR": "Mostrar código QR"
-		},
-		"send": {
-			"contacts": "Contactos",
-			"scan": "Escanear",
-			"paste": "Pegar",
-			"next": "Siguiente",
-			"placeholder": "Asigne una dirección de bitcoin, una factura lightning o un usuario de coinos"
-		},
-		"settings": {
-			"bannerImage": "Imagen del Banner",
-			"profileImage": "Imagen de perfil",
-			"oneTimeCode": "Ingrese el código de un solo uso",
-			"accountId": "Id Cuenta",
-			"header": "Ajustes",
-			"ACCOUNT": "CUENTA",
-			"POINT_OF_SALE": "PUNTO DE VENTA",
-			"SECURITY": "SEGURIDAD",
-			"locale": "Idioma",
-			"username": "Usuario",
-			"email": "Correo",
-			"newPassword": "Nueva contraseña",
-			"businessAddress": "Dirección Negocio",
-			"emailNotifications": "Notificaciones de Correo Electrónico",
-			"emailNotificationsDescription": "Reciba notificaciones por correo electrónico cuando se produzca un cambio en su cuenta o cuando las personas le envíen pagos.",
-			"smsNotifications": "Notificaciones SMS",
-			"smsNotificationsDescription": "Coinos enviará notificaciones de texto cuando esto esté habilitado.",
-			"theme": "Color Tema",
-			"themeDescription": "Seleccione entre los temas de color predeterminados.",
-			"localCurrency": "Moneda Local",
-			"btcUnit": "Ver bitcoin en:",
-			"bitcoin": "bitcoin",
-			"satoshis": "Satoshis",
-			"securityPIN": "PIN de Seguridad",
-			"securityPINDescription": "Establezca un pin de seguridad para desbloquear la configuración y enviar pagos.",
-			"setPIN": "Establecer PIN",
-			"autoLock": "Temporizador de bloqueo automático",
-			"autoLockDescription": "Su cuenta entrará en modo seguro automáticamente después del tiempo especificado:",
-			"twofa": "Autenticación de 2 factores",
-			"twofaDescription": "Agregue una capa extra de seguridad a su dispositivo habilitando la autenticación de 2 factores.",
-			"twofaSetup": "Configurar 2FA",
-			"twofaDisable": "Deshabilitar 2FA",
-			"select": "Seleccionar",
-			"verifyPIN": "Verificar PIN",
-			"enablePIN": "Habilitar PIN",
-			"disablePIN": "Deshabilitar PIN"
-		},
-		"support": {
-			"header": "Soporte",
-			"email": "Correo",
-			"accountName": "Nombre Cuenta",
-			"message": "Mensaje",
-			"send": "Enviar"
-		}
-	},
-	"transactions": {
-		"header": "Transacciones",
-		"AMOUNT": "CANTIDAD",
-		"TYPE": "TIPO",
-		"TIME": "HORA",
-		"sent": "Enviado",
-		"received": "Recibido",
-		"empty": "Aún no hay transacciones.",
-		"send": "Enviado",
-		"next": "Siguiente",
-		"sendersChoice": "Sender's choice",
-		"sendTo": "Enviar a",
-		"to": "para",
-		"pay": "Pagar",
-		"requesting": "está solicitando",
-		"sentInvoiceTo": "Enviar factura a",
-		"sentRequestTo": "Enviar solicitud a",
-		"pleasePay": "Por favor pague",
-		"day": "Día",
-		"week": "Semana",
-		"month": "Mes",
-		"all": "Todo",
-		"export": "Exportar",
-		"invoice": "Factura",
-		"readyToPay": "está listo para pagar",
-		"describeOrder": "Utilice este campo para describir su orden",
-		"requestAnInvoice": "Solicitar factura",
-		"submit": "Enviar",
-		"isRequesting": "está solicitando",
-		"awaiting": "Esperando",
-		"tapAnywhere": "Toca en cualquier lugar",
-		"from": "de",
-		"redeem": "Redimir",
-		"redeemed": "Redimido",
-		"redeemedBy": "Redimido por"
-	}
-}
-- 
cgit v1.2.3


From ca1aff53de569bc1fb07d7fe1d247a33b4c23999 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 20 Dec 2022 23:16:25 -0800
Subject: fix json errors

---
 src/locales/es.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/locales/es.json b/src/locales/es.json
index 87de05d2..b57288ce 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -93,7 +93,7 @@
 		}
 	},
 	"invoice": {
-		"addTip": "Añadir propina,
+		"addTip": "Añadir propina",
 		"addTipq": "Añadir propina?",
 		"done": "Hecho",
 		"paymentSuccessful": "¡Pago recibido!",
@@ -122,7 +122,7 @@
 			"title": "Fácil de usar",
 			"description1": "Solo ingrese una cantidad en su moneda local, comparta el código QR y listo.",
 			"description2": "Hacemos todo el trabajo pesado para que pueda concentrarse en su negocio.",
-			"description3": "Siempre tiene la opción de tomar la custodia de sus fondos al retirarlos instantáneamente en cualquier momento"."
+			"description3": "Siempre tiene la opción de tomar la custodia de sus fondos al retirarlos instantáneamente en cualquier momento."
 		},
 		"info3": {
 			"title": "Maneja tu marca a tu manera!",
-- 
cgit v1.2.3


From b026bf21ccf70f182c11a7f7542ce0b695e97469 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 21 Dec 2022 13:40:25 -0800
Subject: generate keypair for users that don't have one

---
 package.json                                       |  16 +-
 pnpm-lock.yaml                                     | 632 +++++++++++++++++++++
 src/components/RegisterOrLogin.svelte              |  16 +-
 src/hooks.server.js                                |   2 -
 src/lib/socket.js                                  |   2 +-
 src/lib/store.js                                   |  10 +-
 src/routes/(app)/+layout.server.js                 |   2 +
 src/routes/(app)/[username]/dashboard/+page.svelte |   2 +-
 src/routes/(app)/[username]/generate/+page.svelte  |  61 ++
 src/routes/(app)/[username]/generate/+server.js    |   8 +
 vite.config.js                                     |   6 +-
 11 files changed, 742 insertions(+), 15 deletions(-)
 create mode 100644 src/routes/(app)/[username]/generate/+page.svelte
 create mode 100644 src/routes/(app)/[username]/generate/+server.js

(limited to 'src')

diff --git a/package.json b/package.json
index d6e0dc4c..dac10511 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,13 @@
 		"@sveltejs/kit": "1.0.0-next.556",
 		"@zerodevx/svelte-toast": "^0.7.2",
 		"autoprefixer": "^10.4.13",
+		"bech32": "^2.0.0",
 		"bip21": "^2.0.3",
+		"bip32": "^3.1.0",
+		"bip39": "^3.0.4",
 		"bitcoin-address-validation": "^2.2.1",
 		"bolt11": "^1.4.0",
+		"buffer": "^6.0.3",
 		"date-fns": "^2.29.3",
 		"leaflet": "^1.9.3",
 		"leaflet.markercluster": "^1.5.3",
@@ -26,6 +30,7 @@
 		"qr-code-styling": "1.6.0-rc.1",
 		"qr-scanner": "^1.4.1",
 		"qrcode-base64": "^1.0.1",
+		"rollup": "2",
 		"screenfull": "^6.0.2",
 		"svelte": "^3.53.1",
 		"svelte-outclick": "^3.2.0",
@@ -34,7 +39,16 @@
 		"svelte-virtual-scroll-list": "^1.1.0",
 		"sveltekit-i18n": "^2.2.2",
 		"tailwindcss": "^3.2.4",
-		"vite": "~3.2.4"
+		"tiny-secp256k1": "^2.2.1",
+		"vite": "~3.2.4",
+		"vite-plugin-node-polyfills": "^0.5.0"
+	},
+	"pnpm": {
+		"peerDependencyRules": {
+			"ignoreMissing": [
+				"vite"
+			]
+		}
 	},
 	"type": "module"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d5f15019..2353621a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,9 +5,13 @@ specifiers:
   '@sveltejs/kit': 1.0.0-next.556
   '@zerodevx/svelte-toast': ^0.7.2
   autoprefixer: ^10.4.13
+  bech32: ^2.0.0
   bip21: ^2.0.3
+  bip32: ^3.1.0
+  bip39: ^3.0.4
   bitcoin-address-validation: ^2.2.1
   bolt11: ^1.4.0
+  buffer: ^6.0.3
   date-fns: ^2.29.3
   leaflet: ^1.9.3
   leaflet.markercluster: ^1.5.3
@@ -17,6 +21,7 @@ specifiers:
   qr-code-styling: 1.6.0-rc.1
   qr-scanner: ^1.4.1
   qrcode-base64: ^1.0.1
+  rollup: '2'
   screenfull: ^6.0.2
   svelte: ^3.53.1
   svelte-outclick: ^3.2.0
@@ -25,16 +30,22 @@ specifiers:
   svelte-virtual-scroll-list: ^1.1.0
   sveltekit-i18n: ^2.2.2
   tailwindcss: ^3.2.4
+  tiny-secp256k1: ^2.2.1
   vite: ~3.2.4
+  vite-plugin-node-polyfills: ^0.5.0
 
 devDependencies:
   '@sveltejs/adapter-node': 1.0.0-next.106_zm7dem4zfy4fmufbczhdmz6r6y
   '@sveltejs/kit': 1.0.0-next.556_svelte@3.53.1+vite@3.2.4
   '@zerodevx/svelte-toast': 0.7.2
   autoprefixer: 10.4.13_postcss@8.4.19
+  bech32: 2.0.0
   bip21: 2.0.3
+  bip32: 3.1.0
+  bip39: 3.0.4
   bitcoin-address-validation: 2.2.1
   bolt11: 1.4.0
+  buffer: 6.0.3
   date-fns: 2.29.3
   leaflet: 1.9.3
   leaflet.markercluster: 1.5.3_leaflet@1.9.3
@@ -44,6 +55,7 @@ devDependencies:
   qr-code-styling: 1.6.0-rc.1
   qr-scanner: 1.4.1
   qrcode-base64: 1.0.1
+  rollup: 2.79.1
   screenfull: 6.0.2
   svelte: 3.53.1
   svelte-outclick: 3.2.0
@@ -52,7 +64,9 @@ devDependencies:
   svelte-virtual-scroll-list: 1.1.0_svelte@3.53.1
   sveltekit-i18n: 2.2.2_svelte@3.53.1
   tailwindcss: 3.2.4_postcss@8.4.19
+  tiny-secp256k1: 2.2.1
   vite: 3.2.4
+  vite-plugin-node-polyfills: 0.5.0_rollup@2.79.1+vite@3.2.4
 
 packages:
 
@@ -117,6 +131,17 @@ packages:
       rollup: 3.7.5
     dev: true
 
+  /@rollup/plugin-inject/4.0.4_rollup@2.79.1:
+    resolution: {integrity: sha512-4pbcU4J/nS+zuHk+c+OL3WtmEQhqxlZ9uqfjQMQDOHOPld7PsCd8k5LWs8h5wjwJN7MgnAn768F2sDxEP4eNFQ==}
+    peerDependencies:
+      rollup: ^1.20.0 || ^2.0.0
+    dependencies:
+      '@rollup/pluginutils': 3.1.0_rollup@2.79.1
+      estree-walker: 2.0.2
+      magic-string: 0.25.9
+      rollup: 2.79.1
+    dev: true
+
   /@rollup/plugin-json/5.0.1_rollup@3.7.5:
     resolution: {integrity: sha512-QCwhZZLvM8nRcTHyR1vOgyTMiAnjiNj1ebD/BMRvbO1oc/z14lZH6PfxXeegee2B6mky/u9fia4fxRM4TqrUaw==}
     engines: {node: '>=14.0.0'}
@@ -148,6 +173,18 @@ packages:
       rollup: 3.7.5
     dev: true
 
+  /@rollup/pluginutils/3.1.0_rollup@2.79.1:
+    resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      rollup: ^1.20.0||^2.0.0
+    dependencies:
+      '@types/estree': 0.0.39
+      estree-walker: 1.0.1
+      picomatch: 2.3.1
+      rollup: 2.79.1
+    dev: true
+
   /@rollup/pluginutils/5.0.2_rollup@3.7.5:
     resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
     engines: {node: '>=14.0.0'}
@@ -183,6 +220,9 @@ packages:
     peerDependencies:
       svelte: ^3.44.0
       vite: ^3.2.0
+    peerDependenciesMeta:
+      vite:
+        optional: true
     dependencies:
       '@sveltejs/vite-plugin-svelte': 1.2.0_svelte@3.53.1+vite@3.2.4
       '@types/cookie': 0.5.1
@@ -213,6 +253,8 @@ packages:
     peerDependenciesMeta:
       diff-match-patch:
         optional: true
+      vite:
+        optional: true
     dependencies:
       debug: 4.3.4
       deepmerge: 4.2.2
@@ -250,10 +292,18 @@ packages:
     resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==}
     dev: true
 
+  /@types/estree/0.0.39:
+    resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
+    dev: true
+
   /@types/estree/1.0.0:
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
 
+  /@types/node/11.11.6:
+    resolution: {integrity: sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==}
+    dev: true
+
   /@types/node/18.11.9:
     resolution: {integrity: sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==}
     dev: true
@@ -311,6 +361,24 @@ packages:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
     dev: true
 
+  /asn1.js/5.4.1:
+    resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
+    dependencies:
+      bn.js: 4.12.0
+      inherits: 2.0.4
+      minimalistic-assert: 1.0.1
+      safer-buffer: 2.1.2
+    dev: true
+
+  /assert/2.0.0:
+    resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==}
+    dependencies:
+      es6-object-assign: 1.1.0
+      is-nan: 1.3.2
+      object-is: 1.1.5
+      util: 0.12.5
+    dev: true
+
   /autoprefixer/10.4.13_postcss@8.4.19:
     resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -327,6 +395,11 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
+  /available-typed-arrays/1.0.5:
+    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
     dev: true
@@ -342,6 +415,10 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
+  /base64-js/1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+    dev: true
+
   /bech32/1.1.4:
     resolution: {integrity: sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==}
     dev: true
@@ -366,6 +443,27 @@ packages:
       qs: 6.11.0
     dev: true
 
+  /bip32/3.1.0:
+    resolution: {integrity: sha512-eoeajYEzJ4d6yyVtby8C+XkCeKItiC4Mx56a0M9VaqTMC73SWOm4xVZG7SaR8e/yp4eSyky2XcBpH3DApPdu7Q==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      bs58check: 2.1.2
+      create-hash: 1.2.0
+      create-hmac: 1.1.7
+      ripemd160: 2.0.2
+      typeforce: 1.18.0
+      wif: 2.0.6
+    dev: true
+
+  /bip39/3.0.4:
+    resolution: {integrity: sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==}
+    dependencies:
+      '@types/node': 11.11.6
+      create-hash: 1.2.0
+      pbkdf2: 3.1.2
+      randombytes: 2.1.0
+    dev: true
+
   /bitcoin-address-validation/2.2.1:
     resolution: {integrity: sha512-f6LXNpvRKlTbHWb37N9tHoAbYGbshzM8FPWvCtloh++hxZ0/dmkokvKNVLz6HkG82zVwo8w6Sq4JmfO2timzyg==}
     dependencies:
@@ -392,6 +490,10 @@ packages:
     resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
     dev: true
 
+  /bn.js/5.2.1:
+    resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==}
+    dev: true
+
   /bolt11/1.4.0:
     resolution: {integrity: sha512-TeGIOpFNrvNA1XGvwBr+lYmzKfoJeyMRt7nsGmIci+5gbmSz7s46jwKLNYXH3IoxV7fjmYUEUu2NM19n9w0msg==}
     dependencies:
@@ -429,6 +531,67 @@ packages:
     resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==}
     dev: true
 
+  /browser-resolve/2.0.0:
+    resolution: {integrity: sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==}
+    dependencies:
+      resolve: 1.22.1
+    dev: true
+
+  /browserify-aes/1.2.0:
+    resolution: {integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==}
+    dependencies:
+      buffer-xor: 1.0.3
+      cipher-base: 1.0.4
+      create-hash: 1.2.0
+      evp_bytestokey: 1.0.3
+      inherits: 2.0.4
+      safe-buffer: 5.2.1
+    dev: true
+
+  /browserify-cipher/1.0.1:
+    resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==}
+    dependencies:
+      browserify-aes: 1.2.0
+      browserify-des: 1.0.2
+      evp_bytestokey: 1.0.3
+    dev: true
+
+  /browserify-des/1.0.2:
+    resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==}
+    dependencies:
+      cipher-base: 1.0.4
+      des.js: 1.0.1
+      inherits: 2.0.4
+      safe-buffer: 5.2.1
+    dev: true
+
+  /browserify-rsa/4.1.0:
+    resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==}
+    dependencies:
+      bn.js: 5.2.1
+      randombytes: 2.1.0
+    dev: true
+
+  /browserify-sign/4.2.1:
+    resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==}
+    dependencies:
+      bn.js: 5.2.1
+      browserify-rsa: 4.1.0
+      create-hash: 1.2.0
+      create-hmac: 1.1.7
+      elliptic: 6.5.4
+      inherits: 2.0.4
+      parse-asn1: 5.1.6
+      readable-stream: 3.6.0
+      safe-buffer: 5.2.1
+    dev: true
+
+  /browserify-zlib/0.2.0:
+    resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==}
+    dependencies:
+      pako: 1.0.11
+    dev: true
+
   /browserslist/4.21.4:
     resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -458,11 +621,33 @@ packages:
     resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
     dev: true
 
+  /buffer-xor/1.0.3:
+    resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==}
+    dev: true
+
+  /buffer/5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+    dev: true
+
+  /buffer/6.0.3:
+    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+    dev: true
+
   /builtin-modules/3.3.0:
     resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
     engines: {node: '>=6'}
     dev: true
 
+  /builtin-status-codes/3.0.0:
+    resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==}
+    dev: true
+
   /busboy/1.6.0:
     resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
     engines: {node: '>=10.16.0'}
@@ -520,11 +705,26 @@ packages:
     resolution: {integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=}
     dev: true
 
+  /console-browserify/1.2.0:
+    resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==}
+    dev: true
+
+  /constants-browserify/1.0.0:
+    resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}
+    dev: true
+
   /cookie/0.5.0:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
     dev: true
 
+  /create-ecdh/4.0.4:
+    resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==}
+    dependencies:
+      bn.js: 4.12.0
+      elliptic: 6.5.4
+    dev: true
+
   /create-hash/1.2.0:
     resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==}
     dependencies:
@@ -535,6 +735,37 @@ packages:
       sha.js: 2.4.11
     dev: true
 
+  /create-hmac/1.1.7:
+    resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==}
+    dependencies:
+      cipher-base: 1.0.4
+      create-hash: 1.2.0
+      inherits: 2.0.4
+      ripemd160: 2.0.2
+      safe-buffer: 5.2.1
+      sha.js: 2.4.11
+    dev: true
+
+  /create-require/1.1.1:
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+    dev: true
+
+  /crypto-browserify/3.12.0:
+    resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==}
+    dependencies:
+      browserify-cipher: 1.0.1
+      browserify-sign: 4.2.1
+      create-ecdh: 4.0.4
+      create-hash: 1.2.0
+      create-hmac: 1.1.7
+      diffie-hellman: 5.0.3
+      inherits: 2.0.4
+      pbkdf2: 3.1.2
+      public-encrypt: 4.0.3
+      randombytes: 2.1.0
+      randomfill: 1.0.4
+    dev: true
+
   /cssesc/3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
     engines: {node: '>=4'}
@@ -563,10 +794,25 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /define-properties/1.1.4:
+    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-property-descriptors: 1.0.0
+      object-keys: 1.1.1
+    dev: true
+
   /defined/1.0.1:
     resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
     dev: true
 
+  /des.js/1.0.1:
+    resolution: {integrity: sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==}
+    dependencies:
+      inherits: 2.0.4
+      minimalistic-assert: 1.0.1
+    dev: true
+
   /detect-indent/6.1.0:
     resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
     engines: {node: '>=8'}
@@ -590,10 +836,23 @@ packages:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
     dev: true
 
+  /diffie-hellman/5.0.3:
+    resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==}
+    dependencies:
+      bn.js: 4.12.0
+      miller-rabin: 4.0.1
+      randombytes: 2.1.0
+    dev: true
+
   /dlv/1.1.3:
     resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
     dev: true
 
+  /domain-browser/4.22.0:
+    resolution: {integrity: sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==}
+    engines: {node: '>=10'}
+    dev: true
+
   /electron-to-chromium/1.4.284:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
@@ -610,6 +869,10 @@ packages:
       minimalistic-crypto-utils: 1.0.1
     dev: true
 
+  /es6-object-assign/1.1.0:
+    resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==}
+    dev: true
+
   /es6-promise/3.3.1:
     resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
     dev: true
@@ -829,10 +1092,26 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /estree-walker/1.0.1:
+    resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==}
+    dev: true
+
   /estree-walker/2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
     dev: true
 
+  /events/3.3.0:
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
+    dev: true
+
+  /evp_bytestokey/1.0.3:
+    resolution: {integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==}
+    dependencies:
+      md5.js: 1.3.5
+      safe-buffer: 5.2.1
+    dev: true
+
   /fast-glob/3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
@@ -857,6 +1136,20 @@ packages:
       to-regex-range: 5.0.1
     dev: true
 
+  /find-up/5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+    dev: true
+
+  /for-each/0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+    dependencies:
+      is-callable: 1.2.7
+    dev: true
+
   /fraction.js/4.2.0:
     resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
     dev: true
@@ -929,15 +1222,34 @@ packages:
     resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
     dev: true
 
+  /gopd/1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+    dependencies:
+      get-intrinsic: 1.1.3
+    dev: true
+
   /graceful-fs/4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
     dev: true
 
+  /has-property-descriptors/1.0.0:
+    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
+    dependencies:
+      get-intrinsic: 1.1.3
+    dev: true
+
   /has-symbols/1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
     dev: true
 
+  /has-tostringtag/1.0.0:
+    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-symbols: 1.0.3
+    dev: true
+
   /has/1.0.3:
     resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
     engines: {node: '>= 0.4.0'}
@@ -969,6 +1281,14 @@ packages:
       minimalistic-crypto-utils: 1.0.1
     dev: true
 
+  /https-browserify/1.0.0:
+    resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==}
+    dev: true
+
+  /ieee754/1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+    dev: true
+
   /inflight/1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     dependencies:
@@ -980,6 +1300,14 @@ packages:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
     dev: true
 
+  /is-arguments/1.1.1:
+    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      has-tostringtag: 1.0.0
+    dev: true
+
   /is-binary-path/2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
@@ -994,6 +1322,11 @@ packages:
       builtin-modules: 3.3.0
     dev: true
 
+  /is-callable/1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /is-core-module/2.11.0:
     resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
     dependencies:
@@ -1005,6 +1338,13 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /is-generator-function/1.0.10:
+    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      has-tostringtag: 1.0.0
+    dev: true
+
   /is-glob/4.0.3:
     resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
     engines: {node: '>=0.10.0'}
@@ -1016,6 +1356,14 @@ packages:
     resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
     dev: true
 
+  /is-nan/1.3.2:
+    resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+    dev: true
+
   /is-number/7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
@@ -1027,6 +1375,22 @@ packages:
       '@types/estree': 1.0.0
     dev: true
 
+  /is-typed-array/1.1.10:
+    resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+    dev: true
+
+  /isomorphic-timers-promises/1.0.1:
+    resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==}
+    engines: {node: '>=10'}
+    dev: true
+
   /kleur/4.1.5:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
@@ -1049,6 +1413,13 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /locate-path/6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+    dependencies:
+      p-locate: 5.0.0
+    dev: true
+
   /lodash/4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
     dev: true
@@ -1087,6 +1458,14 @@ packages:
       picomatch: 2.3.1
     dev: true
 
+  /miller-rabin/4.0.1:
+    resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==}
+    hasBin: true
+    dependencies:
+      bn.js: 4.12.0
+      brorand: 1.1.0
+    dev: true
+
   /mime/3.0.0:
     resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
     engines: {node: '>=10.0.0'}
@@ -1163,6 +1542,39 @@ packages:
     resolution: {integrity: sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==}
     dev: true
 
+  /node-stdlib-browser/1.2.0:
+    resolution: {integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==}
+    engines: {node: '>=10'}
+    dependencies:
+      assert: 2.0.0
+      browser-resolve: 2.0.0
+      browserify-zlib: 0.2.0
+      buffer: 5.7.1
+      console-browserify: 1.2.0
+      constants-browserify: 1.0.0
+      create-require: 1.1.1
+      crypto-browserify: 3.12.0
+      domain-browser: 4.22.0
+      events: 3.3.0
+      https-browserify: 1.0.0
+      isomorphic-timers-promises: 1.0.1
+      os-browserify: 0.3.0
+      path-browserify: 1.0.1
+      pkg-dir: 5.0.0
+      process: 0.11.10
+      punycode: 1.4.1
+      querystring-es3: 0.2.1
+      readable-stream: 3.6.0
+      stream-browserify: 3.0.0
+      stream-http: 3.2.0
+      string_decoder: 1.3.0
+      timers-browserify: 2.0.12
+      tty-browserify: 0.0.1
+      url: 0.11.0
+      util: 0.12.5
+      vm-browserify: 1.1.2
+    dev: true
+
   /normalize-path/3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
@@ -1182,12 +1594,66 @@ packages:
     resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
     dev: true
 
+  /object-is/1.1.5:
+    resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+    dev: true
+
+  /object-keys/1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+    dev: true
+
   /once/1.4.0:
     resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
     dependencies:
       wrappy: 1.0.2
     dev: true
 
+  /os-browserify/0.3.0:
+    resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==}
+    dev: true
+
+  /p-limit/3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      yocto-queue: 0.1.0
+    dev: true
+
+  /p-locate/5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+    dependencies:
+      p-limit: 3.1.0
+    dev: true
+
+  /pako/1.0.11:
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
+    dev: true
+
+  /parse-asn1/5.1.6:
+    resolution: {integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==}
+    dependencies:
+      asn1.js: 5.4.1
+      browserify-aes: 1.2.0
+      evp_bytestokey: 1.0.3
+      pbkdf2: 3.1.2
+      safe-buffer: 5.2.1
+    dev: true
+
+  /path-browserify/1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+    dev: true
+
+  /path-exists/4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+    dev: true
+
   /path-is-absolute/1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
@@ -1197,6 +1663,17 @@ packages:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
     dev: true
 
+  /pbkdf2/3.1.2:
+    resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==}
+    engines: {node: '>=0.12'}
+    dependencies:
+      create-hash: 1.2.0
+      create-hmac: 1.1.7
+      ripemd160: 2.0.2
+      safe-buffer: 5.2.1
+      sha.js: 2.4.11
+    dev: true
+
   /picocolors/1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
     dev: true
@@ -1211,6 +1688,13 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /pkg-dir/5.0.0:
+    resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==}
+    engines: {node: '>=10'}
+    dependencies:
+      find-up: 5.0.0
+    dev: true
+
   /postcss-import/14.1.0_postcss@8.4.19:
     resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==}
     engines: {node: '>=10.0.0'}
@@ -1297,6 +1781,30 @@ packages:
     hasBin: true
     dev: true
 
+  /process/0.11.10:
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
+    dev: true
+
+  /public-encrypt/4.0.3:
+    resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==}
+    dependencies:
+      bn.js: 4.12.0
+      browserify-rsa: 4.1.0
+      create-hash: 1.2.0
+      parse-asn1: 5.1.6
+      randombytes: 2.1.0
+      safe-buffer: 5.2.1
+    dev: true
+
+  /punycode/1.3.2:
+    resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
+    dev: true
+
+  /punycode/1.4.1:
+    resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
+    dev: true
+
   /qr-code-styling/1.6.0-rc.1:
     resolution: {integrity: sha512-ModRIiW6oUnsP18QzrRYZSc/CFKFKIdj7pUs57AEVH20ajlglRpN3HukjHk0UbNMTlKGuaYl7Gt6/O5Gg2NU2Q==}
     dependencies:
@@ -1324,6 +1832,17 @@ packages:
       side-channel: 1.0.4
     dev: true
 
+  /querystring-es3/0.2.1:
+    resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==}
+    engines: {node: '>=0.4.x'}
+    dev: true
+
+  /querystring/0.2.0:
+    resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
+    engines: {node: '>=0.4.x'}
+    deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+    dev: true
+
   /queue-microtask/1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
     dev: true
@@ -1333,6 +1852,19 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /randombytes/2.1.0:
+    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
+    dependencies:
+      safe-buffer: 5.2.1
+    dev: true
+
+  /randomfill/1.0.4:
+    resolution: {integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==}
+    dependencies:
+      randombytes: 2.1.0
+      safe-buffer: 5.2.1
+    dev: true
+
   /read-cache/1.0.0:
     resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
     dependencies:
@@ -1416,6 +1948,10 @@ packages:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
     dev: true
 
+  /safer-buffer/2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+    dev: true
+
   /sander/0.5.1:
     resolution: {integrity: sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==}
     dependencies:
@@ -1444,6 +1980,10 @@ packages:
     resolution: {integrity: sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==}
     dev: true
 
+  /setimmediate/1.0.5:
+    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
+    dev: true
+
   /sha.js/2.4.11:
     resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     hasBin: true
@@ -1492,6 +2032,22 @@ packages:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     dev: true
 
+  /stream-browserify/3.0.0:
+    resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
+    dependencies:
+      inherits: 2.0.4
+      readable-stream: 3.6.0
+    dev: true
+
+  /stream-http/3.2.0:
+    resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==}
+    dependencies:
+      builtin-status-codes: 3.0.0
+      inherits: 2.0.4
+      readable-stream: 3.6.0
+      xtend: 4.0.2
+    dev: true
+
   /streamsearch/1.1.0:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
@@ -1640,6 +2196,13 @@ packages:
       - ts-node
     dev: true
 
+  /timers-browserify/2.0.12:
+    resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==}
+    engines: {node: '>=0.6.0'}
+    dependencies:
+      setimmediate: 1.0.5
+    dev: true
+
   /tiny-glob/0.2.9:
     resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
     dependencies:
@@ -1647,6 +2210,13 @@ packages:
       globrex: 0.1.2
     dev: true
 
+  /tiny-secp256k1/2.2.1:
+    resolution: {integrity: sha512-/U4xfVqnVxJXN4YVsru0E6t5wVncu2uunB8+RVR40fYUxkKYUPS10f+ePQZgFBoE/Jbf9H1NBveupF2VmB58Ng==}
+    engines: {node: '>=14.0.0'}
+    dependencies:
+      uint8array-tools: 0.0.7
+    dev: true
+
   /to-regex-range/5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -1659,10 +2229,19 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
+  /tty-browserify/0.0.1:
+    resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==}
+    dev: true
+
   /typeforce/1.18.0:
     resolution: {integrity: sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==}
     dev: true
 
+  /uint8array-tools/0.0.7:
+    resolution: {integrity: sha512-vrrNZJiusLWoFWBqz5Y5KMCgP9W9hnjZHzZiZRT8oNAkq3d5Z5Oe76jAvVVSRh4U8GGR90N2X1dWtrhvx6L8UQ==}
+    engines: {node: '>=14.0.0'}
+    dev: true
+
   /undici/5.12.0:
     resolution: {integrity: sha512-zMLamCG62PGjd9HHMpo05bSLvvwWOZgGeiWlN/vlqu3+lRo3elxktVGEyLMX+IO7c2eflLjcW74AlkhEZm15mg==}
     engines: {node: '>=12.18'}
@@ -1681,16 +2260,48 @@ packages:
       picocolors: 1.0.0
     dev: true
 
+  /url/0.11.0:
+    resolution: {integrity: sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==}
+    dependencies:
+      punycode: 1.3.2
+      querystring: 0.2.0
+    dev: true
+
   /util-deprecate/1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
     dev: true
 
+  /util/0.12.5:
+    resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}
+    dependencies:
+      inherits: 2.0.4
+      is-arguments: 1.1.1
+      is-generator-function: 1.0.10
+      is-typed-array: 1.1.10
+      which-typed-array: 1.1.9
+    dev: true
+
   /varuint-bitcoin/1.1.2:
     resolution: {integrity: sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==}
     dependencies:
       safe-buffer: 5.2.1
     dev: true
 
+  /vite-plugin-node-polyfills/0.5.0_rollup@2.79.1+vite@3.2.4:
+    resolution: {integrity: sha512-zaTCjL64pJY6RDeP4ZZ1rtFKFTy44RYFtFIISKk3LclIeD/yR9tqpscj5x+jXhD7Bh1HYk2a7uu1aCFEYiUlIA==}
+    peerDependencies:
+      vite: ^2.0.0 || ^3.0.0
+    peerDependenciesMeta:
+      vite:
+        optional: true
+    dependencies:
+      '@rollup/plugin-inject': 4.0.4_rollup@2.79.1
+      node-stdlib-browser: 1.2.0
+      vite: 3.2.4
+    transitivePeerDependencies:
+      - rollup
+    dev: true
+
   /vite/3.2.4:
     resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -1735,6 +2346,22 @@ packages:
       vite: 3.2.4
     dev: true
 
+  /vm-browserify/1.1.2:
+    resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
+    dev: true
+
+  /which-typed-array/1.1.9:
+    resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
+    engines: {node: '>= 0.4'}
+    dependencies:
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.2
+      for-each: 0.3.3
+      gopd: 1.0.1
+      has-tostringtag: 1.0.0
+      is-typed-array: 1.1.10
+    dev: true
+
   /wif/2.0.6:
     resolution: {integrity: sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==}
     dependencies:
@@ -1754,3 +2381,8 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
     dev: true
+
+  /yocto-queue/0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+    dev: true
diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index 32f046d0..8ee3af4a 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -5,7 +5,7 @@
 	import { enhance } from '$app/forms';
 	import { Icon } from '$comp';
 	import { focus } from '$lib/utils';
-	import { loginRedirect } from '$lib/store';
+	import { loginRedirect, password } from '$lib/store';
 	import { t } from '$lib/translations';
 	import { page } from '$app/stores';
 
@@ -19,12 +19,12 @@
 	export let form;
 	export let pageID;
 
-	let username, password, email, submit;
+	let username, email, btn;
 
 	$: update(form);
-	let update = (form) => form && ({ username, password } = form);
+	let update = (form) => form && ({ username, password: $password } = form);
 
-	$: token && token?.length === 6 && tick().then(() => submit.click());
+	$: token && token?.length === 6 && tick().then(() => btn.click());
 
 	let revealPassword = false;
 
@@ -52,7 +52,7 @@
 
 				<form class="space-y-5" {action} method="POST" use:enhance>
 					<input type="hidden" name="username" value={username} />
-					<input type="hidden" name="password" value={password} />
+					<input type="hidden" name="password" value={$password} />
 					<input type="hidden" name="token" value={token} />
 
 					<div>
@@ -66,7 +66,7 @@
 						</Pincode>
 					</div>
 					<button
-						bind:this={submit}
+						bind:this={btn}
 						type="submit"
 						class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
 						>{$t('login.' + pageID)}
@@ -107,7 +107,7 @@
 								type="text"
 								required
 								class="bg-primary"
-								bind:value={password}
+								bind:value={$password}
 								autocapitalize="none"
 							/>
 						{:else}
@@ -116,7 +116,7 @@
 								type="password"
 								required
 								class="bg-primary"
-								bind:value={password}
+								bind:value={$password}
 								autocapitalize="none"
 							/>
 						{/if}
diff --git a/src/hooks.server.js b/src/hooks.server.js
index f6e7ff70..4107ec86 100644
--- a/src/hooks.server.js
+++ b/src/hooks.server.js
@@ -14,8 +14,6 @@ export async function handle({ event, resolve }) {
 			user = await get('/me', auth(event.cookies));
 			event.locals.user = user;
 
-			if (!user.pubkey) throw new Error('missing pubkey');
-
 			if (['/', '/login', '/register'].includes(pathname) && request.method === 'GET')
 				return Response.redirect(origin + `/${user.username}/dashboard`, 307);
 		} catch (e) {
diff --git a/src/lib/socket.js b/src/lib/socket.js
index 59c2f872..d43af082 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -40,7 +40,7 @@ export const messages = (data) => ({
 		events[data.id] = data;
 		events.q.push(data.id);
 		$events.set(events);
-		if (events.q.length > 1000) delete events[events.q.shift()];
+		if (events.q.length > 500) delete events[events.q.shift()];
 	},
 
 	rate() {
diff --git a/src/lib/store.js b/src/lib/store.js
index df1525d3..34e8dcca 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -26,7 +26,14 @@ const persistLocal = (key, defaultValue) => {
 			: defaultValue
 	);
 
-	s.subscribe((v) => browser && localStorage.setItem(key, JSON.stringify(v)));
+	s.subscribe((v) => {
+		try {
+			browser && localStorage.setItem(key, JSON.stringify(v));
+		} catch (e) {
+			console.log('problem setting key', v);
+			console.log(e);
+		}
+	});
 
 	return s;
 };
@@ -48,3 +55,4 @@ export const request = writable();
 export const invoice = writable();
 export const txns = persistLocal('transactions', []);
 export const events = persistLocal('events', {});
+export const password = writable();
diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js
index d968be70..88ca1539 100644
--- a/src/routes/(app)/+layout.server.js
+++ b/src/routes/(app)/+layout.server.js
@@ -11,6 +11,8 @@ export async function load({ cookies, locals, request, url, params }) {
 
 	let { user } = locals;
 	if (user) {
+		if (!user.pubkey && !url.pathname.includes('gen'))
+			throw redirect(307, `/${user.username}/generate`);
 		let account = user.accounts.find((a) => a.asset === btc && !a.pubkey);
 		if (account) {
 			let { id } = account;
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index c10518f5..0b49a870 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -3,7 +3,7 @@
 	import { f, s, post, failure, sat, sats } from '$lib/utils';
 	import { tick } from 'svelte';
 	import { Avatar, Icon } from '$comp';
-	import { rate, selectedRate } from '$lib/store';
+	import { rate, password, selectedRate } from '$lib/store';
 	import { goto } from '$app/navigation';
 	import { t } from '$lib/translations';
 
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
new file mode 100644
index 00000000..873e336f
--- /dev/null
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -0,0 +1,61 @@
+<script>
+	import { Buffer } from 'buffer';
+	import { onMount } from 'svelte';
+	import { BIP32Factory } from 'bip32';
+	import { bech32m } from 'bech32';
+	import { generateMnemonic, mnemonicToEntropy, mnemonicToSeedSync } from 'bip39';
+	import * as ecc from 'tiny-secp256k1';
+	import { post } from '$lib/utils';
+	import { goto } from '$app/navigation';
+
+	export let data;
+	let { user } = data;
+
+	const { encode, decode, fromWords, toWords } = bech32m;
+
+	const stretch = async (password, salt) =>
+		crypto.subtle.deriveKey(
+			{
+				name: 'PBKDF2',
+				salt,
+				iterations: 100000,
+				hash: 'SHA-256'
+			},
+			await crypto.subtle.importKey(
+				'raw',
+				new TextEncoder().encode(password),
+				{ name: 'PBKDF2' },
+				false,
+				['deriveBits', 'deriveKey']
+			),
+			{ name: 'AES-GCM', length: 256 },
+			true,
+			['encrypt', 'decrypt']
+		);
+
+	let mnemonic, key, password, seed, entropy, cipher, pubkey, salt, child;
+
+	onMount(async () => {
+		let bip32 = await BIP32Factory(ecc);
+		mnemonic = generateMnemonic();
+		seed = mnemonicToSeedSync(mnemonic);
+		entropy = mnemonicToEntropy(mnemonic);
+		key = bip32.fromSeed(seed);
+		child = key.derivePath("m/44'/1237'/0'/0/0");
+		salt = crypto.getRandomValues(new Uint8Array(16));
+
+		let bytes = new Uint8Array(
+			await crypto.subtle.encrypt(
+				{ name: 'AES-GCM', iv: new Uint8Array(16) },
+				await stretch(password, salt),
+				Uint8Array.from(Buffer.from(entropy, 'hex'))
+			)
+		);
+
+		user.pubkey = Buffer.from(ecc.xOnlyPointFromPoint(child.publicKey)).toString('hex');
+		user.cipher = encode('encprv', toWords(bytes), 180);
+
+		await post(`/${user.username}/generate`, user);
+		goto(`/${user.username}/dashboard`);
+	});
+</script>
diff --git a/src/routes/(app)/[username]/generate/+server.js b/src/routes/(app)/[username]/generate/+server.js
new file mode 100644
index 00000000..c63ab5a6
--- /dev/null
+++ b/src/routes/(app)/[username]/generate/+server.js
@@ -0,0 +1,8 @@
+import { auth, post } from '$lib/utils';
+import { json } from '@sveltejs/kit';
+
+export async function POST({ cookies, request }) {
+	let body = await request.json();
+	let user = await post(`/user`, body, auth(cookies));
+	return json(user);
+}
diff --git a/vite.config.js b/vite.config.js
index c4cdb66a..edb1caae 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,9 +1,13 @@
 import { sveltekit } from '@sveltejs/kit/vite';
+import { nodePolyfills } from 'vite-plugin-node-polyfills';
+
+import wasm from 'vite-plugin-wasm';
+import topLevelAwait from 'vite-plugin-top-level-await';
 import path from 'path';
 
 /** @type {import('vite').UserConfig} */
 const config = {
-	plugins: [sveltekit()],
+	plugins: [nodePolyfills(), sveltekit(), topLevelAwait(), wasm()],
 	resolve: {
 		alias: {
 			$comp: path.resolve('src/components/index.js')
-- 
cgit v1.2.3


From 60b24b3d5951e159d09f42ed766c404e4b1acc4e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 11 Feb 2023 00:38:55 -0800
Subject: invoice type toggle

---
 src/lib/invoice.js                                 |  2 +-
 src/lib/utils.js                                   |  8 ++++
 src/locales/en.json                                |  2 +-
 .../(app)/[username]/invoice/[hash]/+page.svelte   | 43 ++++++++++++++++++++--
 .../[username]/payments/[...page]/+page.svelte     | 12 +++---
 .../[username]/receive/[...param]/+page.svelte     |  5 ---
 src/routes/(app)/payment/[id]/+page.server.js      |  4 +-
 src/routes/(app)/payment/[id]/+page.svelte         | 31 +++++++++-------
 8 files changed, 75 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/lib/invoice.js b/src/lib/invoice.js
index bb75d4cb..23ce1757 100644
--- a/src/lib/invoice.js
+++ b/src/lib/invoice.js
@@ -11,7 +11,7 @@ export default async ({ cookies, request, url }) => {
 
 	let invoice = {
 		amount,
-		tip: parseInt(form.get('tip')),
+		tip: parseInt(form.get('tip')) || 0,
 		type: form.get('type'),
 		prompt: form.get('prompt') === 'true',
 		rate: parseFloat(form.get('rate')) || rates[form.get('currency')],
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 80f7fe07..b3bb29ec 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -231,3 +231,11 @@ export function ss(str1, str2) {
 
 	return 0.0;
 }
+
+export const types = {
+	bitcoin: 'bitcoin',
+	lightning: 'lightning',
+	internal: 'internal',
+	pot: 'pot',
+	classic: 'classic'
+};
diff --git a/src/locales/en.json b/src/locales/en.json
index 7e7c235b..17f4b34e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -263,7 +263,7 @@
 		"id": "Transaction ID",
 		"details": "Transaction Details",
 		"header": "Payments",
-		"preimage": "Preimage",
+		"preimage": "Proof of payment",
 		"type": "Type",
 		"time": "Time",
 		"sent": "Sent",
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
index ad9721e7..b5571f23 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
@@ -1,12 +1,14 @@
 <script>
+	import { enhance } from '$app/forms';
 	import { send } from '$lib/socket';
-	import { back, copy, f, get, sat, reverseFormat, s, sats } from '$lib/utils';
+	import { post, back, copy, f, get, types, sat, reverseFormat, s, sats } from '$lib/utils';
 	import { tick, onMount, onDestroy } from 'svelte';
 	import { browser } from '$app/environment';
 	import { last } from '$lib/store';
 	import { Avatar, Icon, Heart, Image } from '$comp';
 	import { t } from '$lib/translations';
 	import screenfull from 'screenfull';
+	import { goto, invalidate } from '$app/navigation';
 
 	export let data;
 
@@ -21,18 +23,19 @@
 		prompt,
 		text,
 		tip,
+		request_id,
 		user: { username, currency }
 	} = invoice;
 
 	let showQr = !amount;
 
-	let src = sm;
+	$: src = sm;
 
 	let qr;
 	let tipPercent = 0;
 
 	let refresh = (data) => {
-		({ invoice, id } = data);
+		({ invoice, id, user, sm, lg } = data);
 		({
 			amount,
 			hash,
@@ -71,9 +74,43 @@
 		if (full) src = lg;
 		else src = sm;
 	};
+
+	let toggleType = async () => {
+		invoice.type = invoice.type === types.lightning ? types.bitcoin : types.lightning;
+		({ hash } = await post(`/${username}/invoice`, {
+			invoice,
+			user: { username, currency }
+		}));
+
+		goto(`./${hash}`, { invalidateAll: true });
+	};
 </script>
 
 <div class="container mx-auto max-w-lg px-4 space-y-5">
+	<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+		<button
+			class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
+			class:bg-black={type === types.lightning}
+			class:text-white={type === types.lightning}
+			on:click={toggleType}
+		>
+			⚡️ Lightning
+		</button>
+
+		<button
+			class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full flex justify-center "
+			class:bg-black={type === types.bitcoin}
+			class:text-white={type === types.bitcoin}
+			on:click={toggleType}
+		>
+			<img
+				src="/images/bitcoin.svg"
+				class="my-auto w-8 border-4 border-transparent"
+				alt="Bitcoin"
+			/>
+			<div class="my-auto">Bitcoin</div>
+		</button>
+	</div>
 	<div class="relative flex">
 		<div class="flex mx-auto w-[360px] h-[360px]">
 			<img
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index 142be4c4..2068c306 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -180,14 +180,12 @@
 									</div>
 								</a>
 							{:else if p.with}
-								<a href={`/${p.with.username}`}>
-									<div class="flex">
-										<div class="my-auto">
-											<Avatar user={p.with} size={12} />
-										</div>
-										<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
+								<div class="flex">
+									<div class="my-auto">
+										<Avatar user={p.with} size={12} disabled={true} />
 									</div>
-								</a>
+									<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
+								</div>
 							{:else if p.type === types.classic}
 								<img
 									src="/images/classic.png"
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index 99d95be0..95495368 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -46,10 +46,5 @@
 		>
 			{amount ? $t('payments.next') : $t('payments.sendersChoice')}
 		</button>
-
-		<div class="w-full flex justify-center">
-			<span class="font-bold mr-2">{type[0].toUpperCase() + type.substring(1, type.length)}</span>
-			<Toggle id="prompt" checked={lightning} bind:value={lightning} />
-		</div>
 	</div>
 </form>
diff --git a/src/routes/(app)/payment/[id]/+page.server.js b/src/routes/(app)/payment/[id]/+page.server.js
index cbd7355e..1c90ab69 100644
--- a/src/routes/(app)/payment/[id]/+page.server.js
+++ b/src/routes/(app)/payment/[id]/+page.server.js
@@ -1,6 +1,6 @@
 import { auth, get } from '$lib/utils';
 
 export async function load({ cookies, params }) {
-	let tx = await get(`/payments/${params.id}`, auth(cookies));
-	return { tx };
+	let payment = await get(`/payments/${params.id}`, auth(cookies));
+	return { payment };
 }
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index a961d14d..da21400a 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -6,33 +6,41 @@
 	import { PUBLIC_EXPLORER as expl } from '$env/static/public';
 
 	export let data;
-	let { user, tx } = data;
+	let { user, payment: p } = data;
 	let { username } = user;
-	let { id, amount, created, rate, type, ref, fee, currency } = tx;
+	let { id, amount, created, rate, type, ref, fee, currency } = p;
 	fee = fee || 0;
 
-	let fiat = (Math.abs(amount) * rate) / sats;
+	let total = amount > 0 ? amount : -amount + fee;
+	let fiat = (total * rate) / sats;
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
 	<Icon icon="arrow-left" style="w-10" />
 </button>
 
-<div class="container mx-auto max-w-lg px-4 space-y-2 sm:space-y-5 break-all">
+<div class="container mx-auto max-w-lg px-4 space-y-2 sm:space-y-5 break-all text-center">
 	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
 		{$t(amount < 0 ? 'payments.sent' : 'payments.received')}
 	</h1>
 
+	{#if p.with}
+		<div class="flex justify-center">
+			<div class="my-auto">
+				<Avatar user={p.with} />
+			</div>
+			<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
+		</div>
+	{/if}
+
 	<div>
-		<div class="font-bold">{$t('payments.amount')}</div>
 		<div class="text-xl">
 			{f(fiat, currency)}
-			<span class="text-secondary">⚡️{`${s(Math.abs(amount) + fee)}`}</span>
+			<span class="text-secondary">⚡️{`${s(total)}`}</span>
 		</div>
 	</div>
 
 	<div>
-		<div class="font-bold">{$t('payments.date')}</div>
 		<div>
 			{format(new Date(created), 'MMMM d')},
 			{format(new Date(created), 'h:mm aaa')}
@@ -46,17 +54,14 @@
 				{ref}
 			</div>
 		</div>
-	{:else}
+	{:else if type === 'bitcoin'}
 		<div>
-			<div class="font-bold">{$t('payments.id')}</div>
 			<div class="flex">
 				<div>
-					<a href={`${expl}/tx/${id}`} target="_blank" rel="noreferrer" class="text-blue-600"
-						>{id}</a
-					>
+					<a href={`${expl}/payment/${id}`} target="_blank" rel="noreferrer">{id}</a>
 				</div>
 				<button class="flex font-bold hover:opacity-80 mb-auto" on:click={() => copy(id)}
-					><Icon icon="copy" style="mr-1" />
+					><Icon icon="copy" style="ml-2" />
 				</button>
 			</div>
 		</div>
-- 
cgit v1.2.3


From 979d9dd27a147bae13ba953a7e260412fa024f57 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 14 Feb 2023 11:19:12 -0800
Subject: handle sending to user

---
 src/lib/utils.js                                   |  2 ++
 src/routes/(app)/[username]/(profile)/+page.svelte |  1 -
 src/routes/(app)/payment/[id]/+page.svelte         | 42 ++++++++++++++++------
 src/routes/(app)/send/[...text]/+page.server.js    |  5 +--
 4 files changed, 36 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/lib/utils.js b/src/lib/utils.js
index b3bb29ec..86f722b9 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -147,6 +147,8 @@ export const login = async (user, cookies) => {
 
 export const auth = (cookies) => ({ authorization: `Bearer ${cookies.get('token')}` });
 
+export const fiat = (amount, rate) => (amount * rate) / sats;
+
 export const f = (s, currency) =>
 	new Intl.NumberFormat('en-US', {
 		style: 'currency',
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index baab8ba1..c704c00d 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -5,7 +5,6 @@
 
 	export let data;
 	let { events, invoices, sent, received, subject, user } = data;
-	console.log(invoices);
 </script>
 
 <div class="flex justify-center lg:justify-start">
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index da21400a..7b2bdb26 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -1,6 +1,6 @@
 <script>
 	import { t } from '$lib/translations';
-	import { back, copy, f, s, sats } from '$lib/utils';
+	import { back, copy, f, s, fiat, sats } from '$lib/utils';
 	import { Avatar, Icon } from '$comp';
 	import { format } from 'date-fns';
 	import { PUBLIC_EXPLORER as expl } from '$env/static/public';
@@ -8,18 +8,16 @@
 	export let data;
 	let { user, payment: p } = data;
 	let { username } = user;
-	let { id, amount, created, rate, type, ref, fee, currency } = p;
+	let { id, amount, created, rate, type, ref, ourfee, fee, currency } = p;
 	fee = fee || 0;
-
-	let total = amount > 0 ? amount : -amount + fee;
-	let fiat = (total * rate) / sats;
+	amount = Math.abs(amount);
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
 	<Icon icon="arrow-left" style="w-10" />
 </button>
 
-<div class="container mx-auto max-w-lg px-4 space-y-2 sm:space-y-5 break-all text-center">
+<div class="container mx-auto max-w-lg px-4 space-y-2 sm:space-y-5 break-all text-2xl">
 	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
 		{$t(amount < 0 ? 'payments.sent' : 'payments.received')}
 	</h1>
@@ -34,13 +32,33 @@
 	{/if}
 
 	<div>
-		<div class="text-xl">
-			{f(fiat, currency)}
-			<span class="text-secondary">⚡️{`${s(total)}`}</span>
+		<span class="text-lg text-secondary">Amount</span>
+		<div>
+			{f(fiat(amount, rate), currency)}
+			<span class="text-secondary">⚡️{`${s(amount)}`}</span>
+		</div>
+	</div>
+
+	<div>
+		<span class="text-lg text-secondary">Network fee</span>
+		<div>
+			{f(fiat(fee, rate), currency)}
+			<span class="text-secondary">⚡️{`${s(fee)}`}</span>
 		</div>
 	</div>
 
+	{#if ourfee > 0}
+		<div>
+			<span class="text-lg text-secondary">Platform fee</span>
+			<div>
+				{f(fiat(ourfee, rate), currency)}
+				<span class="text-secondary">⚡️{`${s(ourfee)}`}</span>
+			</div>
+		</div>
+	{/if}
+
 	<div>
+		<span class="text-lg text-secondary">Date</span>
 		<div>
 			{format(new Date(created), 'MMMM d')},
 			{format(new Date(created), 'h:mm aaa')}
@@ -49,6 +67,7 @@
 
 	{#if type === 'lightning'}
 		<div>
+			<span class="text-lg text-secondary">Proof</span>
 			<div class="font-bold">{$t('payments.preimage')}</div>
 			<div>
 				{ref}
@@ -56,12 +75,13 @@
 		</div>
 	{:else if type === 'bitcoin'}
 		<div>
+			<span class="text-lg text-secondary">Txid</span>
 			<div class="flex">
 				<div>
 					<a href={`${expl}/payment/${id}`} target="_blank" rel="noreferrer">{id}</a>
 				</div>
-				<button class="flex font-bold hover:opacity-80 mb-auto" on:click={() => copy(id)}
-					><Icon icon="copy" style="ml-2" />
+				<button class="flex font-bold hover:opacity-80 mb-auto my-auto" on:click={() => copy(id)}
+					><Icon icon="copy" style="ml-2 w-20 my-auto" />
 				</button>
 			</div>
 		</div>
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index d09b4da9..b1089a5b 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -45,14 +45,15 @@ let parse = async (t, host) => {
 	// bitcoin
 	if (validate(t)) {
 		try {
-			({ id } = await get(`/invoice/${t}`));
+			({ id, user } = await get(`/invoice/${t}`));
 		} catch (e) {
 			let r = `/send/bitcoin/${t}`;
 			if (amount) r += '/' + amount;
 			throw redirect(307, r);
 		}
 
-		if (id) throw redirect(307, `/send/${id}`);
+    if (user) throw redirect(307, `/send/${user.username}`);
+    else if (id) throw redirect(307, `/send/${id}`);
 	}
 
 	// user
-- 
cgit v1.2.3


From 3403bf5c6090109725493b4c7a4fef28266beda8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 19:57:47 -0800
Subject: messages on dashboard

---
 src/components/Balance.svelte                      |   2 +-
 src/lib/nostr.js                                   |   3 +-
 .../(app)/[username]/(profile)/+page.server.js     |  23 ++-
 src/routes/(app)/[username]/(profile)/+page.svelte | 191 +++++++++++++++------
 .../[username]/settings/[...tab]/+page.server.js   |   1 +
 src/routes/(app)/buy/+page.server.js               |  19 ++
 src/routes/(app)/buy/+page.svelte                  | 126 ++++++++++++++
 .../(app)/send/lightning/[payreq]/+page.svelte     |   2 +-
 8 files changed, 306 insertions(+), 61 deletions(-)
 create mode 100644 src/routes/(app)/buy/+page.server.js
 create mode 100644 src/routes/(app)/buy/+page.svelte

(limited to 'src')

diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index e95e5dde..5d993c28 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -9,7 +9,7 @@
 <div class="space-y-2">
 	<div class="text-5xl font-bold tabular-nums">
 		{#if isNaN($animatedRate)}
-			<div class="text-gray-200">---</div>
+      <div class="text-gray-200">&mdash;</div>
 		{:else}
 			{f((user.balance * $animatedRate) / sats, user.currency)}
 		{/if}
diff --git a/src/lib/nostr.js b/src/lib/nostr.js
index de19b477..13251856 100644
--- a/src/lib/nostr.js
+++ b/src/lib/nostr.js
@@ -80,7 +80,7 @@ export let decrypt = async ({ event, user }) => {
 
 		return Buffer.from(message).toString('utf8');
 	} catch (e) {
-		console.log(e);
+		// console.log(e);
 	}
 };
 
@@ -119,6 +119,7 @@ let getPrivateKey = async (user) => {
 	seed = mnemonicToSeedSync(mnemonic);
 	key = bip32.fromSeed(seed);
 	child = key.derivePath("m/44'/1237'/0'/0/0");
+
 	return child.privateKey;
 };
 
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index c68cfecc..d1fa2f41 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -1,22 +1,33 @@
 import { auth, get } from '$lib/utils';
 
 export async function load({ cookies, params, parent, url }) {
-	let { subject } = await parent();
+	let { user, subject } = await parent();
 	let { pubkey } = subject;
+	let { since = 0 } = params;
 
-	let events = [];
+	let messages = [];
+
+	if (user) {
+		try {
+			messages = await get(`/${user.pubkey}/${since}/messages`);
+		} catch (e) {
+			console.log(`failed to fetch nostr messages`, e);
+		}
+	}
+
+	let notes = [];
 
 	try {
-		events = await get(`/${pubkey}/notes`);
+		notes = await get(`/${pubkey}/notes`);
 	} catch (e) {
-		console.log(`failed to fetch nostr events for ${pubkey}`, e);
+		console.log(`failed to fetch nostr notes for ${pubkey}`, e);
 	}
 
-	events.map((e) => {
+	notes.map((e) => {
 		e.seen = e.created_at;
 	});
 
 	let { invoices, sent, received } = await get('/requests', auth(cookies));
 
-	return { invoices, events, sent, received };
+	return { invoices, messages, notes, sent, received };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index c704c00d..45fe1d84 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -1,75 +1,162 @@
 <script>
-	import { Avatar, Balance, Feed } from '$comp';
+	import { onMount } from 'svelte';
+	import { Icon, Avatar, Balance, Feed } from '$comp';
 	import { t } from '$lib/translations';
 	import { f, sat, sats } from '$lib/utils';
+	import { sign, send, encrypt, decrypt } from '$lib/nostr';
+	import { browser } from '$app/environment';
 
 	export let data;
-	let { events, invoices, sent, received, subject, user } = data;
+	let { messages, notes, invoices, sent, received, subject, user } = data;
+
+	let keys = new Set();
+	let latest = [];
+	let i = 0;
+
+	onMount(async () => {
+		if (!browser) return;
+		while (latest.length < 3 && i < messages.length) {
+			let event = messages[i];
+			let { pubkey: k } = event.user;
+			if (k !== user.pubkey && !keys.has(k)) {
+				keys.add(k);
+				event.content = await decrypt({ event, user });
+				if (event.content) latest.push(event);
+			}
+			i++;
+		}
+
+		latest = latest;
+	});
 </script>
 
-<div class="flex justify-center lg:justify-start">
+<div class="space-y-8">
 	{#if user?.id === subject.id}
-		<Balance {user} />
-	{/if}
-</div>
+		<div>
+			{#if user.balance > 0 && false}
+				<h1 class="text-secondary text-xl">Balance</h1>
+				<div class="flex justify-center lg:justify-start">
+					<Balance {user} />
+				</div>
+			{:else}
+				<div class="space-y-3">
+					<h1 class="text-2xl">Welcome</h1>
+
+					<p class="text-secondary">
+						Get started by making a deposit or getting someone to pay you in Bitcoin!
+					</p>
 
-<div>
-	{#each invoices as { amount, currency, rate, request: { requester, recipient }, hash }}
-		{@const requested = user.username === requester?.username}
-		<a href={`/${recipient.username}/invoice/${hash}` + (requested ? '/tip' : '')}>
-			<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
-				<div class="flex gap-2">
-					<div>
-						{#if requested}
-							<div class="flex">
-								<Avatar user={recipient} size={20} />
-								<div class="my-auto text-left">
-									<p class="text-secondary">{$t('payments.invoiceFrom')}</p>
-									<p class="ml-1 text-lg break-words">{recipient.username}</p>
+					<div class="flex gap-4 justify-center w-full">
+						<a href={`/${user.username}/receive`}>
+							<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
+								<div class="mx-auto flex">
+									<Icon icon="numpad" style="my-auto h-6 mr-2" />
+									<div class="my-auto mt-1">Receive a Payment</div>
 								</div>
+							</button>
+						</a>
+
+						<!-- <a href={`/buy`}> -->
+						<!-- 	<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> -->
+						<!-- 		<div class="mx-auto flex"> -->
+						<!-- 			<Icon icon="plus" style="my-auto h-6 mr-2" /> -->
+						<!-- 			<div class="my-auto mt-1">Buy Bitcoin</div> -->
+						<!-- 		</div> -->
+						<!-- 	</button> -->
+						<!-- </a> -->
+					</div>
+				</div>
+			{/if}
+		</div>
+	{/if}
+
+	{#if invoices.length}
+		<div>
+			<h1 class="text-secondary text-xl">Invoices</h1>
+			{#each invoices as { amount, currency, rate, request: { requester, recipient }, hash }}
+				{@const requested = user.username === requester?.username}
+				<a href={`/${recipient.username}/invoice/${hash}` + (requested ? '/tip' : '')}>
+					<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
+						<div class="flex gap-2">
+							<div>
+								{#if requested}
+									<div class="flex">
+										<Avatar user={recipient} size={20} />
+										<div class="my-auto text-left">
+											<p class="text-secondary">{$t('payments.invoiceFrom')}</p>
+											<p class="ml-1 text-lg break-words">{recipient.username}</p>
+										</div>
+									</div>
+								{:else}
+									<div class="flex">
+										<Avatar user={requester} size={20} />
+										<div class="my-auto text-left">
+											<p class="text-secondary">{$t('payments.awaiting')}</p>
+											<p class="ml-1 text-lg break-words">{requester.username}</p>
+										</div>
+									</div>
+								{/if}
 							</div>
-						{:else}
-							<div class="flex">
-								<Avatar user={requester} size={20} />
-								<div class="my-auto text-left">
-									<p class="text-secondary">{$t('payments.awaiting')}</p>
-									<p class="ml-1 text-lg break-words">{requester.username}</p>
+							<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+								<div class="font-bold">
+									{f(amount * (rate / sats), currency)}
 								</div>
+
+								<div class="text-secondary">{sat(amount)}</div>
 							</div>
-						{/if}
-					</div>
-					<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
-						<div class="font-bold">
-							{f(amount * (rate / sats), currency)}
 						</div>
-
-						<div class="text-secondary">{sat(amount)}</div>
 					</div>
-				</div>
-			</div>
-		</a>
-	{/each}
+				</a>
+			{/each}
+		</div>
+	{/if}
+	{#if received.length}
+		<div>
+			<h1 class="text-secondary text-xl">Requests</h1>
 
-	{#each received as { id, invoice, memo, requester: r }}
-		<a href={`/${user.username}/receive/${id}`}>
-			<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
-				<div class="flex">
-					<div>
+			{#each received as { id, invoice, memo, requester: r }}
+				<a href={`/${user.username}/receive/${id}`}>
+					<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
 						<div class="flex">
-							<Avatar user={r} size={20} />
-							<div class="my-auto text-left">
-								<p class="ml-1 text-lg break-words">{r.username}</p>
-								<p class="ml-1 text-secondary">{memo}</p>
+							<div>
+								<div class="flex">
+									<Avatar user={r} size={20} />
+									<div class="my-auto text-left">
+										<p class="ml-1 text-lg break-words">{r.username}</p>
+										<p class="ml-1 text-secondary">{memo}</p>
+									</div>
+								</div>
+							</div>
+							<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+								<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
+									>Invoice</button
+								>
 							</div>
 						</div>
 					</div>
-					<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
-						<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
-							>Invoice</button
-						>
+				</a>
+			{/each}
+		</div>
+	{/if}
+
+	{#if latest.length}
+		<div>
+			<h1 class="text-2xl">Messages</h1>
+			{#each latest as { content, user }}
+				<div class="flex">
+					<div class="my-auto">
+						<Avatar {user} size={12} disabled={true} />
 					</div>
+					<div class="my-auto ml-1 text-secondary">{user.username}</div>
+					{content}
 				</div>
-			</div>
-		</a>
-	{/each}
+			{/each}
+		</div>
+	{/if}
 </div>
+
+<style>
+	h1 {
+		@apply mb-2;
+	}
+</style>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index dd16459f..94240adc 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -9,6 +9,7 @@ export function load({ params, url }) {
 export const actions = {
 	default: async ({ cookies, request }) => {
 		let form = Object.fromEntries(await request.formData());
+    form.prompt = form.prompt === 'on'
 		let user = { ...(await get('/me', auth(cookies))), ...form };
 
 		try {
diff --git a/src/routes/(app)/buy/+page.server.js b/src/routes/(app)/buy/+page.server.js
new file mode 100644
index 00000000..e03d6c0a
--- /dev/null
+++ b/src/routes/(app)/buy/+page.server.js
@@ -0,0 +1,19 @@
+import { env } from '$env/dynamic/private';
+import { error, redirect } from '@sveltejs/kit';
+import { post, auth } from '$lib/utils';
+import { createTicket } from '$lib/ticket';
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let form = await request.formData();
+
+		await post('/buy', {
+			number: form.get('number').replace(/\s+/g, ''),
+			month: form.get('expiry').slice(0, 2),
+			year: form.get('expiry').slice(-2),
+			cvc: form.get('cvc')
+		}, auth(cookies));
+
+		throw redirect(307, `/launch/thanks/${asset}`);
+	}
+};
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
new file mode 100644
index 00000000..34cfc2e5
--- /dev/null
+++ b/src/routes/(app)/buy/+page.svelte
@@ -0,0 +1,126 @@
+<script>
+	import { enhance } from '$app/forms';
+	import { Icon, Lock, Card, Calendar, Spinner } from '$comp';
+
+	export let data;
+
+	let { username } = data.user;
+	let loading;
+
+  let amount = 100;
+	let n = '4242 4242 4242 4242';
+	let d = '10/25';
+	let cvc = 444;
+</script>
+
+<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
+	<div class="w-full flex">
+		<a href="/" class="mx-auto">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex justify-center items-center text-center">
+		<div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
+			<div class="relative">
+				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
+				<h1 class="text-2xl md:text-3xl font-semibold">Buy Bitcoin</h1>
+			</div>
+			<p class="text-secondary">Purchase up to $500 worth of Bitcoin from us.</p>
+
+			<p class="text-secondary">
+				If you want more, try <a href="https://www.kraken.com/" target="_blank" class="text-black"
+					>Kraken</a
+				>
+				or
+				<a href="https://shakepay.com/" target="_blank" class="text-black">ShakePay</a> or ask
+				around at our next
+				<a href="https://www.meetup.com/vancouver-bitcoiners" target="_blank" class="text-black"
+					>meetup</a
+				>.
+			</p>
+
+			<form
+				method="POST"
+				class="flex flex-wrap gap-5 w-full p-5 mt-20"
+				use:enhance={() => {
+					loading = true;
+					return ({ update }) => update() && (loading = false);
+				}}
+			>
+				<input type="hidden" name="username" value={username} />
+
+				<label class="relative w-full flex flex-col">
+					<span class="font-bold mb-3">Amount</span>
+					<input
+						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+						type="text"
+						name="number"
+						placeholder="500"
+						bind:value={amount}
+					/>
+					<span class="absolute text-gray-300 bottom-[9px] left-0 translate-x-1/2 w-6">$</span>
+				</label>
+
+				<label class="relative w-full flex flex-col">
+					<span class="font-bold mb-3">Card number</span>
+					<input
+						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+						type="text"
+						name="number"
+						placeholder="0000 0000 0000 0000"
+						bind:value={n}
+					/>
+					<Card />
+				</label>
+
+				<label class="relative flex-1 flex flex-col">
+					<span class="font-bold mb-3">Expire date</span>
+					<input
+						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+						type="text"
+						name="expiry"
+						placeholder="MM/YY"
+						bind:value={d}
+					/>
+					<Calendar />
+				</label>
+
+				<label class="relative flex-1 flex flex-col">
+					<span class="font-bold flex items-center gap-3 mb-3">
+						CVC/CVV
+						<span class="relative group">
+							<span
+								class="hidden group-hover:flex justify-center items-center px-2 py-1 text-xs absolute -right-2 transform translate-x-full -translate-y-1/2 w-max top-1/2 bg-black text-white"
+							>
+								3-digit number on the back of your card</span
+							>
+						</span>
+					</span>
+					<input
+						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+						type="text"
+						name="cvc"
+						placeholder="&bull;&bull;&bull;"
+						bind:value={cvc}
+					/>
+					<Lock />
+				</label>
+
+				<div class="w-full flex mt-8">
+					<button
+						class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-xl"
+						type="submit"
+						disabled={loading}
+					>
+						{#if loading}
+							<Spinner />
+						{:else}
+							Submit
+						{/if}
+					</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index 6ae699d2..e9502636 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -89,7 +89,7 @@
 			</div>
 		{/if}
 	{:else}
-		<form method="POST" action="?/setAmount" class="w-[300px] mx-auto">
+		<form method="POST" action="?/setAmount" class="w-[300px] mx-auto" use:enhance>
 			<input type="hidden" value={a} name="amount" />
 			<Numpad bind:amount={a} {currency} />
 			<button
-- 
cgit v1.2.3


From 1a0c13901aad3d7875d80354f6fa9d002780fd4d Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 20:10:39 -0800
Subject: cafe claimed

---
 src/routes/(static)/bounties/+page.svelte | 33 +++++++++++++------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/routes/(static)/bounties/+page.svelte b/src/routes/(static)/bounties/+page.svelte
index 140b9c16..843ef1d2 100644
--- a/src/routes/(static)/bounties/+page.svelte
+++ b/src/routes/(static)/bounties/+page.svelte
@@ -1,27 +1,27 @@
 <div class="space-y-5">
-	<h1 class="text-3xl mb-6 pt-20">Bounties</h1>
+	<h1 class="text-3xl mb-6 pt-28 md:pt-12">Bounties</h1>
 
-	<p class="text-secondary">
+	<p>
 		We're offering <b>⚡️1,000,000</b> to the first <b>10 people</b> that help us onboard businesses
 		in the following categories to take bitcoin payments:
 	</p>
 
-	<ul class="text-xl ml-20">
-		<li>Grocery or Produce Store</li>
-		<li>Cafe</li>
+	<ul>
+		<li>Grocery / Produce Store</li>
+    <li>Cafe &mdash; Claimed by <a href="/reverendhodl">ReverendHodl</a> for <a href="https://btcmap.org/map?lat=49.2814113&long=-123.049572">Laughing Bean Coffee Co.</a>!</li>
 		<li>Bakery</li>
 		<li>Butcher Shop</li>
-		<li>Laundromat or Dry Cleaner</li>
-		<li>Dollar Store, Book Store, or Gift Shop</li>
+		<li>Laundromat / Dry Cleaner</li>
+		<li>Dollar Store / Book Store / Gift Shop</li>
 		<li>Sushi Restaurant</li>
-		<li>Pizza by the Slice Joint</li>
-		<li>Liquor Store or Gas Station</li>
-		<li>Bubble Tea or Ice Cream Parlour</li>
+		<li>Pizza by the Slice</li>
+		<li>Liquor Store / Gas Station</li>
+		<li>Bubble Tea / Ice Cream Parlour</li>
 	</ul>
 
-	<h2 class="text-2xl">Terms and Conditions</h2>
+	<h2 class="text-xl">Terms and Conditions</h2>
 
-	<ul class="ml-20">
+	<ul>
 		<li>The business must have a physical location that takes walk-in customers</li>
 		<li>
 			They must be located within Vancouver, North Vancouver, West Vancouver, Burnaby, New
@@ -61,7 +61,7 @@
 		applicants without cause
 	</p>
 
-	<h2 class="text-2xl">Ready to begin!?</h2>
+	<h2 class="text-xl">Ready to begin!?</h2>
 
 	<p>
 		To make a referral, reach out on one of our socials or email us at <a
@@ -79,10 +79,5 @@
 </div>
 
 <style>
-	p {
-		@apply text-secondary;
-	}
-	b {
-		@apply text-black text-xl;
-	}
+  a { @apply font-bold; }
 </style>
-- 
cgit v1.2.3


From 0c6ca339de58a35e9d0a808b9d65e238205b5fb3 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 20:12:33 -0800
Subject: fix homepage

---
 src/routes/(app)/[username]/(profile)/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 45fe1d84..7d231321 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -33,7 +33,7 @@
 <div class="space-y-8">
 	{#if user?.id === subject.id}
 		<div>
-			{#if user.balance > 0 && false}
+			{#if user.balance > 0}
 				<h1 class="text-secondary text-xl">Balance</h1>
 				<div class="flex justify-center lg:justify-start">
 					<Balance {user} />
-- 
cgit v1.2.3


From 2f33da23a44773fb1728bd2405abf2faae33bea8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 22:46:54 -0800
Subject: error page

---
 src/routes/(app)/+error.svelte | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/routes/(app)/+error.svelte

(limited to 'src')

diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte
new file mode 100644
index 00000000..0851cb27
--- /dev/null
+++ b/src/routes/(app)/+error.svelte
@@ -0,0 +1,38 @@
+<script>
+	import { back } from '$lib/utils';
+	import { Icon } from '$comp';
+  import { page } from '$app/stores';
+
+	export let data;
+	let { user } = data;
+
+	let link = user ? `/${user.username}` : '/';
+</script>
+
+<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
+	<div class="w-full flex">
+		<a href="/" class="mx-auto">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex justify-center items-center">
+		<div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
+			<div class="relative">
+				<h1 class="text-2xl md:text-3xl font-semibold text-center">Error</h1>
+			</div>
+			<p class="text-secondary text-center">Something went wrong</p>
+      <p class="text-secondary text-center">{$page.error.message}</p>
+
+			<div class="flex justify-center py-24">
+				<a href={link}>
+					<button
+						class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-xl"
+					>
+						Back
+					</button>
+				</a>
+			</div>
+		</div>
+	</div>
+</div>
-- 
cgit v1.2.3


From af598ffa4432706fd518c2fedd6b685f52fd1ae1 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 22:47:27 -0800
Subject: buy page

---
 src/routes/(app)/buy/+page.server.js | 24 +++++++++++++++--------
 src/routes/(app)/buy/+page.svelte    | 37 ++++++++++++++----------------------
 2 files changed, 30 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/buy/+page.server.js b/src/routes/(app)/buy/+page.server.js
index e03d6c0a..8a88ed4e 100644
--- a/src/routes/(app)/buy/+page.server.js
+++ b/src/routes/(app)/buy/+page.server.js
@@ -1,5 +1,5 @@
 import { env } from '$env/dynamic/private';
-import { error, redirect } from '@sveltejs/kit';
+import { error, fail, redirect } from '@sveltejs/kit';
 import { post, auth } from '$lib/utils';
 import { createTicket } from '$lib/ticket';
 
@@ -7,13 +7,21 @@ export const actions = {
 	default: async ({ cookies, request }) => {
 		let form = await request.formData();
 
-		await post('/buy', {
-			number: form.get('number').replace(/\s+/g, ''),
-			month: form.get('expiry').slice(0, 2),
-			year: form.get('expiry').slice(-2),
-			cvc: form.get('cvc')
-		}, auth(cookies));
+		let amount = parseFloat(form.get('amount'));
+		if (!amount || amount < 0 || amount > 500) return fail(400, { message: 'Invalid amount' });
 
-		throw redirect(307, `/launch/thanks/${asset}`);
+		await post(
+			'/buy',
+			{
+        amount: form.get('amount'),
+				number: form.get('number').replace(/\s+/g, ''),
+				month: form.get('expiry').slice(0, 2),
+				year: form.get('expiry').slice(-2),
+				cvc: form.get('cvc')
+			},
+			auth(cookies)
+		);
+
+		throw redirect(307, `/${form.get('username')}/payments`);
 	}
 };
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 34cfc2e5..ed803110 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -2,15 +2,12 @@
 	import { enhance } from '$app/forms';
 	import { Icon, Lock, Card, Calendar, Spinner } from '$comp';
 
-	export let data;
+	export let data, form;
 
 	let { username } = data.user;
 	let loading;
 
-  let amount = 100;
-	let n = '4242 4242 4242 4242';
-	let d = '10/25';
-	let cvc = 444;
+  let amount, n, d, cvc;
 </script>
 
 <div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
@@ -20,25 +17,18 @@
 		</a>
 	</div>
 
-	<div class="flex justify-center items-center text-center">
+	<div class="flex justify-center items-center">
 		<div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
 			<div class="relative">
-				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
-				<h1 class="text-2xl md:text-3xl font-semibold">Buy Bitcoin</h1>
+				<h1 class="text-2xl md:text-3xl font-semibold text-center">Buy Bitcoin</h1>
 			</div>
-			<p class="text-secondary">Purchase up to $500 worth of Bitcoin from us.</p>
+			<p class="text-secondary text-center">Purchase up to $500 worth of Bitcoin</p>
 
-			<p class="text-secondary">
-				If you want more, try <a href="https://www.kraken.com/" target="_blank" class="text-black"
-					>Kraken</a
-				>
-				or
-				<a href="https://shakepay.com/" target="_blank" class="text-black">ShakePay</a> or ask
-				around at our next
-				<a href="https://www.meetup.com/vancouver-bitcoiners" target="_blank" class="text-black"
-					>meetup</a
-				>.
-			</p>
+			{#if form?.message}
+				<div class="text-red-600 text-center">
+					{form.message}
+				</div>
+			{/if}
 
 			<form
 				method="POST"
@@ -55,11 +45,12 @@
 					<input
 						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
 						type="text"
-						name="number"
-						placeholder="500"
+						name="amount"
+						placeholder="&bull;&bull;&bull;"
 						bind:value={amount}
 					/>
-					<span class="absolute text-gray-300 bottom-[9px] left-0 translate-x-1/2 w-6">$</span>
+          <span class="absolute bottom-[9px] left-0 translate-x-1/2 w-6 text-black peer-placeholder-shown:text-gray-300 
+          ">$</span>
 				</label>
 
 				<label class="relative w-full flex flex-col">
-- 
cgit v1.2.3


From 808d5706bf59636deb49011a00ea0f4846ea7592 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 22:47:36 -0800
Subject: payment page

---
 src/routes/(app)/[username]/(profile)/+page.svelte |  1 -
 src/routes/(app)/payment/[id]/+page.svelte         | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 7d231321..0421782c 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -34,7 +34,6 @@
 	{#if user?.id === subject.id}
 		<div>
 			{#if user.balance > 0}
-				<h1 class="text-secondary text-xl">Balance</h1>
 				<div class="flex justify-center lg:justify-start">
 					<Balance {user} />
 				</div>
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 7b2bdb26..8125c63c 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -9,8 +9,9 @@
 	let { user, payment: p } = data;
 	let { username } = user;
 	let { id, amount, created, rate, type, ref, ourfee, fee, currency } = p;
+	let a = Math.abs(amount);
+
 	fee = fee || 0;
-	amount = Math.abs(amount);
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
@@ -23,19 +24,22 @@
 	</h1>
 
 	{#if p.with}
-		<div class="flex justify-center">
-			<div class="my-auto">
-				<Avatar user={p.with} />
+		<div>
+			<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
+			<div class="flex">
+				<div class="my-auto">
+					<Avatar user={p.with} />
+				</div>
+				<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
 			</div>
-			<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
 		</div>
 	{/if}
 
 	<div>
 		<span class="text-lg text-secondary">Amount</span>
 		<div>
-			{f(fiat(amount, rate), currency)}
-			<span class="text-secondary">⚡️{`${s(amount)}`}</span>
+			{f(fiat(a, rate), currency)}
+			<span class="text-secondary">⚡️{`${s(a)}`}</span>
 		</div>
 	</div>
 
-- 
cgit v1.2.3


From 933495c2e42a59dc309131affc6ee4ef0ec2f567 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 22:47:48 -0800
Subject: prettier

---
 src/components/Balance.svelte                                 | 2 +-
 src/routes/(app)/+error.svelte                                | 4 ++--
 src/routes/(app)/[username]/settings/[...tab]/+page.server.js | 2 +-
 src/routes/(app)/buy/+page.server.js                          | 2 +-
 src/routes/(app)/buy/+page.svelte                             | 8 +++++---
 src/routes/(app)/send/[...text]/+page.server.js               | 4 ++--
 src/routes/(static)/bounties/+page.svelte                     | 9 +++++++--
 7 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index 5d993c28..cc923b7d 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -9,7 +9,7 @@
 <div class="space-y-2">
 	<div class="text-5xl font-bold tabular-nums">
 		{#if isNaN($animatedRate)}
-      <div class="text-gray-200">&mdash;</div>
+			<div class="text-gray-200">&mdash;</div>
 		{:else}
 			{f((user.balance * $animatedRate) / sats, user.currency)}
 		{/if}
diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte
index 0851cb27..36726e26 100644
--- a/src/routes/(app)/+error.svelte
+++ b/src/routes/(app)/+error.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { back } from '$lib/utils';
 	import { Icon } from '$comp';
-  import { page } from '$app/stores';
+	import { page } from '$app/stores';
 
 	export let data;
 	let { user } = data;
@@ -22,7 +22,7 @@
 				<h1 class="text-2xl md:text-3xl font-semibold text-center">Error</h1>
 			</div>
 			<p class="text-secondary text-center">Something went wrong</p>
-      <p class="text-secondary text-center">{$page.error.message}</p>
+			<p class="text-secondary text-center">{$page.error.message}</p>
 
 			<div class="flex justify-center py-24">
 				<a href={link}>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index 94240adc..e833a102 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -9,7 +9,7 @@ export function load({ params, url }) {
 export const actions = {
 	default: async ({ cookies, request }) => {
 		let form = Object.fromEntries(await request.formData());
-    form.prompt = form.prompt === 'on'
+		form.prompt = form.prompt === 'on';
 		let user = { ...(await get('/me', auth(cookies))), ...form };
 
 		try {
diff --git a/src/routes/(app)/buy/+page.server.js b/src/routes/(app)/buy/+page.server.js
index 8a88ed4e..fc7ae473 100644
--- a/src/routes/(app)/buy/+page.server.js
+++ b/src/routes/(app)/buy/+page.server.js
@@ -13,7 +13,7 @@ export const actions = {
 		await post(
 			'/buy',
 			{
-        amount: form.get('amount'),
+				amount: form.get('amount'),
 				number: form.get('number').replace(/\s+/g, ''),
 				month: form.get('expiry').slice(0, 2),
 				year: form.get('expiry').slice(-2),
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index ed803110..323d5ef0 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -7,7 +7,7 @@
 	let { username } = data.user;
 	let loading;
 
-  let amount, n, d, cvc;
+	let amount, n, d, cvc;
 </script>
 
 <div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
@@ -49,8 +49,10 @@
 						placeholder="&bull;&bull;&bull;"
 						bind:value={amount}
 					/>
-          <span class="absolute bottom-[9px] left-0 translate-x-1/2 w-6 text-black peer-placeholder-shown:text-gray-300 
-          ">$</span>
+					<span
+						class="absolute bottom-[9px] left-0 translate-x-1/2 w-6 text-black peer-placeholder-shown:text-gray-300 
+          ">$</span
+					>
 				</label>
 
 				<label class="relative w-full flex flex-col">
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index b1089a5b..9c7d4185 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -52,8 +52,8 @@ let parse = async (t, host) => {
 			throw redirect(307, r);
 		}
 
-    if (user) throw redirect(307, `/send/${user.username}`);
-    else if (id) throw redirect(307, `/send/${id}`);
+		if (user) throw redirect(307, `/send/${user.username}`);
+		else if (id) throw redirect(307, `/send/${id}`);
 	}
 
 	// user
diff --git a/src/routes/(static)/bounties/+page.svelte b/src/routes/(static)/bounties/+page.svelte
index 843ef1d2..17fa5b7b 100644
--- a/src/routes/(static)/bounties/+page.svelte
+++ b/src/routes/(static)/bounties/+page.svelte
@@ -8,7 +8,10 @@
 
 	<ul>
 		<li>Grocery / Produce Store</li>
-    <li>Cafe &mdash; Claimed by <a href="/reverendhodl">ReverendHodl</a> for <a href="https://btcmap.org/map?lat=49.2814113&long=-123.049572">Laughing Bean Coffee Co.</a>!</li>
+		<li>
+			Cafe &mdash; Claimed by <a href="/reverendhodl">ReverendHodl</a> for
+			<a href="https://btcmap.org/map?lat=49.2814113&long=-123.049572">Laughing Bean Coffee Co.</a>!
+		</li>
 		<li>Bakery</li>
 		<li>Butcher Shop</li>
 		<li>Laundromat / Dry Cleaner</li>
@@ -79,5 +82,7 @@
 </div>
 
 <style>
-  a { @apply font-bold; }
+	a {
+		@apply font-bold;
+	}
 </style>
-- 
cgit v1.2.3


From c3968431bbdf534e2698256d8e8aa6f475275fff Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Feb 2023 22:50:51 -0800
Subject: no bang

---
 src/routes/(static)/bounties/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(static)/bounties/+page.svelte b/src/routes/(static)/bounties/+page.svelte
index 17fa5b7b..d53a8edc 100644
--- a/src/routes/(static)/bounties/+page.svelte
+++ b/src/routes/(static)/bounties/+page.svelte
@@ -10,7 +10,7 @@
 		<li>Grocery / Produce Store</li>
 		<li>
 			Cafe &mdash; Claimed by <a href="/reverendhodl">ReverendHodl</a> for
-			<a href="https://btcmap.org/map?lat=49.2814113&long=-123.049572">Laughing Bean Coffee Co.</a>!
+			<a href="https://btcmap.org/map?lat=49.2814113&long=-123.049572">Laughing Bean Coffee Co.</a>
 		</li>
 		<li>Bakery</li>
 		<li>Butcher Shop</li>
-- 
cgit v1.2.3


From a97c7a00ebb414b7ff7731e6bf3640f2f476aae3 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Feb 2023 22:43:27 -0800
Subject: messages

---
 package.json                                       |   1 +
 pnpm-lock.yaml                                     |  11 ++
 src/components/About.svelte                        |  13 ---
 src/lib/nostr.js                                   |  11 +-
 src/lib/socket.js                                  |  27 +----
 src/lib/store.js                                   |   3 +-
 src/locales/en.json                                |  13 +--
 src/routes/(app)/+layout.svelte                    |   2 +-
 .../(app)/[username]/(profile)/+layout.svelte      |   2 +-
 .../(app)/[username]/(profile)/+page.server.js     |   1 +
 src/routes/(app)/[username]/(profile)/+page.svelte |  80 +++++++------
 .../[username]/(profile)/messages/+page.server.js  |  16 ---
 .../[username]/(profile)/messages/+page.svelte     | 123 --------------------
 .../(app)/[username]/invoice/[hash]/+page.svelte   |   4 +-
 .../(app)/[username]/messages/+page.server.js      |  19 ++++
 src/routes/(app)/[username]/messages/+page.svelte  | 126 +++++++++++++++++++++
 .../[username]/payments/[...page]/+page.svelte     |   2 +-
 src/routes/(app)/buy/+page.svelte                  |  33 +++++-
 src/routes/(app)/login/+page.svelte                |   1 -
 src/routes/(app)/payment/[id]/+page.svelte         |  16 +--
 tailwind.config.cjs                                |   3 +-
 21 files changed, 261 insertions(+), 246 deletions(-)
 delete mode 100644 src/routes/(app)/[username]/(profile)/messages/+page.server.js
 delete mode 100644 src/routes/(app)/[username]/(profile)/messages/+page.svelte
 create mode 100644 src/routes/(app)/[username]/messages/+page.server.js
 create mode 100644 src/routes/(app)/[username]/messages/+page.svelte

(limited to 'src')

diff --git a/package.json b/package.json
index 908ec0bf..ac67d8b3 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
 		"svelte-preprocess": "^4.10.7",
 		"svelte-virtual-scroll-list": "^1.1.0",
 		"sveltekit-i18n": "^2.2.2",
+		"tailwind-scrollbar": "^2.1.0",
 		"tailwindcss": "^3.2.4",
 		"tiny-secp256k1": "^2.2.1",
 		"uuid": "^9.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4f0d2ef2..3fe87f18 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,6 +29,7 @@ specifiers:
   svelte-preprocess: ^4.10.7
   svelte-virtual-scroll-list: ^1.1.0
   sveltekit-i18n: ^2.2.2
+  tailwind-scrollbar: ^2.1.0
   tailwindcss: ^3.2.4
   tiny-secp256k1: ^2.2.1
   uuid: ^9.0.0
@@ -68,6 +69,7 @@ devDependencies:
   svelte-preprocess: 4.10.7_qs7rgzvahok4cbkjoy5bgypde4
   svelte-virtual-scroll-list: 1.1.0_svelte@3.55.0
   sveltekit-i18n: 2.2.2_svelte@3.55.0
+  tailwind-scrollbar: 2.1.0_tailwindcss@3.2.4
   tailwindcss: 3.2.4_postcss@8.4.20
   tiny-secp256k1: 2.2.1
   uuid: 9.0.0
@@ -2477,6 +2479,15 @@ packages:
       svelte: 3.55.0
     dev: true
 
+  /tailwind-scrollbar/2.1.0_tailwindcss@3.2.4:
+    resolution: {integrity: sha512-zpvY5mDs0130YzYjZKBiDaw32rygxk5RyJ4KmeHjGnwkvbjm/PszON1m4Bbt2DkMRIXlXsfNevykAESgURN4KA==}
+    engines: {node: '>=12.13.0'}
+    peerDependencies:
+      tailwindcss: 3.x
+    dependencies:
+      tailwindcss: 3.2.4_postcss@8.4.20
+    dev: true
+
   /tailwindcss/3.2.4_postcss@8.4.20:
     resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==}
     engines: {node: '>=12.13.0'}
diff --git a/src/components/About.svelte b/src/components/About.svelte
index d51b9268..0a0ff874 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -17,19 +17,6 @@
 			name: 'john',
 			socials: []
 		},
-		{
-			name: 'karnage',
-			socials: [
-				{ type: 'twitter', url: 'https://twitter.com/KarnageBitcoin', color: 'bg-[#1D9BF0]' }
-			]
-		},
-		{
-			name: 'secondl1ght',
-			socials: [
-				{ type: 'twitter', url: 'https://www.twitter.com/secondl1ght', color: 'bg-[#1D9BF0]' },
-				{ type: 'github', url: 'https://github.com/secondl1ght', color: 'bg-gray-800' }
-			]
-		},
 		{
 			name: 'shauna',
 			socials: [
diff --git a/src/lib/nostr.js b/src/lib/nostr.js
index 13251856..d72f48ef 100644
--- a/src/lib/nostr.js
+++ b/src/lib/nostr.js
@@ -5,7 +5,7 @@ import { Buffer } from 'buffer';
 import { bech32m } from 'bech32';
 import { bip32, fail, wait, post, stretch } from '$lib/utils';
 import { calculateId, signId } from 'nostr';
-import { password as pw, passwordPrompt, pin, loginRedirect } from '$lib/store';
+import { decrypted, password as pw, passwordPrompt, pin, loginRedirect } from '$lib/store';
 import { goto, invalidate } from '$app/navigation';
 
 const { encode, decode, fromWords, toWords } = bech32m;
@@ -58,8 +58,10 @@ export let encrypt = async ({ message, recipient, user }) => {
 };
 
 export let decrypt = async ({ event, user }) => {
+	let cache = get(decrypted);
 	try {
-		let { content, pubkey } = event;
+		let { content, pubkey, id } = event;
+		if (cache[id]) return cache[id];
 		if (pubkey === user.pubkey) pubkey = event.tags[0][1];
 		pubkey = Uint8Array.from(Buffer.from('02' + pubkey, 'hex'));
 
@@ -78,7 +80,10 @@ export let decrypt = async ({ event, user }) => {
 
 		let message = await crypto.subtle.decrypt({ name: 'AES-CBC', iv }, key, cipher);
 
-		return Buffer.from(message).toString('utf8');
+		cache[id] = Buffer.from(message).toString('utf8');
+		decrypted.set(cache);
+
+		return cache[id];
 	} catch (e) {
 		// console.log(e);
 	}
diff --git a/src/lib/socket.js b/src/lib/socket.js
index ce3cbe4b..aef8a513 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -1,23 +1,11 @@
 import { get } from 'svelte/store';
-import {
-	events as $events,
-	invoice,
-	request,
-	newPayment,
-	last,
-	rate,
-	payments,
-	user
-} from '$lib/store';
+import { event, invoice, request, newPayment, last, rate, payments, user } from '$lib/store';
 import { success, sat } from '$lib/utils';
 import { PUBLIC_SOCKET } from '$env/static/public';
 import { invalidate } from '$app/navigation';
 import { browser } from '$app/environment';
 
 let socket, token;
-let le = browser && localStorage.getItem('events');
-let events = le && le !== 'undefined' ? JSON.parse(le) : {};
-let q = Object.keys(events);
 
 export const auth = () => token && send('login', token) && send('heartbeat');
 
@@ -30,23 +18,12 @@ export const messages = (data) => ({
 	id() {
 		last.set(Date.now());
 	},
-
 	invoice() {
 		invoice.set(data);
 	},
-
 	event() {
-		data.seen = Math.round(Date.now() / 1000);
-		events[data.id] = data;
-		q.push(data.id);
-		$events.set(events);
-		while (q.length > 10000) delete events[q.shift()];
-		localStorage.setItem(
-			'events',
-			JSON.stringify(q.slice(-100).reduce((a, b) => (a = { ...a, [b]: events[b] }), {}))
-		);
+		event.set(data);
 	},
-
 	rate() {
 		rate.set(data);
 	},
diff --git a/src/lib/store.js b/src/lib/store.js
index 93ac3d47..6853386c 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -36,11 +36,12 @@ export const animatedRate = writable(0);
 export const avatar = writable();
 export const banner = writable();
 export const colorTheme = writable('from-primary to-gradient');
+export const event = writable();
 export const events = writable({});
 export const invoice = writable();
 export const last = writable();
 export const loginRedirect = writable();
-export const messages = persistLocal('messages', {});
+export const decrypted = persistLocal('decrypted', {});
 export const newPayment = persistLocal('newPayment');
 export const password = persistLocal('password');
 export const passwordPrompt = writable();
diff --git a/src/locales/en.json b/src/locales/en.json
index 17f4b34e..402f0214 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -15,17 +15,6 @@
 				"position": "Chief Technical Officer",
 				"bio": "Adam is a web developer and bitcoin enthusiast who believes sound money is key to increasing global prosperity. He lives in North Vancouver with his wife Chelsea and two children."
 			},
-			"secondl1ght": {
-				"name": "secondl1ght",
-				"position": "Web Developer",
-				"bio": "A self-taught Web Developer, secondl1ght dove head first down the bitcoin rabbit hole and left his fiat job to focus on bitcoin development full-time. He contributes to open source projects, is a privacy advocate, and freedom lover."
-			},
-
-			"karnage": {
-				"name": "Karnage",
-				"position": "Product Designer",
-				"bio": "My mission is to help startup founders succeed. I create products to achieve this goal. Pixel-perfect product design. Get it shipped."
-			},
 			"shauna": {
 				"name": "Shauna",
 				"position": "Operations & Marketing",
@@ -297,6 +286,6 @@
 		"redeem": "Redeem",
 		"redeemed": "Redeemed",
 		"redeemedBy": "Redeemed by",
-		"sendMessage": "Message"
+		"sendMessage": "Write a message..."
 	}
 }
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 2a122209..45469bdb 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -58,7 +58,7 @@
 	onDestroy(() => browser && clearTimeout(timer));
 </script>
 
-{#if $passwordPrompt}
+{#if browser && $passwordPrompt}
 	<Password {user} />
 {/if}
 
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index dfa25b78..6eb2a850 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -111,7 +111,7 @@
 				{/if}
 
 				<div class="w-full flex">
-					<a href={`/${subject.pubkey}/messages`} class="mx-auto">
+					<a href={`/${subject.username}/messages`} class="mx-auto">
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
 								<Icon icon="support" style="mr-2 my-auto" />
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index d1fa2f41..2777afdc 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -10,6 +10,7 @@ export async function load({ cookies, params, parent, url }) {
 	if (user) {
 		try {
 			messages = await get(`/${user.pubkey}/${since}/messages`);
+			messages = messages.sort((a, b) => b.created_at - a.created_at);
 		} catch (e) {
 			console.log(`failed to fetch nostr messages`, e);
 		}
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 0421782c..bc19a9df 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -17,8 +17,8 @@
 		if (!browser) return;
 		while (latest.length < 3 && i < messages.length) {
 			let event = messages[i];
-			let { pubkey: k } = event.user;
-			if (k !== user.pubkey && !keys.has(k)) {
+			let k = event.author.id === user.id ? event.recipient.pubkey : event.author.pubkey;
+			if (!keys.has(k)) {
 				keys.add(k);
 				event.content = await decrypt({ event, user });
 				if (event.content) latest.push(event);
@@ -33,36 +33,44 @@
 <div class="space-y-8">
 	{#if user?.id === subject.id}
 		<div>
-			{#if user.balance > 0}
-				<div class="flex justify-center lg:justify-start">
-					<Balance {user} />
-				</div>
-			{:else}
-				<div class="space-y-3">
-					<h1 class="text-2xl">Welcome</h1>
-
-					<p class="text-secondary">
-						Get started by making a deposit or getting someone to pay you in Bitcoin!
+			<div class="flex justify-center lg:justify-start">
+				<Balance {user} />
+			</div>
+			{#if !user.balance}
+				<div class="space-y-8 mt-8">
+					<p class="text-secondary text-lg">
+						Welcome! Your account balance is empty. You can start by making a deposit or by asking
+						someone to pay you.
 					</p>
 
 					<div class="flex gap-4 justify-center w-full">
 						<a href={`/${user.username}/receive`}>
-							<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
+							<button
+								class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white"
+							>
 								<div class="mx-auto flex">
-									<Icon icon="numpad" style="my-auto h-6 mr-2" />
-									<div class="my-auto mt-1">Receive a Payment</div>
+									<Icon icon="numpad" style="my-auto h-6 mr-2 invert" />
+									<div class="my-auto mt-1">Request Payment</div>
 								</div>
 							</button>
 						</a>
 
-						<!-- <a href={`/buy`}> -->
-						<!-- 	<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"> -->
-						<!-- 		<div class="mx-auto flex"> -->
-						<!-- 			<Icon icon="plus" style="my-auto h-6 mr-2" /> -->
-						<!-- 			<div class="my-auto mt-1">Buy Bitcoin</div> -->
-						<!-- 		</div> -->
-						<!-- 	</button> -->
-						<!-- </a> -->
+						{#if user.eligible}
+							<a href={`/buy`}>
+								<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
+									<div class="mx-auto flex">
+										<!-- <Icon icon="plus" style="my-auto h-6 mr-2" /> -->
+
+										<img
+											src="/images/bitcoin.svg"
+											class="w-8 border-4 border-transparent mr-2"
+											alt="Bitcoin"
+										/>
+										<div class="my-auto mt-1">Buy Bitcoin</div>
+									</div>
+								</button>
+							</a>
+						{/if}
 					</div>
 				</div>
 			{/if}
@@ -138,17 +146,23 @@
 		</div>
 	{/if}
 
-	{#if latest.length}
-		<div>
-			<h1 class="text-2xl">Messages</h1>
-			{#each latest as { content, user }}
-				<div class="flex">
-					<div class="my-auto">
-						<Avatar {user} size={12} disabled={true} />
+	{#if latest.length && user.id === subject.id}
+		<div class="relative">
+			{#each latest as { content, pubkey, author, recipient }}
+				{@const user = author.id === user.id ? recipient : author}
+				<a href={`/${user.username}/messages`}>
+					<div class="flex hover:bg-gray-100 p-4 rounded-2xl">
+						<div class="my-auto">
+							<Avatar {user} size={'20'} disabled={true} />
+						</div>
+						<div class="my-auto truncate">
+							<div class="my-auto ml-1 text-lg font-bold">{user.username}</div>
+							<div class="my-auto ml-1 text-secondary text-lg truncate">
+								{content}
+							</div>
+						</div>
 					</div>
-					<div class="my-auto ml-1 text-secondary">{user.username}</div>
-					{content}
-				</div>
+				</a>
 			{/each}
 		</div>
 	{/if}
diff --git a/src/routes/(app)/[username]/(profile)/messages/+page.server.js b/src/routes/(app)/[username]/(profile)/messages/+page.server.js
deleted file mode 100644
index 63116099..00000000
--- a/src/routes/(app)/[username]/(profile)/messages/+page.server.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { get } from '$lib/utils';
-
-export async function load({ params, parent, url }) {
-	let { user, subject } = await parent();
-	let { since = 0 } = params;
-
-	let messages = [];
-
-	try {
-		messages = await get(`/nostr/${user.pubkey}/${subject.pubkey}/${since}/messages`);
-	} catch (e) {
-		console.log(`failed to fetch nostr messages`, e);
-	}
-
-	return { newMessages: messages };
-}
diff --git a/src/routes/(app)/[username]/(profile)/messages/+page.svelte b/src/routes/(app)/[username]/(profile)/messages/+page.svelte
deleted file mode 100644
index db7b1ced..00000000
--- a/src/routes/(app)/[username]/(profile)/messages/+page.svelte
+++ /dev/null
@@ -1,123 +0,0 @@
-<script>
-	import { browser } from '$app/environment';
-	import { t } from '$lib/translations';
-	import { format, parseISO } from 'date-fns';
-	import { scale } from 'svelte/transition';
-	import { enhance } from '$app/forms';
-	import { Icon } from '$comp';
-	import { back, fail, focus } from '$lib/utils';
-	import { sign, send, encrypt, decrypt } from '$lib/nostr';
-	import { messages, password } from '$lib/store';
-	import { tick, onMount } from 'svelte';
-	import { calculateId } from 'nostr';
-
-	export let data;
-
-	let { newMessages, subject, user } = data;
-	let input, pane;
-
-	$: initialize($password);
-	let initialize = async (p) => {
-		if (!p) return;
-		$messages[user.pubkey] = $messages[user.pubkey] || {};
-		$messages[user.pubkey][subject.pubkey] = $messages[user.pubkey][subject.pubkey] || {};
-
-		for (let m of newMessages) {
-			if (!$messages[user.pubkey][subject.pubkey][m.id]) {
-				m.message = await decrypt({ event: m, user });
-				$messages[user.pubkey][subject.pubkey][m.id] = m;
-				tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-			}
-		}
-		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-	};
-
-	$: events =
-		($messages[user.pubkey] &&
-			$messages[user.pubkey][subject.pubkey] &&
-			Object.values($messages[user.pubkey][subject.pubkey]).sort(
-				(a, b) => a.created_at - b.created
-			)) ||
-		[];
-
-	let sent, submitting, message;
-	let submit = async () => {
-		submitting = true;
-
-		let event = {
-			pubkey: user.pubkey,
-			created_at: Math.floor(Date.now() / 1000),
-			kind: 4,
-			tags: [['p', subject.pubkey]]
-		};
-
-		event.message = message;
-		event.id = await calculateId(event);
-		$messages[user.pubkey][subject.pubkey][event.id] = event;
-		$messages = $messages;
-		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-
-		try {
-			event.content = await encrypt({ message, recipient: subject.pubkey, user });
-			await sign({ event, user });
-			await send(event);
-
-			sent = true;
-		} catch (e) {
-			fail('Failed to send message');
-			delete $messages[user.pubkey][subject.pubkey][event.id];
-			$messages = $messages;
-		}
-
-		message = '';
-		submitting = false;
-	};
-</script>
-
-<div class="container max-w-lg px-4 mx-auto mt-10 space-y-5">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('payments.sendMessage')}
-	</h1>
-
-	<div class="max-h-[calc(50vh)] overflow-y-scroll p-4" bind:this={pane}>
-		{#each events as data}
-			{@const ours = data.pubkey === user.pubkey}
-			{@const theirs = !ours}
-			<div class="rounded-2xl p-4 max-w-[300px] mb-1 text-md" class:ours class:theirs>
-				{#if data.message}
-					{data.message}
-				{:else}
-					-
-				{/if}
-			</div>
-			<div class="text-sm text-gray-400 mb-6" class:text-right={ours}>
-				{format(new Date(data.created_at * 1000), 'MMM d')},
-				{format(new Date(data.created_at * 1000), 'h:mm aa')}
-			</div>
-		{/each}
-	</div>
-
-	<form method="POST" class="space-y-5" on:submit|preventDefault={submit}>
-		<input type="hidden" name="requester_id" value={user.id} />
-		<input type="hidden" name="recipient" value={subject.username} />
-
-		<input
-			use:focus
-			name="message"
-			placeholder={$t('payments.sendMessage')}
-			class="w-full p-4 border rounded-xl"
-			bind:value={message}
-			bind:this={input}
-		/>
-	</form>
-</div>
-
-<style>
-	.ours {
-		@apply bg-gray-100 rounded-br-none ml-auto;
-	}
-
-	.theirs {
-		@apply bg-gray-200 rounded-bl-none;
-	}
-</style>
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
index b5571f23..2ff92687 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
@@ -152,9 +152,9 @@
 	{/if}
 
 	<div class="w-full flex justify-center">
-		<button class="flex rounded-full border py-2 px-5 hover:opacity-80" on:click={() => copy(txt)}>
+		<button class="flex rounded-full border py-3 px-5 hover:opacity-80" on:click={() => copy(txt)}>
 			<Icon icon="copy" style="mr-1" />
-			<div class="text-secondary">{txt.substr(0, 10)}..{txt.substr(-6)}</div></button
+			<div class="text-secondary">{txt.substr(0, 10)}...{txt.substr(-10)}</div></button
 		>
 	</div>
 </div>
diff --git a/src/routes/(app)/[username]/messages/+page.server.js b/src/routes/(app)/[username]/messages/+page.server.js
new file mode 100644
index 00000000..7b651389
--- /dev/null
+++ b/src/routes/(app)/[username]/messages/+page.server.js
@@ -0,0 +1,19 @@
+import { get } from '$lib/utils';
+
+export async function load({ params, parent, url }) {
+	let { user, subject } = await parent();
+	let { since = 0 } = params;
+
+	let messages = [];
+
+	try {
+		messages = await get(`/${user.pubkey}/${since}/messages`);
+		messages = messages
+			.filter((m) => m.recipient.id === subject.id || m.author.id === subject.id)
+			.sort((a, b) => a.created_at - b.created_at);
+	} catch (e) {
+		console.log(`failed to fetch nostr messages`, e);
+	}
+
+	return { messages, user };
+}
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
new file mode 100644
index 00000000..f8f64aea
--- /dev/null
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -0,0 +1,126 @@
+<script>
+	import { browser } from '$app/environment';
+	import { t } from '$lib/translations';
+	import { format, parseISO } from 'date-fns';
+	import { scale } from 'svelte/transition';
+	import { enhance } from '$app/forms';
+	import { Avatar, Icon } from '$comp';
+	import { back, fail, focus } from '$lib/utils';
+	import { sign, send, encrypt, decrypt } from '$lib/nostr';
+	import { event as e, password } from '$lib/store';
+	import { tick, onMount } from 'svelte';
+	import { calculateId } from 'nostr';
+
+	export let data;
+
+	let { messages, subject, user } = data;
+	let input, pane, ready;
+
+	$: initialize($password);
+	let initialize = async (p) => {
+		if (!p) return;
+		ready = true;
+		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+	};
+
+	e.subscribe((ev) => {
+		if (ev?.recipient.id === user.id && !~messages.findIndex((m) => m.id === ev.id)) {
+			messages.push(ev);
+			messages = messages;
+			tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+		}
+	});
+
+	let sent, submitting, message;
+	let submit = async () => {
+		submitting = true;
+
+		let event = {
+			pubkey: user.pubkey,
+			created_at: Math.floor(Date.now() / 1000),
+			kind: 4,
+			tags: [['p', subject.pubkey]]
+		};
+
+		event.message = message;
+		event.id = await calculateId(event);
+		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+
+		try {
+			event.content = await encrypt({ message, recipient: subject.pubkey, user });
+			event.author = user;
+			event.recipient = subject;
+			await sign({ event, user });
+			await send(event);
+			messages.push(event);
+			messages = messages;
+			tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+
+			sent = true;
+		} catch (e) {
+			fail('Failed to send message');
+		}
+
+		message = '';
+		submitting = false;
+	};
+</script>
+
+<div class="container max-w-xl mx-auto px-4">
+	{#if messages.length && ready}
+		<div
+			class="max-h-[calc(40vh)] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
+			bind:this={pane}
+		>
+			{#each messages as event}
+				{@const ours = event.pubkey === user.pubkey}
+				{@const theirs = !ours}
+				<div class="flex gap-2" class:flex-row-reverse={theirs} class:justify-end={theirs}>
+					<div
+						class="rounded-2xl px-4 py-2 max-w-[300px] mb-1 text-lg"
+						class:ours
+						class:theirs
+						:key={event.id}
+					>
+						{#await decrypt({ event, user })}
+							-
+						{:then message}
+							{message}
+						{/await}
+					</div>
+					<div class="mt-auto">
+						<Avatar user={event.author} size={'12'} />
+					</div>
+				</div>
+				<div class="text-sm text-gray-400 mb-6" class:text-right={ours}>
+					{format(new Date(event.created_at * 1000), 'MMM d')},
+					{format(new Date(event.created_at * 1000), 'h:mm aa')}
+				</div>
+			{/each}
+		</div>
+	{/if}
+
+	<form method="POST" class="space-y-5" on:submit|preventDefault={submit}>
+		<input type="hidden" name="requester_id" value={user.id} />
+		<input type="hidden" name="recipient" value={subject.username} />
+
+		<input
+			use:focus
+			name="message"
+			placeholder={$t('payments.sendMessage')}
+			class="w-full p-4 border rounded-xl outline-none"
+			bind:value={message}
+			bind:this={input}
+		/>
+	</form>
+</div>
+
+<style>
+	.ours {
+		@apply bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] text-black rounded-br-none ml-auto;
+	}
+
+	.theirs {
+		@apply bg-gray-100 text-black rounded-bl-none;
+	}
+</style>
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index 2068c306..aacba81e 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -182,7 +182,7 @@
 							{:else if p.with}
 								<div class="flex">
 									<div class="my-auto">
-										<Avatar user={p.with} size={12} disabled={true} />
+										<Avatar user={p.with} size={16} disabled={true} />
 									</div>
 									<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
 								</div>
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 323d5ef0..2f556ada 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -1,13 +1,33 @@
 <script>
 	import { enhance } from '$app/forms';
 	import { Icon, Lock, Card, Calendar, Spinner } from '$comp';
+	import { animatedRate, selectedRate } from '$lib/store';
+	import { f } from '$lib/utils';
 
 	export let data, form;
 
-	let { username } = data.user;
+	let { username, currency } = data.user;
 	let loading;
 
 	let amount, n, d, cvc;
+
+	let ease = (t) => (t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t);
+	let i;
+
+	let o = $selectedRate;
+	$: animate($selectedRate);
+	let animate = (n) => {
+		clearInterval(i);
+
+		let t = 0;
+		let d = o - n;
+
+		i = setInterval(() => {
+			$animatedRate = (o - d * ease(t / 100)).toFixed(2);
+			if (t > 80) (o = n) && clearInterval(i);
+			t++;
+		}, 10);
+	};
 </script>
 
 <div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
@@ -114,6 +134,17 @@
 					</button>
 				</div>
 			</form>
+
+			<div class="flex">
+				<div class="text-secondary flex mr-auto">
+					<div class="flex mr-1">
+						<div class="my-auto mr-1">1</div>
+						<img src="/images/bitcoin.svg" class="w-5 my-auto" alt="Bitcoin" />
+					</div>
+					<div>= {f($animatedRate, currency)}</div>
+				</div>
+				<p class="text-secondary">3% credit card fee applies</p>
+			</div>
 		</div>
 	</div>
 </div>
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index 9a1e41da..75998cd0 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -1,5 +1,4 @@
 <script>
-	import { messages } from '$lib/store';
 	import { RegisterOrLogin } from '$comp';
 
 	export let form;
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 8125c63c..2988ddb5 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -18,7 +18,7 @@
 	<Icon icon="arrow-left" style="w-10" />
 </button>
 
-<div class="container mx-auto max-w-lg px-4 space-y-2 sm:space-y-5 break-all text-2xl">
+<div class="container mx-auto max-w-lg px-4 space-y-8 break-all text-2xl">
 	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
 		{$t(amount < 0 ? 'payments.sent' : 'payments.received')}
 	</h1>
@@ -28,7 +28,7 @@
 			<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
 			<div class="flex">
 				<div class="my-auto">
-					<Avatar user={p.with} />
+					<Avatar user={p.with} size={20} />
 				</div>
 				<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
 			</div>
@@ -69,20 +69,12 @@
 		</div>
 	</div>
 
-	{#if type === 'lightning'}
-		<div>
-			<span class="text-lg text-secondary">Proof</span>
-			<div class="font-bold">{$t('payments.preimage')}</div>
-			<div>
-				{ref}
-			</div>
-		</div>
-	{:else if type === 'bitcoin'}
+	{#if type === 'bitcoin'}
 		<div>
 			<span class="text-lg text-secondary">Txid</span>
 			<div class="flex">
 				<div>
-					<a href={`${expl}/payment/${id}`} target="_blank" rel="noreferrer">{id}</a>
+					<a href={`${expl}/tx/${id}`} target="_blank" rel="noreferrer">{id}</a>
 				</div>
 				<button class="flex font-bold hover:opacity-80 mb-auto my-auto" on:click={() => copy(id)}
 					><Icon icon="copy" style="ml-2 w-20 my-auto" />
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 2941c890..c57db020 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -12,5 +12,6 @@ module.exports = {
 			}
 		}
 	},
-	plugins: []
+	plugins: [require('tailwind-scrollbar')],
+	safelist: ['w-16', 'h-16', 'w-20', 'h-20', 'w-24', 'h-24']
 };
-- 
cgit v1.2.3


From 9da8032e91798639131656a2504b86a6f9c40694 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 11:29:01 -0800
Subject: message styles

---
 src/routes/(app)/[username]/(profile)/+page.svelte | 24 +++++++--
 src/routes/(app)/[username]/messages/+page.svelte  | 63 ++++++++++++----------
 src/routes/(app)/send/[...text]/+page.svelte       |  2 +-
 3 files changed, 58 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index bc19a9df..4d4f3b13 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -4,6 +4,7 @@
 	import { t } from '$lib/translations';
 	import { f, sat, sats } from '$lib/utils';
 	import { sign, send, encrypt, decrypt } from '$lib/nostr';
+	import { event as e, password } from '$lib/store';
 	import { browser } from '$app/environment';
 
 	export let data;
@@ -13,8 +14,25 @@
 	let latest = [];
 	let i = 0;
 
-	onMount(async () => {
-		if (!browser) return;
+	e.subscribe(async (event) => {
+		if (event?.recipient.id === user.id && !~latest.findIndex((m) => m.id === event.id)) {
+			event.content = await decrypt({ event, user });
+
+			let i = latest.findIndex((m) => m.pubkey === event.pubkey);
+
+			if (~i) latest.splice(i, 1);
+			else latest.pop();
+
+			console.log(latest);
+			latest.unshift(event);
+
+			latest = latest;
+		}
+	});
+
+	$: initialize($password);
+	let initialize = async (p) => {
+		if (!p) return;
 		while (latest.length < 3 && i < messages.length) {
 			let event = messages[i];
 			let k = event.author.id === user.id ? event.recipient.pubkey : event.author.pubkey;
@@ -27,7 +45,7 @@
 		}
 
 		latest = latest;
-	});
+	};
 </script>
 
 <div class="space-y-8">
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index f8f64aea..397d07ac 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -2,7 +2,7 @@
 	import { browser } from '$app/environment';
 	import { t } from '$lib/translations';
 	import { format, parseISO } from 'date-fns';
-	import { scale } from 'svelte/transition';
+	import { scale, fade } from 'svelte/transition';
 	import { enhance } from '$app/forms';
 	import { Avatar, Icon } from '$comp';
 	import { back, fail, focus } from '$lib/utils';
@@ -14,18 +14,24 @@
 	export let data;
 
 	let { messages, subject, user } = data;
-	let input, pane, ready;
+	let input, pane;
 
 	$: initialize($password);
 	let initialize = async (p) => {
 		if (!p) return;
-		ready = true;
+		await Promise.all(
+			messages.map(async (event) => (event.message = await decrypt({ event, user })))
+		);
+
+		messages = messages;
 		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
 	};
 
-	e.subscribe((ev) => {
-		if (ev?.recipient.id === user.id && !~messages.findIndex((m) => m.id === ev.id)) {
-			messages.push(ev);
+	e.subscribe(async (event) => {
+		let found = ~messages.findIndex((m) => m.id === event?.id);
+		if (event?.recipient.id === user.id && !found) {
+			event.message = await decrypt({ event, user });
+			messages.push(event);
 			messages = messages;
 			tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
 		}
@@ -58,6 +64,7 @@
 
 			sent = true;
 		} catch (e) {
+			console.log(e);
 			fail('Failed to send message');
 		}
 
@@ -67,38 +74,40 @@
 </script>
 
 <div class="container max-w-xl mx-auto px-4">
-	{#if messages.length && ready}
-		<div
-			class="max-h-[calc(40vh)] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
-			bind:this={pane}
-		>
-			{#each messages as event}
-				{@const ours = event.pubkey === user.pubkey}
-				{@const theirs = !ours}
-				<div class="flex gap-2" class:flex-row-reverse={theirs} class:justify-end={theirs}>
+	<div
+		class="h-[40vh] max-h-[40vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
+		bind:this={pane}
+	>
+		{#each messages as { id, author, message, created_at, pubkey }}
+			{@const ours = pubkey === user.pubkey}
+			{@const theirs = !ours}
+
+			{#if message}
+				<div
+					class="flex gap-2"
+					class:flex-row-reverse={theirs}
+					class:justify-end={theirs}
+					in:fade={{ duration: 150 }}
+				>
 					<div
 						class="rounded-2xl px-4 py-2 max-w-[300px] mb-1 text-lg"
 						class:ours
 						class:theirs
-						:key={event.id}
+						:key={id}
 					>
-						{#await decrypt({ event, user })}
-							-
-						{:then message}
-							{message}
-						{/await}
+						{message}
 					</div>
 					<div class="mt-auto">
-						<Avatar user={event.author} size={'12'} />
+						<Avatar user={author} size={'12'} />
 					</div>
 				</div>
 				<div class="text-sm text-gray-400 mb-6" class:text-right={ours}>
-					{format(new Date(event.created_at * 1000), 'MMM d')},
-					{format(new Date(event.created_at * 1000), 'h:mm aa')}
+					{format(new Date(created_at * 1000), 'MMM d')},
+					{format(new Date(created_at * 1000), 'h:mm aa')}
 				</div>
-			{/each}
-		</div>
-	{/if}
+			{/if}
+		{/each}
+	</div>
 
 	<form method="POST" class="space-y-5" on:submit|preventDefault={submit}>
 		<input type="hidden" name="requester_id" value={user.id} />
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 5a376f9f..5f37cad5 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -99,7 +99,7 @@
 			<div>
 				{#each contacts as c}
 					<a href={`/send/${c.username}`}>
-						<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
+						<div class="border-b p-2 last:border-b-0 hover:bg-gray-100 rounded-2xl">
 							<div class="flex">
 								<div>
 									<div class="flex">
-- 
cgit v1.2.3


From 8406bad913e888aaa6cea4fb883e5a92db957084 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 11:49:17 -0800
Subject: profile page fixes

---
 src/routes/(app)/[username]/(profile)/+page.server.js |  7 ++++---
 src/routes/(app)/[username]/(profile)/+page.svelte    | 11 ++++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index 2777afdc..085271fd 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -5,7 +5,8 @@ export async function load({ cookies, params, parent, url }) {
 	let { pubkey } = subject;
 	let { since = 0 } = params;
 
-	let messages = [];
+  let messages, invoices, sent, received;
+	messages = invoices = sent = received = [];
 
 	if (user) {
 		try {
@@ -14,6 +15,8 @@ export async function load({ cookies, params, parent, url }) {
 		} catch (e) {
 			console.log(`failed to fetch nostr messages`, e);
 		}
+
+		({ invoices, sent, received } = await get('/requests', auth(cookies)));
 	}
 
 	let notes = [];
@@ -28,7 +31,5 @@ export async function load({ cookies, params, parent, url }) {
 		e.seen = e.created_at;
 	});
 
-	let { invoices, sent, received } = await get('/requests', auth(cookies));
-
 	return { invoices, messages, notes, sent, received };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 4d4f3b13..e5a42f07 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -15,7 +15,8 @@
 	let i = 0;
 
 	e.subscribe(async (event) => {
-		if (event?.recipient.id === user.id && !~latest.findIndex((m) => m.id === event.id)) {
+    if (!event) return;
+		if (event.recipient.id === user?.id && !~latest.findIndex((m) => m.id === event.id)) {
 			event.content = await decrypt({ event, user });
 
 			let i = latest.findIndex((m) => m.pubkey === event.pubkey);
@@ -23,9 +24,13 @@
 			if (~i) latest.splice(i, 1);
 			else latest.pop();
 
-			console.log(latest);
 			latest.unshift(event);
 
+			console.log(
+				'latest',
+				latest.map((m) => m.id)
+			);
+
 			latest = latest;
 		}
 	});
@@ -164,7 +169,7 @@
 		</div>
 	{/if}
 
-	{#if latest.length && user.id === subject.id}
+	{#if latest.length && user?.id === subject.id}
 		<div class="relative">
 			{#each latest as { content, pubkey, author, recipient }}
 				{@const user = author.id === user.id ? recipient : author}
-- 
cgit v1.2.3


From b41b65ffc0816f5c3ac65b2e85ed37f96e4f61c0 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 12:05:15 -0800
Subject: refresh data

---
 src/routes/(app)/[username]/(profile)/+page.svelte | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index e5a42f07..596962d0 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -9,13 +9,15 @@
 
 	export let data;
 	let { messages, notes, invoices, sent, received, subject, user } = data;
+	$: refresh(data);
+	let refresh = (d) => ({ messages, notes, invoices, sent, received, subject, user } = d);
 
 	let keys = new Set();
 	let latest = [];
 	let i = 0;
 
 	e.subscribe(async (event) => {
-    if (!event) return;
+		if (!event) return;
 		if (event.recipient.id === user?.id && !~latest.findIndex((m) => m.id === event.id)) {
 			event.content = await decrypt({ event, user });
 
@@ -25,12 +27,6 @@
 			else latest.pop();
 
 			latest.unshift(event);
-
-			console.log(
-				'latest',
-				latest.map((m) => m.id)
-			);
-
 			latest = latest;
 		}
 	});
-- 
cgit v1.2.3


From 4625c1f58e8f6a1b1e6a73dfe5c5d6871b0138bc Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 12:12:34 -0800
Subject: wait for messages to be ready

---
 src/routes/(app)/[username]/(profile)/+page.svelte | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 596962d0..168556e4 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -15,16 +15,17 @@
 	let keys = new Set();
 	let latest = [];
 	let i = 0;
+	let ready;
 
 	e.subscribe(async (event) => {
-		if (!event) return;
+		if (!(event && ready)) return;
 		if (event.recipient.id === user?.id && !~latest.findIndex((m) => m.id === event.id)) {
 			event.content = await decrypt({ event, user });
 
 			let i = latest.findIndex((m) => m.pubkey === event.pubkey);
-
-			if (~i) latest.splice(i, 1);
-			else latest.pop();
+			let popped;
+			if (~i) popped = latest.splice(i, 1);
+			else popped = latest.pop();
 
 			latest.unshift(event);
 			latest = latest;
@@ -33,6 +34,7 @@
 
 	$: initialize($password);
 	let initialize = async (p) => {
+		ready = false;
 		if (!p) return;
 		while (latest.length < 3 && i < messages.length) {
 			let event = messages[i];
@@ -46,6 +48,7 @@
 		}
 
 		latest = latest;
+		ready = true;
 	};
 </script>
 
-- 
cgit v1.2.3


From 152abe4cecf9447f90ebc4c665fa0595630c874f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 12:17:42 -0800
Subject: tweak

---
 src/routes/(app)/[username]/messages/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index 397d07ac..1e0336f3 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -75,7 +75,7 @@
 
 <div class="container max-w-xl mx-auto px-4">
 	<div
-		class="h-[40vh] max-h-[40vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
+		class="h-[50vh] max-h-[50vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
 		bind:this={pane}
 	>
 		{#each messages as { id, author, message, created_at, pubkey }}
-- 
cgit v1.2.3


From 50f9c3c71a598ce10ad3191155b2cca25cfbf7b2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 12:32:49 -0800
Subject: animate

---
 src/routes/(app)/[username]/messages/+page.svelte | 38 +++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index 1e0336f3..a6b7005f 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -1,8 +1,9 @@
 <script>
+	import { cubicInOut } from 'svelte/easing';
 	import { browser } from '$app/environment';
 	import { t } from '$lib/translations';
 	import { format, parseISO } from 'date-fns';
-	import { scale, fade } from 'svelte/transition';
+	import { scale, fade, fly } from 'svelte/transition';
 	import { enhance } from '$app/forms';
 	import { Avatar, Icon } from '$comp';
 	import { back, fail, focus } from '$lib/utils';
@@ -13,6 +14,22 @@
 
 	export let data;
 
+	function fadeScale(node, { delay = 0, duration = 200, easing = (x) => x, baseScale = 0 }) {
+		const o = +getComputedStyle(node).opacity;
+		const m = getComputedStyle(node).transform.match(/scale\(([0-9.]+)\)/);
+		const s = m ? m[1] : 1;
+		const is = 1 - baseScale;
+
+		return {
+			delay,
+			duration,
+			css: (t) => {
+				const eased = easing(t);
+				return `opacity: ${eased * o}; transform: scale(${eased * s * is + baseScale})`;
+			}
+		};
+	}
+
 	let { messages, subject, user } = data;
 	let input, pane;
 
@@ -53,15 +70,17 @@
 		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
 
 		try {
-			event.content = await encrypt({ message, recipient: subject.pubkey, user });
 			event.author = user;
 			event.recipient = subject;
-			await sign({ event, user });
-			await send(event);
+
 			messages.push(event);
 			messages = messages;
 			tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
 
+			event.content = await encrypt({ message, recipient: subject.pubkey, user });
+			await sign({ event, user });
+			await send(event);
+
 			sent = true;
 		} catch (e) {
 			console.log(e);
@@ -87,7 +106,10 @@
 					class="flex gap-2"
 					class:flex-row-reverse={theirs}
 					class:justify-end={theirs}
-					in:fade={{ duration: 150 }}
+					in:fadeScale={{
+						easing: cubicInOut,
+						baseScale: 0.5
+					}}
 				>
 					<div
 						class="rounded-2xl px-4 py-2 max-w-[300px] mb-1 text-lg"
@@ -109,10 +131,14 @@
 		{/each}
 	</div>
 
-	<form method="POST" class="space-y-5" on:submit|preventDefault={submit}>
+	<form method="POST" class="space-y-5 relative" on:submit|preventDefault={submit}>
 		<input type="hidden" name="requester_id" value={user.id} />
 		<input type="hidden" name="recipient" value={subject.username} />
 
+		<button type="submit" class="absolute right-2 bottom-2">
+			<Icon icon="send" style="w-10" />
+		</button>
+
 		<input
 			use:focus
 			name="message"
-- 
cgit v1.2.3


From 1309ea15abe75353bb1fd668ce1bb1a7f144cf0b Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 12:34:31 -0800
Subject: refocus input

---
 src/routes/(app)/[username]/messages/+page.svelte | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index a6b7005f..55eff398 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -56,6 +56,7 @@
 
 	let sent, submitting, message;
 	let submit = async () => {
+    input.focus();
 		submitting = true;
 
 		let event = {
-- 
cgit v1.2.3


From dfd236a6aaffa7389c6eb03086aafdf4d4c7e262 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 12:37:10 -0800
Subject: clear input right away

---
 src/routes/(app)/[username]/messages/+page.svelte | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index 55eff398..adbb262f 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -56,7 +56,6 @@
 
 	let sent, submitting, message;
 	let submit = async () => {
-    input.focus();
 		submitting = true;
 
 		let event = {
@@ -67,17 +66,19 @@
 		};
 
 		event.message = message;
-		event.id = await calculateId(event);
-		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
 
-		try {
-			event.author = user;
-			event.recipient = subject;
+		message = '';
+		input.focus();
 
-			messages.push(event);
-			messages = messages;
-			tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+		event.author = user;
+		event.recipient = subject;
 
+		messages.push(event);
+		messages = messages;
+		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+
+		try {
+      event.id = await calculateId(event);
 			event.content = await encrypt({ message, recipient: subject.pubkey, user });
 			await sign({ event, user });
 			await send(event);
-- 
cgit v1.2.3


From 0c8c347207c0e064e8e37a6cdaf9751d072c7551 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Feb 2023 12:40:17 -0800
Subject: fix

---
 src/routes/(app)/[username]/messages/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index adbb262f..5de18c66 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -78,8 +78,8 @@
 		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
 
 		try {
-      event.id = await calculateId(event);
-			event.content = await encrypt({ message, recipient: subject.pubkey, user });
+			event.id = await calculateId(event);
+			event.content = await encrypt({ message: event.message, recipient: subject.pubkey, user });
 			await sign({ event, user });
 			await send(event);
 
-- 
cgit v1.2.3


From 411193c8e4673e0a1d389398bb605bc3ec911c3f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 18 Feb 2023 01:03:08 -0800
Subject: max send button

---
 src/components/Numpad.svelte                       | 49 +++++++++++-----------
 .../bitcoin/[address]/[...amount]/+page.svelte     | 25 +++++++----
 .../[address]/[...amount]/confirm/+page.svelte     |  0
 3 files changed, 43 insertions(+), 31 deletions(-)
 create mode 100644 src/routes/(app)/send/bitcoin/[address]/[...amount]/confirm/+page.svelte

(limited to 'src')

diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 5ffaa2ea..79f0a700 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -9,11 +9,12 @@
 		fiat = !amount,
 		submit = undefined;
 
-	export let amountFiat = amount ? amount * ($selectedRate / sats) : 0;
-
+let amountFiat;
 	let arrow = '<';
 
-	let amountSats = amount;
+	$: update(amount);
+	let update = (a) => (amountFiat = amount ? ((amount * $selectedRate) / sats).toFixed(2) : 0);
+
 	let loading = false;
 
 	let symbol =
@@ -33,13 +34,13 @@
 			KRW: '₩'
 		}[currency] || '';
 
-	$: amount = parseInt(fiat ? Math.round(amountFiat / ($selectedRate / sats)) : amountSats);
-
-	$: amountSatsFormatted = s(amountSats);
+	$: amountFormatted = s(amount);
 
-	$: amountFiatConverted = f(amountSats * ($selectedRate / sats), currency);
+	$: amountFiatConverted =
+		console.log('FC', amount, f(amount * ($selectedRate / sats), currency)) ||
+		f(amount * ($selectedRate / sats), currency);
 
-	$: amountSatsConverted = sat(amountFiat / ($selectedRate / sats));
+	$: amountConverted = sat(amountFiat / ($selectedRate / sats));
 
 	const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0', '<'];
 
@@ -58,7 +59,7 @@
 					amountFiat = amountFiat.slice(0, amountFiat.length - 1);
 					if (amountFiat.length === 0) {
 						amountFiat = 0;
-						amountSats = 0;
+						amount = 0;
 					}
 				}
 			} else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > $selectedRate) {
@@ -71,25 +72,25 @@
 		} else {
 			if (value === '.') {
 				return;
-			} else if (!amountSats && value !== '<' && value !== '0') {
-				amountSats = parseInt(value);
+			} else if (!amount && value !== '<' && value !== '0') {
+				amount = parseInt(value);
 			} else if (value === '<') {
-				if (amountSats !== 0) {
-					amountSats = Math.floor(amountSats / 10);
-					if (amountSats.length === 0) {
-						amountSats = 0;
+				if (amount !== 0) {
+					amount = Math.floor(amount / 10);
+					if (amount.length === 0) {
+						amount = 0;
 						amountFiat = 0;
 					}
 				}
-			} else if (value !== '<' && parseInt(amountSats + value) > sats) {
+			} else if (value !== '<' && parseInt(amount + value) > sats) {
 				warning($t('user.receive.lessThan1BTCWarning'));
 			} else {
-				amountSats = parseInt(amountSats + value);
+				amount = parseInt(amount + value);
 			}
 		}
 	};
 
-	$: html = fiat ? amountFiat : s(amountSats);
+	$: html = fiat ? amountFiat : s(amount);
 
 	let prev = '';
 
@@ -124,10 +125,10 @@
 		if (fiat) {
 			amountFiat = html;
 		} else {
-			amountSats = parseInt(html.replace(/,/g, ''));
+			amount = parseInt(html.replace(/,/g, ''));
 		}
 
-		if (!amountSats) amountSats = null;
+		if (!amount) amount = null;
 
 		setTimeout(() => {
 			if (!fiat) {
@@ -178,16 +179,16 @@
 				/>
 			</div>
 			<div class="mt-2">
-				<span class="text-secondary mr-1">{fiat ? amountSatsConverted : amountFiatConverted}</span>
+				<span class="text-secondary mr-1">{fiat ? amountConverted : amountFiatConverted}</span>
 				<button
 					type="button"
 					on:click={() => {
 						if (fiat) {
-							amountSats = parseInt((amountFiat / ($selectedRate / sats)).toFixed(0));
+							amount = parseInt((amountFiat / ($selectedRate / sats)).toFixed(0));
 						} else {
 							amountFiat =
-								(amountSats * ($selectedRate / sats)).toFixed(2) > 0.0
-									? (amountSats * ($selectedRate / sats)).toFixed(2)
+								(amount * ($selectedRate / sats)).toFixed(2) > 0.0
+									? (amount * ($selectedRate / sats)).toFixed(2)
 									: 0;
 						}
 						fiat = !fiat;
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 6b216cb3..17a3952b 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -3,14 +3,14 @@
 	import { enhance } from '$app/forms';
 	import { Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
+	import { back, s, sat } from '$lib/utils';
 	import { pin } from '$lib/store';
 
 	export let data;
 	export let form;
 
 	let { address, amount } = $page.params;
-	let { currency } = data.user;
+	let { balance, currency } = data.user;
 	let loading, submit;
 
 	let toggle = () => (loading = true);
@@ -20,6 +20,8 @@
 		if (form?.message.includes('pin')) $pin = undefined;
 		loading = false;
 	};
+
+let max = () => (amount = balance);
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
@@ -32,12 +34,14 @@
 	</div>
 {/if}
 
-<div class="container px-4 mt-20 max-w-xl mx-auto">
+<div class="container px-4 mt-20 max-w-xl mx-auto space-y-5">
 	<div class="text-center mb-8">
-		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.sendTo')}</h1>
+		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.send')}</h1>
 		<p class="text-lg text-secondary">{address}</p>
 	</div>
-	<Numpad bind:amount {currency} {submit} />
+
+
+  <Numpad bind:amount {currency} {submit} />
 
 	<form method="POST" use:enhance on:submit={toggle}>
 		<input name="ts" value={Date.now()} type="hidden" />
@@ -45,11 +49,18 @@
 		<input name="amount" value={amount} type="hidden" />
 		<input name="pin" value={$pin} type="hidden" />
 
-		<div class="flex w-full">
+		<div class="flex justify-center gap-2">
+			<button
+				type="button"
+				class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
+				on:click|preventDefault={max}
+				on:keydown={max}>Max ⚡️{s(balance)}</button
+			>
+
 			<button
 				bind:this={submit}
 				type="submit"
-				class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
+				class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-24"
 				disabled={loading}
 			>
 				{#if loading}
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/confirm/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/confirm/+page.svelte
new file mode 100644
index 00000000..e69de29b
-- 
cgit v1.2.3


From 714d7b840533e35184ca27ae3fe3f5decff9a4eb Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 18 Feb 2023 10:28:53 -0800
Subject: Revert "max send button"

This reverts commit 411193c8e4673e0a1d389398bb605bc3ec911c3f.
---
 src/components/Numpad.svelte                       | 49 +++++++++++-----------
 .../bitcoin/[address]/[...amount]/+page.svelte     | 25 ++++-------
 .../[address]/[...amount]/confirm/+page.svelte     |  0
 3 files changed, 31 insertions(+), 43 deletions(-)
 delete mode 100644 src/routes/(app)/send/bitcoin/[address]/[...amount]/confirm/+page.svelte

(limited to 'src')

diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 79f0a700..5ffaa2ea 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -9,12 +9,11 @@
 		fiat = !amount,
 		submit = undefined;
 
-let amountFiat;
-	let arrow = '<';
+	export let amountFiat = amount ? amount * ($selectedRate / sats) : 0;
 
-	$: update(amount);
-	let update = (a) => (amountFiat = amount ? ((amount * $selectedRate) / sats).toFixed(2) : 0);
+	let arrow = '<';
 
+	let amountSats = amount;
 	let loading = false;
 
 	let symbol =
@@ -34,13 +33,13 @@ let amountFiat;
 			KRW: '₩'
 		}[currency] || '';
 
-	$: amountFormatted = s(amount);
+	$: amount = parseInt(fiat ? Math.round(amountFiat / ($selectedRate / sats)) : amountSats);
+
+	$: amountSatsFormatted = s(amountSats);
 
-	$: amountFiatConverted =
-		console.log('FC', amount, f(amount * ($selectedRate / sats), currency)) ||
-		f(amount * ($selectedRate / sats), currency);
+	$: amountFiatConverted = f(amountSats * ($selectedRate / sats), currency);
 
-	$: amountConverted = sat(amountFiat / ($selectedRate / sats));
+	$: amountSatsConverted = sat(amountFiat / ($selectedRate / sats));
 
 	const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0', '<'];
 
@@ -59,7 +58,7 @@ let amountFiat;
 					amountFiat = amountFiat.slice(0, amountFiat.length - 1);
 					if (amountFiat.length === 0) {
 						amountFiat = 0;
-						amount = 0;
+						amountSats = 0;
 					}
 				}
 			} else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > $selectedRate) {
@@ -72,25 +71,25 @@ let amountFiat;
 		} else {
 			if (value === '.') {
 				return;
-			} else if (!amount && value !== '<' && value !== '0') {
-				amount = parseInt(value);
+			} else if (!amountSats && value !== '<' && value !== '0') {
+				amountSats = parseInt(value);
 			} else if (value === '<') {
-				if (amount !== 0) {
-					amount = Math.floor(amount / 10);
-					if (amount.length === 0) {
-						amount = 0;
+				if (amountSats !== 0) {
+					amountSats = Math.floor(amountSats / 10);
+					if (amountSats.length === 0) {
+						amountSats = 0;
 						amountFiat = 0;
 					}
 				}
-			} else if (value !== '<' && parseInt(amount + value) > sats) {
+			} else if (value !== '<' && parseInt(amountSats + value) > sats) {
 				warning($t('user.receive.lessThan1BTCWarning'));
 			} else {
-				amount = parseInt(amount + value);
+				amountSats = parseInt(amountSats + value);
 			}
 		}
 	};
 
-	$: html = fiat ? amountFiat : s(amount);
+	$: html = fiat ? amountFiat : s(amountSats);
 
 	let prev = '';
 
@@ -125,10 +124,10 @@ let amountFiat;
 		if (fiat) {
 			amountFiat = html;
 		} else {
-			amount = parseInt(html.replace(/,/g, ''));
+			amountSats = parseInt(html.replace(/,/g, ''));
 		}
 
-		if (!amount) amount = null;
+		if (!amountSats) amountSats = null;
 
 		setTimeout(() => {
 			if (!fiat) {
@@ -179,16 +178,16 @@ let amountFiat;
 				/>
 			</div>
 			<div class="mt-2">
-				<span class="text-secondary mr-1">{fiat ? amountConverted : amountFiatConverted}</span>
+				<span class="text-secondary mr-1">{fiat ? amountSatsConverted : amountFiatConverted}</span>
 				<button
 					type="button"
 					on:click={() => {
 						if (fiat) {
-							amount = parseInt((amountFiat / ($selectedRate / sats)).toFixed(0));
+							amountSats = parseInt((amountFiat / ($selectedRate / sats)).toFixed(0));
 						} else {
 							amountFiat =
-								(amount * ($selectedRate / sats)).toFixed(2) > 0.0
-									? (amount * ($selectedRate / sats)).toFixed(2)
+								(amountSats * ($selectedRate / sats)).toFixed(2) > 0.0
+									? (amountSats * ($selectedRate / sats)).toFixed(2)
 									: 0;
 						}
 						fiat = !fiat;
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 17a3952b..6b216cb3 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -3,14 +3,14 @@
 	import { enhance } from '$app/forms';
 	import { Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
-	import { back, s, sat } from '$lib/utils';
+	import { back } from '$lib/utils';
 	import { pin } from '$lib/store';
 
 	export let data;
 	export let form;
 
 	let { address, amount } = $page.params;
-	let { balance, currency } = data.user;
+	let { currency } = data.user;
 	let loading, submit;
 
 	let toggle = () => (loading = true);
@@ -20,8 +20,6 @@
 		if (form?.message.includes('pin')) $pin = undefined;
 		loading = false;
 	};
-
-let max = () => (amount = balance);
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
@@ -34,14 +32,12 @@ let max = () => (amount = balance);
 	</div>
 {/if}
 
-<div class="container px-4 mt-20 max-w-xl mx-auto space-y-5">
+<div class="container px-4 mt-20 max-w-xl mx-auto">
 	<div class="text-center mb-8">
-		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.send')}</h1>
+		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.sendTo')}</h1>
 		<p class="text-lg text-secondary">{address}</p>
 	</div>
-
-
-  <Numpad bind:amount {currency} {submit} />
+	<Numpad bind:amount {currency} {submit} />
 
 	<form method="POST" use:enhance on:submit={toggle}>
 		<input name="ts" value={Date.now()} type="hidden" />
@@ -49,18 +45,11 @@ let max = () => (amount = balance);
 		<input name="amount" value={amount} type="hidden" />
 		<input name="pin" value={$pin} type="hidden" />
 
-		<div class="flex justify-center gap-2">
-			<button
-				type="button"
-				class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
-				on:click|preventDefault={max}
-				on:keydown={max}>Max ⚡️{s(balance)}</button
-			>
-
+		<div class="flex w-full">
 			<button
 				bind:this={submit}
 				type="submit"
-				class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-24"
+				class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
 				disabled={loading}
 			>
 				{#if loading}
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/confirm/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/confirm/+page.svelte
deleted file mode 100644
index e69de29b..00000000
-- 
cgit v1.2.3


From c6bcdfc1bf705acd5379ead810b605a4e799d59f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 18 Feb 2023 20:19:47 -0800
Subject: numpad cleanup

---
 src/components/Numpad.svelte                       | 25 +++++++++++-----------
 .../(app)/[username]/(profile)/+page.server.js     |  2 +-
 .../bitcoin/[address]/[...amount]/+page.svelte     |  3 +++
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 5ffaa2ea..3647914e 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -9,11 +9,18 @@
 		fiat = !amount,
 		submit = undefined;
 
-	export let amountFiat = amount ? amount * ($selectedRate / sats) : 0;
-
+	let amountFiat = 0;
 	let arrow = '<';
 
-	let amountSats = amount;
+	$: update(amount, amountFiat);
+	let update = (a, f) => {
+		if (fiat) {
+			amount = Math.round(f / ($selectedRate / sats));
+		} else {
+			amountFiat = ((a * $selectedRate) / sats).toFixed(2);
+		}
+	};
+
 	let loading = false;
 
 	let symbol =
@@ -33,14 +40,6 @@
 			KRW: '₩'
 		}[currency] || '';
 
-	$: amount = parseInt(fiat ? Math.round(amountFiat / ($selectedRate / sats)) : amountSats);
-
-	$: amountSatsFormatted = s(amountSats);
-
-	$: amountFiatConverted = f(amountSats * ($selectedRate / sats), currency);
-
-	$: amountSatsConverted = sat(amountFiat / ($selectedRate / sats));
-
 	const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0', '<'];
 
 	const handleInput = (value) => {
@@ -84,7 +83,7 @@
 			} else if (value !== '<' && parseInt(amountSats + value) > sats) {
 				warning($t('user.receive.lessThan1BTCWarning'));
 			} else {
-				amountSats = parseInt(amountSats + value);
+				amount = parseInt(amount.toString() + value);
 			}
 		}
 	};
@@ -178,7 +177,7 @@
 				/>
 			</div>
 			<div class="mt-2">
-				<span class="text-secondary mr-1">{fiat ? amountSatsConverted : amountFiatConverted}</span>
+				<span class="text-secondary mr-1">{fiat ? sat(amount) : f(amountFiat, currency)}</span>
 				<button
 					type="button"
 					on:click={() => {
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index 085271fd..d6cf3984 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -5,7 +5,7 @@ export async function load({ cookies, params, parent, url }) {
 	let { pubkey } = subject;
 	let { since = 0 } = params;
 
-  let messages, invoices, sent, received;
+	let messages, invoices, sent, received;
 	messages = invoices = sent = received = [];
 
 	if (user) {
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 6b216cb3..96d5cab7 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -20,6 +20,8 @@
 		if (form?.message.includes('pin')) $pin = undefined;
 		loading = false;
 	};
+
+	let max = () => (amount = balance);
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
@@ -37,6 +39,7 @@
 		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.sendTo')}</h1>
 		<p class="text-lg text-secondary">{address}</p>
 	</div>
+
 	<Numpad bind:amount {currency} {submit} />
 
 	<form method="POST" use:enhance on:submit={toggle}>
-- 
cgit v1.2.3


From dd94f1ee35e2204a27975846a990a2fa6dc629a3 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 21 Feb 2023 16:46:14 -0800
Subject: react to amount changes

---
 src/lib/parse.js                                      | 0
 src/routes/(app)/send/lightning/[payreq]/+page.svelte | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 src/lib/parse.js

(limited to 'src')

diff --git a/src/lib/parse.js b/src/lib/parse.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index e9502636..01f1d1c1 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -13,10 +13,11 @@
 	let { alias } = data;
 
 	let { currency } = data.user;
-	let amount = form?.amount || data.amount;
 	let a;
 	let maxfee = 100;
 
+	$: amount = form?.amount || data.amount;
+
 	let loading;
 	let submit = () => (loading = true);
 	$: update(form);
-- 
cgit v1.2.3


From f9d76e8846c27d9eeb3959c3b77d91d9e444bcc0 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 21 Feb 2023 17:05:30 -0800
Subject: max send button

---
 src/components/Numpad.svelte                       | 30 ++++++++++++----------
 .../bitcoin/[address]/[...amount]/+page.svelte     | 27 +++++++++++++------
 2 files changed, 35 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 3647914e..47bd9375 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -57,7 +57,7 @@
 					amountFiat = amountFiat.slice(0, amountFiat.length - 1);
 					if (amountFiat.length === 0) {
 						amountFiat = 0;
-						amountSats = 0;
+						amount = 0;
 					}
 				}
 			} else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > $selectedRate) {
@@ -70,25 +70,27 @@
 		} else {
 			if (value === '.') {
 				return;
-			} else if (!amountSats && value !== '<' && value !== '0') {
-				amountSats = parseInt(value);
+			} else if (!amount && value !== '<' && value !== '0') {
+				amount = parseInt(value);
 			} else if (value === '<') {
-				if (amountSats !== 0) {
-					amountSats = Math.floor(amountSats / 10);
-					if (amountSats.length === 0) {
-						amountSats = 0;
+				if (amount !== 0) {
+					amount = Math.floor(amount / 10);
+					if (amount.length === 0) {
+						amount = 0;
 						amountFiat = 0;
 					}
 				}
-			} else if (value !== '<' && parseInt(amountSats + value) > sats) {
+			} else if (value !== '<' && parseInt(amount + value) > sats) {
 				warning($t('user.receive.lessThan1BTCWarning'));
 			} else {
+				console.log('CLICK', amount.toString(), value);
 				amount = parseInt(amount.toString() + value);
+				console.log('AMOUNT', amount);
 			}
 		}
 	};
 
-	$: html = fiat ? amountFiat : s(amountSats);
+	$: html = fiat ? amountFiat : s(amount);
 
 	let prev = '';
 
@@ -123,10 +125,10 @@
 		if (fiat) {
 			amountFiat = html;
 		} else {
-			amountSats = parseInt(html.replace(/,/g, ''));
+			amount = parseInt(html.replace(/,/g, ''));
 		}
 
-		if (!amountSats) amountSats = null;
+		if (!amount) amount = null;
 
 		setTimeout(() => {
 			if (!fiat) {
@@ -182,11 +184,11 @@
 					type="button"
 					on:click={() => {
 						if (fiat) {
-							amountSats = parseInt((amountFiat / ($selectedRate / sats)).toFixed(0));
+							amount = parseInt((amountFiat / ($selectedRate / sats)).toFixed(0));
 						} else {
 							amountFiat =
-								(amountSats * ($selectedRate / sats)).toFixed(2) > 0.0
-									? (amountSats * ($selectedRate / sats)).toFixed(2)
+								(amount * ($selectedRate / sats)).toFixed(2) > 0.0
+									? (amount * ($selectedRate / sats)).toFixed(2)
 									: 0;
 						}
 						fiat = !fiat;
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 96d5cab7..cabe895f 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -3,15 +3,16 @@
 	import { enhance } from '$app/forms';
 	import { Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
+	import { back, s, sat } from '$lib/utils';
 	import { pin } from '$lib/store';
 
 	export let data;
 	export let form;
 
 	let { address, amount } = $page.params;
-	let { currency } = data.user;
+	let { balance, currency } = data.user;
 	let loading, submit;
+	let fiat;
 
 	let toggle = () => (loading = true);
 
@@ -21,7 +22,10 @@
 		loading = false;
 	};
 
-	let max = () => (amount = balance);
+	let max = () => {
+    fiat = false;
+		amount = balance;
+	};
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
@@ -34,13 +38,13 @@
 	</div>
 {/if}
 
-<div class="container px-4 mt-20 max-w-xl mx-auto">
+<div class="container px-4 mt-20 max-w-xl mx-auto space-y-5">
 	<div class="text-center mb-8">
-		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.sendTo')}</h1>
+		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.send')}</h1>
 		<p class="text-lg text-secondary">{address}</p>
 	</div>
 
-	<Numpad bind:amount {currency} {submit} />
+	<Numpad bind:amount bind:fiat {currency} {submit} />
 
 	<form method="POST" use:enhance on:submit={toggle}>
 		<input name="ts" value={Date.now()} type="hidden" />
@@ -48,11 +52,18 @@
 		<input name="amount" value={amount} type="hidden" />
 		<input name="pin" value={$pin} type="hidden" />
 
-		<div class="flex w-full">
+		<div class="flex justify-center gap-2">
+			<button
+				type="button"
+				class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
+				on:click|preventDefault={max}
+				on:keydown={max}>Max ⚡️{s(balance)}</button
+			>
+
 			<button
 				bind:this={submit}
 				type="submit"
-				class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
+				class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-24"
 				disabled={loading}
 			>
 				{#if loading}
-- 
cgit v1.2.3


From 6c97cdad982687fe336d63888bfa66997c9ac48d Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 22 Feb 2023 19:39:47 -0800
Subject: fix default lnurlp amount

---
 src/components/Lnurlp.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte
index 22364fcf..923441a4 100644
--- a/src/components/Lnurlp.svelte
+++ b/src/components/Lnurlp.svelte
@@ -8,7 +8,7 @@
 	let { currency } = data.user;
 	let { minSendable, maxSendable, callback, metadata } = data;
 
-	let amount = minSendable,
+	let amount = Math.round(minSendable/1000),
 		loading;
 	let submit = () => (loading = true);
 </script>
-- 
cgit v1.2.3


From c1c019beae03bbebde70557e1d0a9e064a48927c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 00:29:33 -0800
Subject: fix amount display bug

---
 src/routes/(app)/send/user/[username]/[...amount]/+page.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index 9704e3c6..f861c90d 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -16,10 +16,11 @@
 	let amount = form?.amount || data.amount;
 	let a,
 		af,
-		amountFiat = amount * ($selectedRate / sats),
 		fiat = !amount,
 		hash;
 
+	$: amountFiat = amount * ($selectedRate / sats);
+
 	let setAmount = async () => {
 		amount = a;
 		amountFiat = af;
-- 
cgit v1.2.3


From 50b270db6fda60b5b3e39a9dbada5c27a14cbad1 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 22 Feb 2023 19:38:55 -0800
Subject: fee slider wip

---
 doc/img/translate_github.png                       | Bin 78506 -> 78512 bytes
 src/components/Slider.svelte                       |  56 +++++++++++++++++
 src/components/index.js                            |   1 +
 src/lib/utils.js                                   |   5 ++
 .../[username]/(profile)/request/+page.server.js   |   6 +-
 .../[username]/invoice/[hash]/tip/+page.svelte     |  57 +----------------
 .../[username]/settings/[...tab]/+page.server.js   |   4 +-
 src/routes/(app)/ln/[lnurl]/+page.server.js        |   9 +--
 src/routes/(app)/login/+page.server.js             |   4 +-
 .../(app)/pot/[name]/withdraw/+page.server.js      |   5 +-
 src/routes/(app)/register/+page.server.js          |   4 +-
 .../bitcoin/[address]/[...amount]/+page.server.js  |  18 +++---
 .../bitcoin/[address]/[...amount]/+page.svelte     |  70 ++++++++++++++++-----
 src/routes/(app)/send/invoice/[id]/+page.server.js |   4 +-
 .../(app)/send/lightning/[payreq]/+page.server.js  |   4 +-
 .../send/pot/[name]/[...amount]/+page.server.js    |   2 +-
 .../user/[username]/[...amount]/+page.server.js    |   4 +-
 src/routes/(app)/support/+page.server.js           |   5 +-
 static/tickets/21.png                              | Bin 327907 -> 327913 bytes
 19 files changed, 152 insertions(+), 106 deletions(-)
 create mode 100644 src/components/Slider.svelte

(limited to 'src')

diff --git a/doc/img/translate_github.png b/doc/img/translate_github.png
index 22e33174..021ad5cb 100644
Binary files a/doc/img/translate_github.png and b/doc/img/translate_github.png differ
diff --git a/src/components/Slider.svelte b/src/components/Slider.svelte
new file mode 100644
index 00000000..84482c9d
--- /dev/null
+++ b/src/components/Slider.svelte
@@ -0,0 +1,56 @@
+<script>
+	export let value,
+		handle,
+		min = 0,
+		max = 100;
+</script>
+
+<input
+	id="slider"
+	type="range"
+	{min}
+	{max}
+ bind:value={value}
+	class="px-0 py-0 my-5"
+	style="--bgPercent: {(value - min) * 100/(max - min)}%;"
+	on:input={handle}
+/>
+
+<style>
+	#slider {
+		-webkit-appearance: none;
+		width: 100%;
+		height: 6px;
+		border-radius: 5px;
+		background: linear-gradient(
+			to right,
+			black 0%,
+			black var(--bgPercent),
+			#f5f7fa var(--bgPercent),
+			#f5f7fa 100%
+		);
+		outline: none;
+	}
+
+	#slider:active {
+		background-color: black;
+	}
+
+	#slider::-webkit-slider-thumb {
+		-webkit-appearance: none;
+		appearance: none;
+		width: 30px;
+		height: 30px;
+		border-radius: 50%;
+		background: black;
+		cursor: pointer;
+	}
+
+	#slider::-moz-range-thumb {
+		width: 30px;
+		height: 30px;
+		border-radius: 50%;
+		background: black;
+		cursor: pointer;
+	}
+</style>
diff --git a/src/components/index.js b/src/components/index.js
index ab54e09f..0d1d8d1d 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,3 +1,4 @@
+export { default as Slider } from './Slider.svelte';
 export { default as Pinpad } from './Pinpad.svelte';
 export { default as Balance } from './Balance.svelte';
 export { default as Lnurlp } from './Lnurlp.svelte';
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 86f722b9..1d064c9a 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -148,6 +148,11 @@ export const login = async (user, cookies) => {
 export const auth = (cookies) => ({ authorization: `Bearer ${cookies.get('token')}` });
 
 export const fiat = (amount, rate) => (amount * rate) / sats;
+export const fd = async (req) => {
+	let obj = Object.fromEntries(await req.formData());
+	for (let k in obj) (obj[k] === 'undefined' && (obj[k] = undefined)) ||( obj[k] === 'false' && (obj[k] = false));
+	return obj;
+};
 
 export const f = (s, currency) =>
 	new Intl.NumberFormat('en-US', {
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.server.js b/src/routes/(app)/[username]/(profile)/request/+page.server.js
index 2c1d6bde..e7ad6a8f 100644
--- a/src/routes/(app)/[username]/(profile)/request/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/request/+page.server.js
@@ -1,15 +1,15 @@
 import { redirect } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { fd, auth, post } from '$lib/utils';
 
 export const actions = {
 	create: async ({ cookies, params, request, url }) => {
-		let form = Object.fromEntries(await request.formData());
+		let form = await fd(request);
 		let { id, requester } = await post('/requests', form, auth(cookies));
 		throw redirect(307, `/${params.username}/request/${id}`);
 	},
 
 	delete: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
+		let form = await fd(request);
 		let r = await post('/requests/delete', form, auth(cookies));
 	}
 };
diff --git a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte
index d033c413..296ef9c6 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/tip/+page.svelte
@@ -3,7 +3,7 @@
 	import { browser } from '$app/environment';
 	import { invoice as inv, request } from '$lib/store';
 	import { copy, focus, f, sat, get, reverseFormat, s, sats } from '$lib/utils';
-	import { Icon } from '$comp';
+	import { Icon, Slider } from '$comp';
 	import { goto } from '$app/navigation';
 	import { t } from '$lib/translations';
 	import { enhance } from '$app/forms';
@@ -37,9 +37,6 @@
 			customInput.value = '';
 		}
 		tipPercent = e.target.value;
-
-		clearTimeout(timeout);
-		timeout = setTimeout(update, 800);
 	};
 
 	let submitting;
@@ -56,10 +53,6 @@
 	};
 
 	let submit;
-	let update = async () => {
-		await tick();
-		//submit.click();
-	};
 
 	export let data;
 	$: refresh(data);
@@ -123,16 +116,7 @@
 		{#if !showCustomAmount}
 			<div class="my-2 text-xl">{Math.round(tipPercent)}%</div>
 
-			<input
-				id="slider"
-				type="range"
-				min="0"
-				max="100"
-				value={tipPercent}
-				class="px-0 py-0 my-5"
-				style="--bgPercent: {tipPercent}%;"
-				on:input={handleSlide}
-			/>
+			<Slider handle={handleSlide} bind:value={tipPercent} />
 
 			<div class="flex mb-8 text-lg">
 				<div>
@@ -201,43 +185,6 @@
 </div>
 
 <style>
-	#slider {
-		-webkit-appearance: none;
-		width: 100%;
-		height: 6px;
-		border-radius: 5px;
-		background: linear-gradient(
-			to right,
-			black 0%,
-			black var(--bgPercent),
-			#f5f7fa var(--bgPercent),
-			#f5f7fa 100%
-		);
-		outline: none;
-	}
-
-	#slider:active {
-		background-color: black;
-	}
-
-	#slider::-webkit-slider-thumb {
-		-webkit-appearance: none;
-		appearance: none;
-		width: 30px;
-		height: 30px;
-		border-radius: 50%;
-		background: black;
-		cursor: pointer;
-	}
-
-	#slider::-moz-range-thumb {
-		width: 30px;
-		height: 30px;
-		border-radius: 50%;
-		background: black;
-		cursor: pointer;
-	}
-
 	.active {
 		@apply !bg-black !text-white;
 	}
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index e833a102..4e80a5ad 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -1,5 +1,5 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { auth, get, post } from '$lib/utils';
+import { fd, auth, get, post } from '$lib/utils';
 
 export function load({ params, url }) {
 	if (url.pathname.endsWith('settings')) throw redirect(307, url.pathname + '/account');
@@ -8,7 +8,7 @@ export function load({ params, url }) {
 
 export const actions = {
 	default: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
+		let form = await fd(request);
 		form.prompt = form.prompt === 'on';
 		let user = { ...(await get('/me', auth(cookies))), ...form };
 
diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.js b/src/routes/(app)/ln/[lnurl]/+page.server.js
index a12b063c..8269782a 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.server.js
+++ b/src/routes/(app)/ln/[lnurl]/+page.server.js
@@ -1,4 +1,4 @@
-import { auth, get, post } from '$lib/utils';
+import { fd, auth, get, post } from '$lib/utils';
 import { error, fail, redirect } from '@sveltejs/kit';
 
 export async function load({ params, parent }) {
@@ -24,10 +24,7 @@ export const actions = {
 	pay: async ({ cookies, fetch, request }) => {
 		let error;
 
-		let { callback, amount, minSendable, maxSendable } = Object.fromEntries(
-			await request.formData()
-		);
-
+		let { callback, amount, minSendable, maxSendable } = await fd(request);
 		minSendable = Math.round(minSendable / 1000);
 		maxSendable = Math.round(maxSendable / 1000);
 
@@ -43,7 +40,7 @@ export const actions = {
 		let error;
 
 		let { callback, amount, username, currency, minWithdrawable, maxWithdrawable, k1 } =
-			Object.fromEntries(await request.formData());
+			await fd(request);
 
 		minWithdrawable = Math.round(minWithdrawable / 1000);
 		maxWithdrawable = Math.round(maxWithdrawable / 1000);
diff --git a/src/routes/(app)/login/+page.server.js b/src/routes/(app)/login/+page.server.js
index a6a7120a..67f686e0 100644
--- a/src/routes/(app)/login/+page.server.js
+++ b/src/routes/(app)/login/+page.server.js
@@ -1,5 +1,5 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { login } from '$lib/utils';
+import { login, fd } from '$lib/utils';
 
 export const load = async ({ parent }) => {
 	let { user } = await parent();
@@ -8,7 +8,7 @@ export const load = async ({ parent }) => {
 
 export const actions = {
 	default: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
+		let form = await fd(request);
 		let { username, password, token, loginRedirect } = form;
 		let user = { username, password, token };
 
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.server.js b/src/routes/(app)/pot/[name]/withdraw/+page.server.js
index ab56867d..ac33e940 100644
--- a/src/routes/(app)/pot/[name]/withdraw/+page.server.js
+++ b/src/routes/(app)/pot/[name]/withdraw/+page.server.js
@@ -1,5 +1,5 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { fd, auth, post } from '$lib/utils';
 
 export async function load({ parent }) {
 	let { user } = await parent();
@@ -8,8 +8,7 @@ export async function load({ parent }) {
 
 export const actions = {
 	default: async ({ cookies, request }) => {
-		let body = Object.fromEntries(await request.formData());
-
+		let body = await fd(request);
 		try {
 			await post('/take', body, auth(cookies));
 		} catch (e) {
diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js
index 7799d5ae..e71b2a60 100644
--- a/src/routes/(app)/register/+page.server.js
+++ b/src/routes/(app)/register/+page.server.js
@@ -1,5 +1,5 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { post, login } from '$lib/utils';
+import { fd, post, login } from '$lib/utils';
 
 export const load = async ({ parent }) => {
 	let { user } = await parent();
@@ -8,7 +8,7 @@ export const load = async ({ parent }) => {
 
 export const actions = {
 	default: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
+		let form = await fd(request);
 		let { username, password, cipher, salt, pubkey, loginRedirect } = form;
 		let user = { username, password, cipher, salt, pubkey };
 		let error;
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
index 59e9326d..7b1900cc 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
@@ -1,22 +1,26 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { auth, post, fd } from '$lib/utils';
 
 let seen = {};
 export const actions = {
 	default: async ({ cookies, request }) => {
 		try {
-			let feeRate, subtract;
-			let { address, amount, pin, ts } = Object.fromEntries(await request.formData());
-
+			let { address, amount, confirmed, feeRate, subtract, pin, stale, ts } = await await fd(request);
 			if (seen[ts]) return fail(400, { message: 'Duplicate form submission' });
-			seen[ts] = 1;
-			setTimeout(() => delete seen[ts], 30000);
 
-			let { tx } = await post(
+			let estimate = await post(
 				'/bitcoin/fee',
 				{ address, amount, feeRate, subtract },
 				auth(cookies)
 			);
+
+			let { tx } = estimate;
+
+			if (stale || !confirmed) return fail(400, estimate);
+
+			seen[ts] = 1;
+			setTimeout(() => delete seen[ts], 30000);
+
 			await post('/bitcoin/send', { pin, tx }, auth(cookies));
 		} catch (e) {
 			return fail(400, { message: e.message });
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index cabe895f..3fb7cefb 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -1,31 +1,44 @@
 <script>
+	import { tick } from 'svelte';
 	import { t } from '$lib/translations';
 	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
+	import { Slider, Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
-	import { back, s, sat } from '$lib/utils';
-	import { pin } from '$lib/store';
+	import { fiat as af, f, back, s, sat } from '$lib/utils';
+	import { pin, selectedRate } from '$lib/store';
 
 	export let data;
 	export let form;
 
 	let { address, amount } = $page.params;
 	let { balance, currency } = data.user;
-	let loading, submit;
-	let fiat;
+	let loading, submit, fiat, confirmed, feeRate, min, max, fee, stale;
 
 	let toggle = () => (loading = true);
 
 	$: update(form);
 	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
 		loading = false;
+		if (form?.message?.includes('pin')) $pin = undefined;
+		if (form) ({ min, max, feeRate, fee } = form);
+		if (feeRate) confirmed = true;
+		stale = false;
 	};
 
-	let max = () => {
-    fiat = false;
+	let setMax = () => {
+		fiat = false;
 		amount = balance;
 	};
+
+	let timeout;
+	let handle = (e) => {
+		stale = true;
+		feeRate = e.target.value;
+		clearTimeout(timeout);
+		timeout = setTimeout(() => {
+			tick().then(() => submit.click());
+		}, 200);
+	};
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
@@ -44,21 +57,44 @@
 		<p class="text-lg text-secondary">{address}</p>
 	</div>
 
-	<Numpad bind:amount bind:fiat {currency} {submit} />
+	{#if confirmed}
+		<div class="text-center">
+			<h2 class="text-2xl md:text-3xl font-semibold">
+				{f(af(amount, $selectedRate), currency)}
+			</h2>
+			<h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
+		</div>
+	{:else}
+		<Numpad bind:amount bind:fiat {currency} {submit} />
+	{/if}
 
 	<form method="POST" use:enhance on:submit={toggle}>
 		<input name="ts" value={Date.now()} type="hidden" />
 		<input name="address" value={address} type="hidden" />
 		<input name="amount" value={amount} type="hidden" />
 		<input name="pin" value={$pin} type="hidden" />
+		<input name="confirmed" value={confirmed} type="hidden" />
+		<input name="feeRate" value={feeRate} type="hidden" />
+		<input name="stale" value={stale} type="hidden" />
+
+		{#if confirmed}
+			<label>Fee rate</label>
+			{min}
+			{max}
+			{fee}
+			<div class="text-lg text-center -mb-2 text-secondary">{feeRate} sats/kb</div>
+			<Slider bind:value={feeRate} {handle} {min} {max} />
+		{/if}
 
 		<div class="flex justify-center gap-2">
-			<button
-				type="button"
-				class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
-				on:click|preventDefault={max}
-				on:keydown={max}>Max ⚡️{s(balance)}</button
-			>
+			{#if !confirmed}
+				<button
+					type="button"
+					class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
+					on:click|preventDefault={setMax}
+					on:keydown={setMax}>Max ⚡️{s(balance)}</button
+				>
+			{/if}
 
 			<button
 				bind:this={submit}
@@ -68,8 +104,10 @@
 			>
 				{#if loading}
 					<Spinner />
-				{:else}
+				{:else if confirmed}
 					{$t('payments.send')}
+				{:else}
+					{$t('payments.next')}
 				{/if}
 			</button>
 		</div>
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js
index 2df19985..0ae097af 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.js
@@ -1,5 +1,5 @@
 import { error, fail, redirect } from '@sveltejs/kit';
-import { btc as asset, auth, get, post } from '$lib/utils';
+import { fd, btc as asset, auth, get, post } from '$lib/utils';
 
 export async function load({ params: { id }, parent }) {
 	let { user } = await parent();
@@ -13,7 +13,7 @@ export async function load({ params: { id }, parent }) {
 export const actions = {
 	default: async ({ cookies, params: { hash }, request }) => {
 		try {
-			let body = Object.fromEntries(await request.formData());
+			let body = await fd(request);
 			let { confirmed } = body;
 			body.amount = parseInt(body.amount);
 			body.hash = hash;
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index 90e6c0cc..e9e2b12a 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -7,12 +7,12 @@ export async function load({ params }) {
 
 export const actions = {
 	setAmount: async ({ cookies, request }) => {
-		return Object.fromEntries(await request.formData());
+		return await fd(request);
 	},
 
 	send: async ({ cookies, request }) => {
 		try {
-			let body = Object.fromEntries(await request.formData());
+			let body = await fd(request);
 			let { amount, confirmed } = body;
 
 			if (!confirmed) {
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
index 0e1b7f5b..6c11811c 100644
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
@@ -3,7 +3,7 @@ import { auth, post } from '$lib/utils';
 
 export const actions = {
 	default: async ({ cookies, request }) => {
-		let body = Object.fromEntries(await request.formData());
+		let body = await fd(request);
 		let p;
 
 		try {
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
index 42b47c8f..40c2d919 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
@@ -1,5 +1,5 @@
 import { error, fail, redirect } from '@sveltejs/kit';
-import { btc as asset, auth, get, post } from '$lib/utils';
+import { fd, btc as asset, auth, get, post } from '$lib/utils';
 
 export async function load({ params, parent }) {
 	let { user } = await parent();
@@ -12,7 +12,7 @@ export async function load({ params, parent }) {
 export const actions = {
 	default: async ({ cookies, request }) => {
 		try {
-			let body = Object.fromEntries(await request.formData());
+			let body = await fd(request);
 			let { amount, confirmed } = body;
 			amount = parseInt(amount);
 
diff --git a/src/routes/(app)/support/+page.server.js b/src/routes/(app)/support/+page.server.js
index 5d3bf988..6d0af616 100644
--- a/src/routes/(app)/support/+page.server.js
+++ b/src/routes/(app)/support/+page.server.js
@@ -1,10 +1,9 @@
-import { post } from '$lib/utils';
+import { fd, post } from '$lib/utils';
 import { fail } from '@sveltejs/kit';
 
 export const actions = {
 	default: async ({ cookies, request }) => {
-		let form = Object.fromEntries(await request.formData());
-
+		let form = await fd(request);
 		try {
 			await post('/email', form);
 		} catch (e) {
diff --git a/static/tickets/21.png b/static/tickets/21.png
index 3863d45e..38ebf48b 100644
Binary files a/static/tickets/21.png and b/static/tickets/21.png differ
-- 
cgit v1.2.3


From 8d40a185b8fac10e0819b562f8acd6b014d01be5 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 01:44:37 -0800
Subject: fee slider

---
 src/components/Lnurlp.svelte                       |  2 +-
 src/components/Slider.svelte                       |  4 +--
 src/lib/utils.js                                   |  3 +-
 src/routes/(app)/ln/[lnurl]/+page.server.js        |  5 ++--
 .../bitcoin/[address]/[...amount]/+page.server.js  |  4 ++-
 .../bitcoin/[address]/[...amount]/+page.svelte     | 32 ++++++++++++----------
 6 files changed, 29 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte
index 923441a4..ab0c50ce 100644
--- a/src/components/Lnurlp.svelte
+++ b/src/components/Lnurlp.svelte
@@ -8,7 +8,7 @@
 	let { currency } = data.user;
 	let { minSendable, maxSendable, callback, metadata } = data;
 
-	let amount = Math.round(minSendable/1000),
+	let amount = Math.round(minSendable / 1000),
 		loading;
 	let submit = () => (loading = true);
 </script>
diff --git a/src/components/Slider.svelte b/src/components/Slider.svelte
index 84482c9d..3c94d127 100644
--- a/src/components/Slider.svelte
+++ b/src/components/Slider.svelte
@@ -10,9 +10,9 @@
 	type="range"
 	{min}
 	{max}
- bind:value={value}
+	bind:value
 	class="px-0 py-0 my-5"
-	style="--bgPercent: {(value - min) * 100/(max - min)}%;"
+	style="--bgPercent: {((value - min) * 100) / (max - min)}%;"
 	on:input={handle}
 />
 
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 1d064c9a..7b10c638 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -150,7 +150,8 @@ export const auth = (cookies) => ({ authorization: `Bearer ${cookies.get('token'
 export const fiat = (amount, rate) => (amount * rate) / sats;
 export const fd = async (req) => {
 	let obj = Object.fromEntries(await req.formData());
-	for (let k in obj) (obj[k] === 'undefined' && (obj[k] = undefined)) ||( obj[k] === 'false' && (obj[k] = false));
+	for (let k in obj)
+		(obj[k] === 'undefined' && (obj[k] = undefined)) || (obj[k] === 'false' && (obj[k] = false));
 	return obj;
 };
 
diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.js b/src/routes/(app)/ln/[lnurl]/+page.server.js
index 8269782a..ddd714bf 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.server.js
+++ b/src/routes/(app)/ln/[lnurl]/+page.server.js
@@ -39,8 +39,9 @@ export const actions = {
 	withdraw: async ({ cookies, fetch, request }) => {
 		let error;
 
-		let { callback, amount, username, currency, minWithdrawable, maxWithdrawable, k1 } =
-			await fd(request);
+		let { callback, amount, username, currency, minWithdrawable, maxWithdrawable, k1 } = await fd(
+			request
+		);
 
 		minWithdrawable = Math.round(minWithdrawable / 1000);
 		maxWithdrawable = Math.round(maxWithdrawable / 1000);
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
index 7b1900cc..6fbe9c7c 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
@@ -5,7 +5,9 @@ let seen = {};
 export const actions = {
 	default: async ({ cookies, request }) => {
 		try {
-			let { address, amount, confirmed, feeRate, subtract, pin, stale, ts } = await await fd(request);
+			let { address, amount, confirmed, feeRate, subtract, pin, stale, ts } = await await fd(
+				request
+			);
 			if (seen[ts]) return fail(400, { message: 'Duplicate form submission' });
 
 			let estimate = await post(
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 3fb7cefb..d283ae7f 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -51,11 +51,10 @@
 	</div>
 {/if}
 
-<div class="container px-4 mt-20 max-w-xl mx-auto space-y-5">
-	<div class="text-center mb-8">
-		<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.send')}</h1>
-		<p class="text-lg text-secondary">{address}</p>
-	</div>
+<div class="container px-4 mt-20 max-w-xl mx-auto space-y-5 text-center">
+	<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.send')}</h1>
+
+	<div class="text-lg text-secondary">{address}</div>
 
 	{#if confirmed}
 		<div class="text-center">
@@ -64,6 +63,14 @@
 			</h2>
 			<h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
 		</div>
+
+		<div class="text-center">
+			<h2 class="text-secondary mb-5 text-lg">with fee</h2>
+			<h2 class="text-xl font-semibold">
+				{f(af(fee, $selectedRate), currency)}
+			</h2>
+			<h3 class="text-secondary mb-6 mt-1">{sat(fee)}</h3>
+		</div>
 	{:else}
 		<Numpad bind:amount bind:fiat {currency} {submit} />
 	{/if}
@@ -78,12 +85,11 @@
 		<input name="stale" value={stale} type="hidden" />
 
 		{#if confirmed}
-			<label>Fee rate</label>
-			{min}
-			{max}
-			{fee}
-			<div class="text-lg text-center -mb-2 text-secondary">{feeRate} sats/kb</div>
-			<Slider bind:value={feeRate} {handle} {min} {max} />
+			<div class="relative mb-5">
+				<div class="absolute top-5 left-0 text-secondary">Slower (~40 blocks)</div>
+				<div class="absolute top-5 right-0 text-secondary">Faster (~1 block)</div>
+				<Slider bind:value={feeRate} {handle} {min} {max} />
+			</div>
 		{/if}
 
 		<div class="flex justify-center gap-2">
@@ -102,9 +108,7 @@
 				class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-24"
 				disabled={loading}
 			>
-				{#if loading}
-					<Spinner />
-				{:else if confirmed}
+				{#if confirmed}
 					{$t('payments.send')}
 				{:else}
 					{$t('payments.next')}
-- 
cgit v1.2.3


From 520634dda03e242238243035948158372f3d0c37 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 02:27:36 -0800
Subject: subtract fee toggle

---
 .../send/bitcoin/[address]/[...amount]/+page.svelte    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index d283ae7f..0a6733de 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -2,7 +2,7 @@
 	import { tick } from 'svelte';
 	import { t } from '$lib/translations';
 	import { enhance } from '$app/forms';
-	import { Slider, Icon, Numpad, Spinner } from '$comp';
+	import { Toggle, Slider, Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
 	import { fiat as af, f, back, s, sat } from '$lib/utils';
 	import { pin, selectedRate } from '$lib/store';
@@ -12,7 +12,7 @@
 
 	let { address, amount } = $page.params;
 	let { balance, currency } = data.user;
-	let loading, submit, fiat, confirmed, feeRate, min, max, fee, stale;
+	let loading, submit, fiat, confirmed, feeRate, min, max, fee, stale, subtract;
 
 	let toggle = () => (loading = true);
 
@@ -20,7 +20,7 @@
 	let update = () => {
 		loading = false;
 		if (form?.message?.includes('pin')) $pin = undefined;
-		if (form) ({ min, max, feeRate, fee } = form);
+		if (form) ({ min, max, feeRate, fee, subtract } = form);
 		if (feeRate) confirmed = true;
 		stale = false;
 	};
@@ -28,8 +28,11 @@
 	let setMax = () => {
 		fiat = false;
 		amount = balance;
+		subtract = true;
 	};
 
+	$: if (amount + fee > balance) subtract = true;
+
 	let timeout;
 	let handle = (e) => {
 		stale = true;
@@ -83,13 +86,20 @@
 		<input name="confirmed" value={confirmed} type="hidden" />
 		<input name="feeRate" value={feeRate} type="hidden" />
 		<input name="stale" value={stale} type="hidden" />
+		<input name="subtract" value={subtract} type="hidden" />
 
 		{#if confirmed}
-			<div class="relative mb-5">
+			<div class="relative mt-10 mb-20">
 				<div class="absolute top-5 left-0 text-secondary">Slower (~40 blocks)</div>
 				<div class="absolute top-5 right-0 text-secondary">Faster (~1 block)</div>
 				<Slider bind:value={feeRate} {handle} {min} {max} />
 			</div>
+			<div class="flex justify-center gap-2 mb-10">
+				<div class="my-auto">
+					<Toggle id="subtract" checked={subtract} bind:value={subtract} />
+				</div>
+				<label for="subtract" class="text-secondary text-lg my-auto mb-2">taken from amount</label>
+			</div>
 		{/if}
 
 		<div class="flex justify-center gap-2">
-- 
cgit v1.2.3


From 20624c0911c40b9d2e51f2a909a8fd9e10ab1650 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 09:15:18 -0800
Subject: remove confirmation for internal payments

---
 src/routes/(app)/send/user/[username]/[...amount]/+page.server.js | 6 +-----
 src/routes/(app)/send/user/[username]/[...amount]/+page.svelte    | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
index 40c2d919..ad0219e0 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
@@ -13,13 +13,9 @@ export const actions = {
 	default: async ({ cookies, request }) => {
 		try {
 			let body = await fd(request);
-			let { amount, confirmed } = body;
+			let { amount } = body;
 			amount = parseInt(amount);
 
-			if (!confirmed) {
-				return fail(400, { amount, confirm: true });
-			}
-
 			await post('/payments', body, auth(cookies));
 		} catch (e) {
 			console.log(e);
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index f861c90d..74da1fa8 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -40,7 +40,7 @@
 
 	$: update(form);
 	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
+		if (form?.message?.includes('pin')) $pin = undefined;
 		loading = false;
 	};
 </script>
@@ -69,7 +69,6 @@
 	<form method="POST" use:enhance on:submit={submit}>
 		<input name="amount" value={amount} type="hidden" />
 		<input name="username" value={subject.username} type="hidden" />
-		<input name="confirmed" value={form?.confirm} type="hidden" />
 		<input name="pin" value={$pin} type="hidden" />
 		<input name="hash" value={hash} type="hidden" />
 
-- 
cgit v1.2.3


From 182b8422ff7acff16053065a132b2e64aefc03c6 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 09:24:13 -0800
Subject: spanish fixes

---
 src/locales/es.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/locales/es.json b/src/locales/es.json
index e151ec1a..a4ca1404 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -4,7 +4,7 @@
 		"pageNotFound": "La página no existe."
 	},
 	"about": {
-		"header": "Sobre",
+		"header": "Nosotros",
 		"p1": "coinos es una aplicación de código abierto para pagos con bitcoin. Su desarrollo comezó en Vancouver allá por Septiembre de 2012 como una solución para que comerciantes locales puedan aceptar pagos con bitcoin.",
 		"p3": "Si lo desea, puede descargar el código fuente de Coinos para ejecutar su propia instancia y tenerla conectada a sus propios nodos bitcoin y lightning. Estaremos encantados de ayudarle a en un proveedor de pagos y en un custodio benevolente para su comunidad.",
 		"p4": "Las transferencias entre cuentas de usuario en nuestro servidor son realizadas off-chain, esto hace que sean instantáneas, ilimitadas, y gratuitas.",
@@ -39,7 +39,7 @@
 			"john": {
 				"name": "John Barratt",
 				"position": "Desarrollador web Full Stack",
-				"bio": "Cuando no está programando, John puede ser encontrado en el bosque recorriendo todos los grandes senderos que Colombia Británica tiene para ofrecer."
+				"bio": "Cuando no está programando, John puede ser encontrado en el bosque recorriendo todos los grandes senderos que Columbia Británica tiene para ofrecer."
 			}
 		},
 		"locations": {
@@ -53,10 +53,10 @@
 		"signIn": "Por favor inicie sesión para continuar."
 	},
 	"faq": {
-		"header": "PMF",
+		"header": "Preguntas frecuentes",
 		"cost": {
 			"question": "Cuanto cuesta?",
-			"answer": "Coinos es gratis. No hay costos de registro ni mantenimiento. Puede enviar y recibir pagos de forma ilimitada por medio de Lightning Network sin costo alguno. Sin embargo, si quieres tus fondos hacia  una dirección de bitcoin on-chain existe una tarifa del 0,1%."
+			"answer": "Coinos es gratis. No hay costos de registro ni mantenimiento. Puede enviar y recibir pagos de forma ilimitada por medio de Lightning Network sin costo alguno. Sin embargo, si quieres enviar tus fondos hacia una dirección de bitcoin on-chain existe una tarifa del 0,1%."
 		},
 		"compatibility": {
 			"question": "Necesito un dispositivo o software especial?",
-- 
cgit v1.2.3


From 5ab5395ae6ab515fdfb23866bdae8c727e070521 Mon Sep 17 00:00:00 2001
From: Jean Roulin <jroulin@protonmail.com>
Date: Tue, 21 Feb 2023 19:56:01 +0100
Subject: fix fr locale

---
 src/locales/fr.json | 84 ++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

(limited to 'src')

diff --git a/src/locales/fr.json b/src/locales/fr.json
index bc9c9d66..5fcb95ab 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -6,8 +6,8 @@
 	"about": {
 		"header": "À Propos",
 		"p1": "<strong>coinos</strong> est un portefeuille, point de vente, marché d'e-commerce et plateforme d'échange de bitcoin <strong>open source</strong>. Development a commencé en Vancouver le septembre de 2012 pour donner aux marchands du coin un façon pratique d'accepter des paiements en bitcoin.",
-		"p2": "Il a eu plus de fonctions au fil des ans pour satisfaire une grande variété de cas d'utilisation avec le but de rendre commencer utiliser bitcoin rapidement, à bas prix, et en sécurité aussi façile que possible pour n'importe qui.",
-		"p3": "Tout le monde peux télécharger le code source et héberger leur propre instance de la plateforme soutenu par leur propres nœuds de bitcoin, liquid ou lightning, ou contactez-nous et nous l'installalons pour vous avec plaisir.",
+		"p2": "Il a eu plus de fonctions au fil des ans pour satisfaire une grande variété de cas d'utilisation dans le but de pouvoir utiliser bitcoin rapidement, à bas prix, et en sécurité aussi façile que possible pour n'importe qui.",
+		"p3": "Tout le monde peux télécharger le code source et héberger leur propre instance de la plateforme soutenue par leur propres nœuds de bitcoin, liquid ou lightning, ou contactez-nous et nous l'installerons pour vous avec plaisir.",
 		"locations": {
 			"header": "Établissements",
 			"description": "Il y a des entreprises qui acceptent bitcoin utilisant le point de vente coinos. Si vous utilisez notre appli, s'il vous plait <a href=\"mailto:contact@coinos.io\" class=\"underline underline-offset-4\">fais-le-nous savoir!</a>"
@@ -17,12 +17,12 @@
 			"adam": {
 				"name": "Adam Soltys",
 				"position": "Officier Technique Principal",
-				"bio": "Adam est programmeur de web et passionné de bitcoin.  Il croit que l'argent sûr est clé à augmenter la prospérité planétaire.  Il habite en Vancouver de Nord avec sa femme Chelsea et deux enfants."
+				"bio": "Adam est développeur web et passionné de bitcoin.  Il croit que l'argent sûr est la clé pour augmenter la prospérité planétaire.  Il habite en Vancouver de Nord avec sa femme Chelsea et deux enfants."
 			},
 			"secondl1ght": {
 				"name": "secondl1ght",
-				"position": "Programmeur de Web",
-				"bio": "Secondl1ght est un programmeur de web autodidacte.  Il a découvert bitcoin et quitté son job de monnaie fiduciaire pour développer bitcoin à temps plein.  Il contribue aux projets open source, est défenseur d'intimité, et il aime la liberté."
+				"position": "Développeur Web",
+				"bio": "Secondl1ght est un développeur web autodidacte.  Il a découvert bitcoin et quitté son job de monnaie fiduciaire pour développer bitcoin à temps plein.  Il contribue aux projets open source, est défenseur de la vie privée, et il aime la liberté."
 			},
 			"karnage": {
 				"name": "Karnage",
@@ -32,7 +32,7 @@
 			"shauna": {
 				"name": "Shauna",
 				"position": "Gestion & Marketing",
-				"bio": "Gestion de projets et strategie.  Touche-à-tout.  Peux toujours trouver le temps pour racontrer pour café."
+				"bio": "Gestion de projets et strategie.  Touche-à-tout.  Peut toujours trouver le temps pour racontrer pour café."
 			},
 			"cole": {
 				"name": "Cole Goodwin",
@@ -41,8 +41,8 @@
 			},
 			"john": {
 				"name": "John Barratt",
-				"position": "Programmeur de Web Full-Stack",
-				"bio": "Quand il ne programme pas, vous pouvez trouver John au forêt randonnant au bonnes sentiers de Colombie-Britannique."
+				"position": "Développeur Web Full-Stack",
+				"bio": "Quand il ne programme pas, vous pouvez trouver John en forêt randonnant sur les sentiers de Colombie-Britannique."
 			}
 		}
 	},
@@ -54,16 +54,16 @@
 	"faq": {
 		"header": "FAQ",
 		"cost": {
-			"question": "Qu'est-ce que c'est le coût?",
-			"answer": "coinos est gratuit à utiliser. Vous seulment payez un prix 1% quand vous convertez vos fonds entre bitcoin, Liquid et Lightning. Comparez-ça à les frais de dossir typiques 3% des cartes credit."
+			"question": "Quel est le coût?",
+			"answer": "coinos est gratuit à utiliser. Vous payez seulment 1% quand vous convertissez vos fonds entre bitcoin, Liquid et Lightning. Comparez-ça aux frais typiques 3% des cartes de crédit."
 		},
 		"compatibility": {
-			"question": "Est-ce que j'ai besoin du logiciel ou appareil special?",
-			"answer": "Non. coinos est un site Web, alors vous pouvez l'utiliser sur n'importe quelle appareil tant que vous aves un connexion d'Internet. La plupart des marchands l'utilise sur un téléphone ou une tablette."
+			"question": "Est-ce que j'ai besoin de logiciel ou d'appareil special ?",
+			"answer": "Non. coinos est un site Web, vous pouvez donc l'utiliser sur n'importe quel appareil tant que vous aves un connexion d'Internet. La plupart des marchands l'utilise sur un téléphone ou une tablette."
 		},
 		"safety": {
-			"question": "Sont mes fonds saufs?",
-			"answer": "Vos fonds sont entreposés en notre serveur sécurisé, mais nous recommendons que vous les retirez à votre propre entreposage pour les sauvegarder à long terme."
+			"question": "Sont mes fonds saufs ?",
+			"answer": "Vos fonds sont entreposés sur notre serveur sécurisé, mais nous recommandons que vous les retiriez vers votre propre entreposage pour les sauvegarder à long terme."
 		}
 	},
 	"footer": {
@@ -77,10 +77,10 @@
 		"news": "Nouvelles"
 	},
 	"howItWorks": {
-		"header": "Comment Elle Fonctionne",
+		"header": "Comment cela Fonctionne",
 		"step1": {
-			"header": "1. Crée votre compte",
-			"description": "Un nom d'utilateur et mot de passe est tout qui est besoin pour commencer."
+			"header": "1. Créez votre compte",
+			"description": "Un nom d'utilateur et mot de passe est tout ce dont vous avez besoin pour commencer."
 		},
 		"step2": {
 			"header": "2. Demande pour des paiements",
@@ -88,46 +88,46 @@
 		},
 		"step3": {
 			"header": "3. C'est tout!",
-			"description": "Vous pouvez convertir au monnaie local n'importe quand."
+			"description": "Vous pouvez convertir en monnaie local n'importe quand."
 		}
 	},
 	"landing": {
 		"header_before_icon": "Le",
 		"header_with_icon": "façon",
-		"header_after_icon": "le plus façile d'accepter bitcoin en votre magasin.",
-		"subheader": "Aggrandir votre clientèle et chiffre d'affaires par accepter bitcoin avec un point de vente façile à utiliser et dirigé. Logiciel et matériel informatique non obligatoire.",
+		"header_after_icon": "le plus façile d'accepter bitcoin dans votre magasin.",
+		"subheader": "Agrandir votre clientèle et chiffre d'affaires en acceptant bitcoin avec un point de vente façile à utiliser et géré. Logiciel et matériel informatique non obligatoire.",
 		"info1": {
-			"title": "Paiements instants avec Lightning",
-			"description": "Le moment que votre client envoie un paiment, c'est la. Vous ne devez pas attendre pour les décisions de banques ou vous inquieter pour des rejets de débit. Décisions instant, en secondes. Dis au revoir aux frais de dossir 3% des cartes de crédit."
+			"title": "Paiements instantanés avec Lightning",
+			"description": "Le moment où votre client envoie un paiment, c'est là. Vous ne devez pas attendre les décisions des banques ou vous inquiéter pour des rejets de débit. Décisions instantanées, en secondes. Dites au revoir aux frais de transactions de 3% des cartes de crédit."
 		},
 		"info2": {
 			"title": "Simple à utiliser, en garde par défaut",
 			"description1": "Juste entrer une quantité, partager le code QR et c'est tout!",
-			"description2": "Tes contes sont en garde par défaut, qui élimine le nécessité de comprendre comment bitcoin/lightning fonctionnent. Nous réalisons le plus gros du travail pour que vous pouvez vous concentrer sur votre entreprise.",
-			"description3": "Vous toujours avez l'option de <span class=\"underline undeline-offset-4\">prendre garde</span> de vos clés."
+			"description2": "Tes comptes sont en garde par défaut, qui élimine le nécessité de comprendre comment bitcoin/lightning fonctionnent. Nous réalisons le plus gros du travail pour que vous puissiez vous concentrer sur votre entreprise.",
+			"description3": "Vous avez toujours l'option de <span class=\"underline undeline-offset-4\">gérer</span> vos clés."
 		},
 		"info3": {
-			"title": "Personalise-le comment vous voulez",
-			"description": "Personalisez votre point de vente, ou rettenez-le au défaut - c'est votre chois."
+			"title": "Personalisez-le comme vous voulez",
+			"description": "Personalisez votre point de vente, ou utilisez les réglages par défaut - c'est votre chois."
 		}
 	},
 	"login": {
 		"username": "Nom d'utilisateur",
 		"password": "Mot de passe",
 		"email": "Courriel",
-		"passwordRecommendation": "Nous recommendons un mot de passe long et au hazard, généré par un gestionnaire de mots de passe.",
-		"forgotUserOrPassword": "Oublié ton nom d'utilisateur ou mot de passe?",
-		"haveAccount": "Avez-vous déjà une conte?",
-		"noAccount": "N'avez-vous pas un conte?",
+		"passwordRecommendation": "Nous recommendons un mot de passe long et aléatoire, généré par un gestionnaire de mots de passe.",
+		"forgotUserOrPassword": "Oublié votre nom d'utilisateur ou mot de passe ?",
+		"haveAccount": "Avez-vous déjà un compte ?",
+		"noAccount": "Pas encore de compte ?",
 		"register": "Enregistrer",
 		"signIn": "Connexion",
-		"failed": "Connexion failli",
+		"failed": "Echec de Connexion",
 		"optional": "Optionnel",
-		"token": "Jeton A2F"
+		"token": "Jeton 2FA"
 	},
 	"nav": {
 		"startInSeconds": "Commence en Secondes",
-		"account": "Conte",
+		"account": "Compte",
 		"signIn": "Connexion",
 		"signOut": "Déconnexion",
 		"dashboard": "Tableau de bord",
@@ -135,7 +135,7 @@
 		"support": "Assistance",
 		"profile": "Profil"
 	},
-	"newSiteHeader": "Bienvenue à la <a href=\"/news\" class=\"underline underline-offset-4 text-black hover:opacity-80\">coinos nouvelle et amélioré</a>, concentré au marchants! Cherchez pour le dernier coinos? Visitez <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>.",
+	"newSiteHeader": "Bienvenue sur <a href=\"/news\" class=\"underline underline-offset-4 text-black hover:opacity-80\">coinos nouveau et amélioré</a>, focalisé sur les marchants! Vous cherchez l'ancien coinos? Visitez <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>.",
 	"invoice": {
 		"addTip": "Ajoutez un pourboire",
 		"addTipq": "Ajouter un pourboire?",
@@ -161,7 +161,7 @@
 			"dashboard": "Tableau de bord",
 			"accountBalance": "Solde",
 			"bitcoinPrice": "Prix de bitcoin:",
-			"conversionFeeWarning": "Il y a un prix de 1% pour convertir entre bitcoin, Liquid et Lightning.",
+			"conversionFeeWarning": "Il y a des frais de 1% pour convertir entre bitcoin, Liquid et Lightning.",
 			"dataFromBinance": "Données de <span class=\"text-black\">Binance</span>.",
 			"fetchingRate": "cherchant taut de change...",
 			"optionalNote": "Note (optionel)",
@@ -174,21 +174,21 @@
 		},
 		"receive": {
 			"lessThan1BTCWarning": "S'il vous plaît utilisez moins d'un bitcoin.",
-			"showQR": "Voire QR"
+			"showQR": "Voire le QR code"
 		},
 		"settings": {
 			"header": "Préférences",
-			"ACCOUNT": "CONTE",
+			"ACCOUNT": "COMPTE",
 			"POINT_OF_SALE": "POINT DE VENTE",
 			"SECURITY": "SÉCURITÉ",
 			"locale": "Langue",
 			"username": "Nom d'Utilisateur",
 			"email": "Courriel",
-			"newPassword": "Mot de Passe Nouveau",
+			"newPassword": "Nouveau Mot de Passe",
 			"emailNotifications": "Notifications par Courriel",
-			"emailNotificationsDescription": "Nous pouvons vous notifier par courriel quand votre conte change ou quand vous recevez des paiements",
+			"emailNotificationsDescription": "Nous pouvons vous notifier par courriel quand votre compte change ou quand vous recevez des paiements",
 			"smsNotifications": "Notifications par SMS",
-			"smsNotificationsDescription": "Nous vous envoyons des notifications par texte quand ceci est activé",
+			"smsNotificationsDescription": "Nous vous envoyons des notifications par texte quand c'est activé",
 			"theme": "Thème",
 			"themeDescription": "Sélectionnez des thèmes dèfauts.",
 			"localCurrency": "Monnaie Local",
@@ -263,13 +263,13 @@
 		"export": "Exportez",
 		"invoice": "Facture",
 		"readyToPay": "est prêt à payer",
-		"describeOrder": "Utilizer ce champ pour décrire votre commande",
+		"describeOrder": "Utiliser ce champ pour décrire votre commande",
 		"requestAnInvoice": "Demandez une facture",
 		"submit": "Soumettre",
 		"isRequesting": "demande",
 		"invoiceFrom": "Facture de",
 		"awaiting": "Attendez pour",
-		"tapAnywhere": "Tapez partout",
+		"tapAnywhere": "Tapez n'importe où",
 		"from": "de",
 		"redeem": "Échangez",
 		"redeemed": "Déjà échangé",
-- 
cgit v1.2.3


From 5dfabc9ff10d38251bfc15e4cafc9d3bb063dd10 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 12:39:50 -0800
Subject: missing import

---
 src/routes/(app)/send/lightning/[payreq]/+page.server.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index e9e2b12a..afc8e3a4 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -1,14 +1,12 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { btc as asset, auth, post } from '$lib/utils';
+import { fd, btc as asset, auth, post } from '$lib/utils';
 
 export async function load({ params }) {
 	return post('/parse', params);
 }
 
 export const actions = {
-	setAmount: async ({ cookies, request }) => {
-		return await fd(request);
-	},
+	setAmount: async ({ cookies, request }) => fd(request),
 
 	send: async ({ cookies, request }) => {
 		try {
-- 
cgit v1.2.3


From a35bef21b3b5080275f472e40bc77a3d2f216b41 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 12:41:14 -0800
Subject: remove lightning confirmation

---
 src/routes/(app)/send/lightning/[payreq]/+page.server.js | 6 +-----
 src/routes/(app)/send/lightning/[payreq]/+page.svelte    | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index afc8e3a4..02511a8f 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -11,11 +11,7 @@ export const actions = {
 	send: async ({ cookies, request }) => {
 		try {
 			let body = await fd(request);
-			let { amount, confirmed } = body;
-
-			if (!confirmed) {
-				return fail(400, { amount, confirm: true });
-			}
+			let { amount } = body;
 
 			await post('/payments', body, auth(cookies));
 		} catch (e) {
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index 01f1d1c1..af07a565 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -54,7 +54,6 @@
 		<form method="POST" use:enhance on:submit={submit} action="?/send" class="space-y-5">
 			<input name="payreq" value={payreq} type="hidden" />
 			<input name="amount" value={amount} type="hidden" />
-			<input name="confirmed" value={form?.confirm} type="hidden" />
 			<input name="pin" value={$pin} type="hidden" />
 			<input name="maxfee" value={maxfee} type="hidden" />
 
-- 
cgit v1.2.3


From 151236882849d1e0f98ababb0ab4a41008b3f44f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 14:54:01 -0800
Subject: remove invoice confirmation

---
 src/routes/(app)/send/invoice/[id]/+page.server.js | 5 -----
 src/routes/(app)/send/invoice/[id]/+page.svelte    | 1 -
 2 files changed, 6 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js
index 0ae097af..dc0d3a3d 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.js
@@ -14,14 +14,9 @@ export const actions = {
 	default: async ({ cookies, params: { hash }, request }) => {
 		try {
 			let body = await fd(request);
-			let { confirmed } = body;
 			body.amount = parseInt(body.amount);
 			body.hash = hash;
 
-			if (!confirmed) {
-				return fail(400, { amount, confirm: true });
-			}
-
 			await post('/payments', body, auth(cookies));
 		} catch (e) {
 			return fail(400, { message: e.message });
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index 27837bca..7570a61a 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -69,7 +69,6 @@
 		<input name="amount" value={amount} type="hidden" />
 		<input name="payreq" value={payreq} type="hidden" />
 		<input name="username" value={recipient.username} type="hidden" />
-		<input name="confirmed" value={form?.confirm} type="hidden" />
 		<input name="pin" value={$pin} type="hidden" />
 
 		<div class="flex w-full">
-- 
cgit v1.2.3


From 388f820bfc073efb4f66c1aa2394fa5a4b8a8709 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Feb 2023 15:47:31 -0800
Subject: show tips for sender

---
 .../[username]/invoice/[hash]/paid/+page.svelte    | 29 +++++++++++----------
 src/routes/(app)/payment/[id]/+page.svelte         | 20 ++++++++++++---
 .../bitcoin/[address]/[...amount]/+page.server.js  |  2 +-
 .../bitcoin/[address]/[...amount]/+page.svelte     | 30 +++++++++++++---------
 .../(app)/send/pot/[name]/[...amount]/+page.svelte |  2 +-
 src/routes/(app)/sent/+page.svelte                 | 26 ++++++++++++++-----
 6 files changed, 72 insertions(+), 37 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte
index 432b137a..3a281728 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte
@@ -4,7 +4,7 @@
 	import { toast } from '@zerodevx/svelte-toast';
 	import { browser } from '$app/environment';
 	import { t } from '$lib/translations';
-	import { f, s, sat, sats } from '$lib/utils';
+	import { fiat, f, s, sat, sats } from '$lib/utils';
 	import { goto } from '$app/navigation';
 
 	export let data;
@@ -12,10 +12,6 @@
 	$: data && ({ amount, currency, rate, received, pending, tip, user, id } = data.invoice);
 
 	toast.pop(0);
-
-	$: amountFiat = parseFloat((((received - tip) * rate) / sats).toFixed(2));
-	$: pendingFiat = parseFloat((((pending - tip) * rate) / sats).toFixed(2));
-	$: tipFiat = parseFloat(((tip * rate) / sats).toFixed(2));
 </script>
 
 <div class="container px-4 text-center mx-auto">
@@ -25,15 +21,20 @@
 	{#if received}
 		<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('invoice.paymentSuccessful')}</h1>
 		<h2 class="text-2xl md:text-3xl font-semibold">
-			{f(amountFiat, currency)}
+			{f(fiat(received - tip, rate), currency)}
 			{#if tip}
-				+ {f(tipFiat, currency)}
+				<span class="text-lg">
+					+ {f(fiat(tip, rate), currency)}
+				</span>
 			{/if}
 		</h2>
 		<h3 class="text-secondary md:text-lg mb-6 mt-1">
-			{sat(received - tip)}
+			⚡️{s(received - tip)}
+
 			{#if tip}
-				+{sat(tip)}
+				<span class="text-lg">
+					+ ⚡️{s(tip)}
+				</span>
 			{/if}
 		</h3>
 	{/if}
@@ -41,15 +42,17 @@
 	{#if pending}
 		<h1 class="text-3xl md:text-4xl font-bold mb-6">Payment detected</h1>
 		<h2 class="text-2xl md:text-3xl font-semibold">
-			{f(pendingFiat, currency)}
+			{f(fiat(pending, rate), currency)}
 			{#if tip}
-				+ {f(tipFiat, currency)}
+				+ {f(fiat(tip, rate), currency)}
 			{/if}
 		</h2>
 		<h3 class="text-secondary md:text-lg mb-6 mt-1">
-			{sat(pending - tip)}
+			⚡️{s(pending - tip)}
 			{#if tip}
-				+{sat(tip)}
+				<span class="text-lg">
+					+ ⚡️{s(tip)}
+				</span>
 			{/if}
 		</h3>
 	{/if}
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 2988ddb5..b8a23605 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -8,7 +8,7 @@
 	export let data;
 	let { user, payment: p } = data;
 	let { username } = user;
-	let { id, amount, created, rate, type, ref, ourfee, fee, currency } = p;
+	let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
 	let a = Math.abs(amount);
 
 	fee = fee || 0;
@@ -26,12 +26,14 @@
 	{#if p.with}
 		<div>
 			<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
+      <a href={`/${p.with.username}`}>
 			<div class="flex">
 				<div class="my-auto">
 					<Avatar user={p.with} size={20} />
 				</div>
-				<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
+				<div class="my-auto ml-1">{p.with.username}</div>
 			</div>
+      </a>
 		</div>
 	{/if}
 
@@ -39,7 +41,19 @@
 		<span class="text-lg text-secondary">Amount</span>
 		<div>
 			{f(fiat(a, rate), currency)}
-			<span class="text-secondary">⚡️{`${s(a)}`}</span>
+			{#if tip}
+        <span class="text-lg">
+				+ {f(fiat(tip, rate), currency)}
+        </span>
+			{/if}
+      <span class="text-secondary">⚡️{`${s(a)}`}
+      
+			{#if tip}
+        <span class="text-lg">
+				+ ⚡️{s(tip)}
+        </span>
+			{/if}
+      </span>
 		</div>
 	</div>
 
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
index 6fbe9c7c..92a754ae 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
@@ -23,7 +23,7 @@ export const actions = {
 			seen[ts] = 1;
 			setTimeout(() => delete seen[ts], 30000);
 
-			await post('/bitcoin/send', { pin, tx }, auth(cookies));
+			await post('/bitcoin/send', { pin, subtract, tx }, auth(cookies));
 		} catch (e) {
 			return fail(400, { message: e.message });
 		}
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 0a6733de..b3a944f4 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -4,7 +4,7 @@
 	import { enhance } from '$app/forms';
 	import { Toggle, Slider, Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
-	import { fiat as af, f, back, s, sat } from '$lib/utils';
+	import { fiat as toFiat, f, back, s, sat } from '$lib/utils';
 	import { pin, selectedRate } from '$lib/store';
 
 	export let data;
@@ -12,15 +12,17 @@
 
 	let { address, amount } = $page.params;
 	let { balance, currency } = data.user;
-	let loading, submit, fiat, confirmed, feeRate, min, max, fee, stale, subtract;
+	let loading, submit, fiat, confirmed, feeRate, min, max, fee, ourfee, stale, subtract, adjusting;
 
 	let toggle = () => (loading = true);
+	let toggleAdjusting = () => (adjusting = !adjusting);
 
 	$: update(form);
 	let update = () => {
 		loading = false;
 		if (form?.message?.includes('pin')) $pin = undefined;
-		if (form) ({ min, max, feeRate, fee, subtract } = form);
+		if (form) ({ min, max, feeRate, fee, ourfee, subtract } = form);
+    if (!ourfee) ourfee = 0;
 		if (feeRate) confirmed = true;
 		stale = false;
 	};
@@ -57,22 +59,26 @@
 <div class="container px-4 mt-20 max-w-xl mx-auto space-y-5 text-center">
 	<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.send')}</h1>
 
-	<div class="text-lg text-secondary">{address}</div>
+	<div class="text-lg text-secondary break-all">{address}</div>
 
 	{#if confirmed}
 		<div class="text-center">
 			<h2 class="text-2xl md:text-3xl font-semibold">
-				{f(af(amount, $selectedRate), currency)}
+				{f(toFiat(amount, $selectedRate), currency)}
 			</h2>
-			<h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
+			<h3 class="text-secondary md:text-lg mb-6 mt-1">⚡️{s(amount)}</h3>
 		</div>
 
 		<div class="text-center">
 			<h2 class="text-secondary mb-5 text-lg">with fee</h2>
-			<h2 class="text-xl font-semibold">
-				{f(af(fee, $selectedRate), currency)}
-			</h2>
-			<h3 class="text-secondary mb-6 mt-1">{sat(fee)}</h3>
+
+			<div class="relative">
+				<h2 class="text-xl font-semibold">
+					{f(toFiat(fee + ourfee, $selectedRate), currency)}
+				</h2>
+				<h3 class="text-secondary mb-6 mt-1">⚡️{s(fee + ourfee)}</h3>
+        <button class="absolute right-1/4 top-0 text-secondary p-4" on:click={toggleAdjusting}><Icon icon="settings" style="opacity-30" /></button>
+			</div>
 		</div>
 	{:else}
 		<Numpad bind:amount bind:fiat {currency} {submit} />
@@ -88,7 +94,7 @@
 		<input name="stale" value={stale} type="hidden" />
 		<input name="subtract" value={subtract} type="hidden" />
 
-		{#if confirmed}
+		{#if confirmed && adjusting}
 			<div class="relative mt-10 mb-20">
 				<div class="absolute top-5 left-0 text-secondary">Slower (~40 blocks)</div>
 				<div class="absolute top-5 right-0 text-secondary">Faster (~1 block)</div>
@@ -98,7 +104,7 @@
 				<div class="my-auto">
 					<Toggle id="subtract" checked={subtract} bind:value={subtract} />
 				</div>
-				<label for="subtract" class="text-secondary text-lg my-auto mb-2">taken from amount</label>
+				<label for="subtract" class="text-secondary text-lg my-auto mb-2">Take fee from amount</label>
 			</div>
 		{/if}
 
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
index bb11ddde..da761cc2 100644
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
@@ -16,7 +16,7 @@
 	let submit = () => (loading = true);
 	$: update(form);
 	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
+		if (form?.message?.includes('pin')) $pin = undefined;
 		loading = false;
 	};
 </script>
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index 79a0aa6e..72511487 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { f, s, sat, sats } from '$lib/utils';
+	import { fiat, f, s, sat, sats } from '$lib/utils';
 	import { scale } from 'svelte/transition';
 	import { Icon } from '$comp';
 	import { toast } from '@zerodevx/svelte-toast';
@@ -7,13 +7,12 @@
 
 	export let data;
 	let { payments, user } = data;
+  let { currency, username } = user;
 
 	let payment = payments[0];
-	let { amount, rate } = payment;
+	let { amount, rate, tip } = payment;
 	amount = Math.abs(amount);
 
-	let fiat = (amount * rate) / sats;
-
 	toast.pop(0);
 </script>
 
@@ -23,12 +22,25 @@
 	</div>
 	<h1 class="text-3xl md:text-4xl font-bold mb-6">Sent!</h1>
 	<h2 class="text-2xl md:text-3xl font-semibold">
-		{f(fiat, user.currency)}
+		{f(fiat(amount, rate), currency)}
+		{#if tip}
+			<span class="text-lg">
+				+ {f(fiat(tip, rate), currency)}
+			</span>
+		{/if}
 	</h2>
-	<h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
+	<h3 class="text-secondary md:text-lg mb-6 mt-1">
+		⚡️{s(amount)}
+
+		{#if tip}
+			<span class="text-lg">
+				+ ⚡️{s(tip)}
+			</span>
+		{/if}
+	</h3>
 </div>
 
-<a href={`/${user.username}/payments`}>
+<a href={`/${username}/payments`}>
 	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-- 
cgit v1.2.3


From 1b3accf009e859f6098c659cdbed695e5b17b641 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 27 Feb 2023 10:30:10 -0800
Subject: don't redirect homepage

---
 src/hooks.server.js                | 32 --------------------------------
 src/routes/(app)/+layout.server.js |  2 +-
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 src/hooks.server.js

(limited to 'src')

diff --git a/src/hooks.server.js b/src/hooks.server.js
deleted file mode 100644
index 4107ec86..00000000
--- a/src/hooks.server.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { auth, get, protectedRoutes } from '$lib/utils';
-
-export async function handle({ event, resolve }) {
-	let token = event.cookies.get('token');
-	let {
-		params,
-		request,
-		url: { pathname, origin }
-	} = event;
-
-	let user;
-	if (token && pathname !== '/logout') {
-		try {
-			user = await get('/me', auth(event.cookies));
-			event.locals.user = user;
-
-			if (['/', '/login', '/register'].includes(pathname) && request.method === 'GET')
-				return Response.redirect(origin + `/${user.username}/dashboard`, 307);
-		} catch (e) {
-			return Response.redirect(origin + '/logout', 307);
-		}
-	}
-
-	if (protectedRoutes.find((p) => pathname.match(p))) {
-		if (!user || user.username !== params.username)
-			return Response.redirect(origin + '/login', 307);
-	}
-
-	const response = await resolve(event);
-
-	return response;
-}
diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js
index 881dbccc..ef278744 100644
--- a/src/routes/(app)/+layout.server.js
+++ b/src/routes/(app)/+layout.server.js
@@ -19,7 +19,7 @@ export async function load({ cookies, request, url, params }) {
 		throw redirect(307, `/migrate`);
 	}
 
-	if (user && ['/', '/login', '/register'].includes(pathname) && request.method === 'GET') {
+	if (user && ['/login', '/register'].includes(pathname) && request.method === 'GET') {
 		throw redirect(307, `/${user.username}`);
 	}
 
-- 
cgit v1.2.3


From 34bc1c031378f8333819f2b46fb74f46634fb639 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 27 Feb 2023 19:28:09 -0800
Subject: api docs

---
 src/components/Code.svelte               | 15 ++++++
 src/components/index.js                  |  1 +
 src/lib/samples.js                       | 22 +++++++++
 src/routes/(static)/+layout.server.js    | 16 +++++++
 src/routes/(static)/+layout.svelte       |  6 ++-
 src/routes/(static)/docs/+page.server.js |  4 ++
 src/routes/(static)/docs/+page.svelte    | 81 +++++++++++++++++++++++++-------
 7 files changed, 128 insertions(+), 17 deletions(-)
 create mode 100644 src/components/Code.svelte
 create mode 100644 src/lib/samples.js
 create mode 100644 src/routes/(static)/+layout.server.js
 create mode 100644 src/routes/(static)/docs/+page.server.js

(limited to 'src')

diff --git a/src/components/Code.svelte b/src/components/Code.svelte
new file mode 100644
index 00000000..b3181d0a
--- /dev/null
+++ b/src/components/Code.svelte
@@ -0,0 +1,15 @@
+<script>
+	import { copy } from '$lib/utils';
+	import { Icon } from '$comp';
+	import samples from '$lib/samples';
+	export let sample;
+</script>
+
+<div class="bg-black text-white rounded-lg p-4 flex gap-4 whitespace-pre-wrap font-mono">
+	<div class="w-full break-all">{samples[sample]}</div>
+	<button
+		class="ml-auto my-auto invert opacity-90"
+		on:click={() => copy(samples[sample].replace(/^\s+/gm, '').replace(/\n/g, ''))}
+		><Icon icon="copy" style="w-8" /></button
+	>
+</div>
diff --git a/src/components/index.js b/src/components/index.js
index 0d1d8d1d..1853e7c9 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,3 +1,4 @@
+export { default as Code } from './Code.svelte';
 export { default as Slider } from './Slider.svelte';
 export { default as Pinpad } from './Pinpad.svelte';
 export { default as Balance } from './Balance.svelte';
diff --git a/src/lib/samples.js b/src/lib/samples.js
new file mode 100644
index 00000000..4af61822
--- /dev/null
+++ b/src/lib/samples.js
@@ -0,0 +1,22 @@
+export default {
+	register: `curl -s "https://coinos.io/api/register" -H "application/json" -d '{
+  "username": "adam",
+  "password": "hunter2"
+}'`,
+	login: `curl -s "https://coinos.io/api/login" -H "application/json" -d '{
+  "username": "adam",
+  "password": "hunter2"
+}'`,
+	invoice: `curl -s "https://coinos.io/api/invoice" 
+  -H "application/json" 
+  -H "Authorization: Bearer $token"
+  -d '{
+    "invoice": {
+      "amount": 1000,
+      "type": "lightning",
+      "webhook": "https://example.com/payment/received",
+      "secret": "hunter2"
+    },
+}'`,
+	fetchInvoice: `curl -s "https://coinos.io/api/invoice/bc1qmhfk9stzffhd9umzmld92vff7zg3mdlh7rvvaj" -H "application/json" }'`
+};
diff --git a/src/routes/(static)/+layout.server.js b/src/routes/(static)/+layout.server.js
new file mode 100644
index 00000000..2deeebc5
--- /dev/null
+++ b/src/routes/(static)/+layout.server.js
@@ -0,0 +1,16 @@
+import { get, post, auth, protectedRoutes } from '$lib/utils';
+
+export async function load({ cookies, request, url, params }) {
+	let token = cookies.get('token');
+	let rate,
+		rates = { USD: 1 };
+
+	let user;
+	if (token) {
+		try {
+			user = await get('/me', auth(cookies));
+		} catch (e) {}
+	}
+
+	return { user };
+}
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte
index 6e31f17e..3d596dff 100644
--- a/src/routes/(static)/+layout.svelte
+++ b/src/routes/(static)/+layout.svelte
@@ -1,8 +1,12 @@
 <script>
+	import { SvelteToast } from '@zerodevx/svelte-toast';
 	import { Footer, LandingHeader } from '$comp';
+	export let data;
+	$: ({ user } = data);
 </script>
 
-<LandingHeader />
+<SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
+<LandingHeader {user} />
 <main class="container flex px-10 md:px-40 mx-auto min-h-[600px] pb-20">
 	<slot />
 </main>
diff --git a/src/routes/(static)/docs/+page.server.js b/src/routes/(static)/docs/+page.server.js
new file mode 100644
index 00000000..e80365fa
--- /dev/null
+++ b/src/routes/(static)/docs/+page.server.js
@@ -0,0 +1,4 @@
+export let load = async ({ cookies }) => {
+	let token = cookies.get('token');
+	return { token };
+};
diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte
index c634cd76..d44204d8 100644
--- a/src/routes/(static)/docs/+page.svelte
+++ b/src/routes/(static)/docs/+page.svelte
@@ -1,17 +1,67 @@
-Coming soon
-<!-- <h1>API Examples</h1> -->
-<!-- <pre><code class="whitespace-pre-wrap" -->
-<!-- 		>{` -->
-<!-- api="https://coinos.io/api" -->
-<!-- json="Content-Type: application/json" -->
-<!--  -->
-<!-- username=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1) -->
-<!-- password="pw" -->
-<!--  -->
-<!-- echo Create user $username with password $password -->
-<!-- curl -s "$api/register" -H "$json" -d '{"user": {"username": "'$username'", "password": "'$password'", "confirm": "'$password'"}}' > /dev/null -->
-<!-- echo "" -->
-<!--  -->
+<script>
+	import { Code, Icon } from '$comp';
+	export let data;
+	let { token } = data;
+</script>
+
+<div class="space-y-8 text-xl mt-20">
+	<h1 class="text-4xl">API Documentation</h1>
+
+	<p class="text-secondary">
+		Coinos has a simple REST API that can be used to register accounts, fetch data, and make
+		payments
+	</p>
+
+	<p class="text-secondary">* = required parameter</p>
+
+	<h2 class="text-2xl">Base URL</h2>
+	<div class="bg-black text-white rounded-lg p-4 flex gap-4">
+		<div>https://coinos.io/api</div>
+		<div class="ml-auto my-auto invert opacity-90"><Icon icon="copy" style="w-8" /></div>
+	</div>
+
+	<h2 class="text-2xl">Auth Token</h2>
+	<p class="text-secondary">This JWT authorizes you to use the API</p>
+	<div class="bg-black text-white rounded-lg p-4 flex gap-4">
+		<div class="w-full break-all">export token="{token}"</div>
+		<div class="ml-auto my-auto invert opacity-90"><Icon icon="copy" style="w-8" /></div>
+	</div>
+
+	<h2 class="text-2xl">POST /register</h2>
+	<p class="text-secondary">Register a new user account with a username and password</p>
+	<Code sample="register" />
+
+	<h2 class="text-2xl">POST /login</h2>
+	<p class="text-secondary">Login to an account to get its auth token</p>
+	<Code sample="login" />
+
+	<h2 class="text-2xl">POST /invoice</h2>
+	<p class="text-secondary">Create an invoice.</p>
+	<div>
+		<div class="text-secondary">
+			<span class="font-mono font-bold">type</span>: bitcoin or lightning
+		</div>
+		<div class="text-secondary">
+			<span class="font-mono font-bold">amount</span>: integer satoshis (optional)
+		</div>
+		<div class="text-secondary">
+			<span class="font-mono font-bold">webhook</span>: a URL that we'll POST to when the invoice is
+			paid (optional)
+		</div>
+		<div class="text-secondary">
+			<span class="font-mono font-bold">secret</span>: a secret to send with the POST (optional)
+		</div>
+	</div>
+
+	<Code sample="invoice" />
+
+	<h2 class="text-2xl">GET /invoice/:hash</h2>
+	<p class="text-secondary">
+		Fetch an invoice by passing a bitcoin address or lightning payment hash
+	</p>
+	<Code sample="fetchInvoice" />
+</div>
+
 <!-- echo Login and get an API token -->
 <!-- token=$(curl -s "$api/taboggan" -H "$json" -d '{"username": "'$username'", "password": "'$password'"}' | jq -r .token) -->
 <!-- echo $token -->
@@ -73,5 +123,4 @@ Coming soon
 <!--  -->
 <!-- curl -s "$api/bitcoin/send" -H "$json" -H "$auth" -d '{"address": "bc1qqc9azhdjjpdxenrndt8cw4tw9del5pyrjn0wln", "tx": { "hex": "'$hex'", "fee": "'$fee'" }}' | jq -r '{ amount, fee, balance: (.account.balance)}' -->
 <!-- echo "" -->
-<!-- `}</code -->
-<!-- 	></pre> -->
+<!-- `} -->
-- 
cgit v1.2.3


From 301770cb05331c8cbb32f60b11c62a79c9d28df3 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 27 Feb 2023 19:28:59 -0800
Subject: prettier

---
 src/components/AppHeader.svelte                    |  1 -
 src/components/LandingHeader.svelte                | 26 +++++++--------
 .../(app)/[username]/invoice/[hash]/+page.svelte   | 36 +++++++--------------
 src/routes/(app)/payment/[id]/+page.svelte         | 37 +++++++++++-----------
 .../bitcoin/[address]/[...amount]/+page.svelte     | 10 ++++--
 src/routes/(app)/sent/+page.svelte                 |  2 +-
 6 files changed, 52 insertions(+), 60 deletions(-)

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 74afd7b9..51c70851 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -15,7 +15,6 @@
 	let menuButtons;
 	if (user)
 		menuButtons = [
-			{ key: 'nav.profile', icon: 'profile', href: `/${user.username}` },
 			{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
 			{ key: 'nav.support', icon: 'support', href: `/support` },
 			{ key: 'nav.signOut', icon: 'logout', href: `/logout` }
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index f9db5ea0..ed7907c1 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -40,29 +40,29 @@
 				<button class="hover:opacity-80" on:click={() => scroll(about)}>{$t('about.header')}</button
 				>
 			{/if}
-			{#if !user}
+			{#if user}
 				<button
-					class="border rounded-full px-6 py-2 font-bold hover:opacity-80"
-					on:click={() => goto('/register')}
-					>{$t('nav.startInSeconds')}
+					class="border rounded-full px-6 py-2 font-bold"
+					on:click={() => goto(`/${user.username}`)}
+					>Home
 				</button>
 				<button
-					class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
-					on:click={() => goto('/login')}
+					class="bg-black text-white border rounded-full px-6 py-2 font-bold"
+					on:click={() => goto('/logout')}
 				>
-					{$t('nav.signIn')}
+					{$t('nav.signOut')}
 				</button>
 			{:else}
 				<button
-					class="border rounded-full px-6 py-2 font-bold"
-					on:click={() => goto(`/${user.username}`)}
-					>{$t('nav.account')}
+					class="border rounded-full px-6 py-2 font-bold hover:opacity-80"
+					on:click={() => goto('/register')}
+					>{$t('nav.startInSeconds')}
 				</button>
 				<button
-					class="bg-black text-white border rounded-full px-6 py-2 font-bold"
-					on:click={() => goto('/logout')}
+					class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
+					on:click={() => goto('/login')}
 				>
-					{$t('nav.signOut')}
+					{$t('nav.signIn')}
 				</button>
 			{/if}
 		</div>
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
index 2ff92687..fff2b22c 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
@@ -7,7 +7,6 @@
 	import { last } from '$lib/store';
 	import { Avatar, Icon, Heart, Image } from '$comp';
 	import { t } from '$lib/translations';
-	import screenfull from 'screenfull';
 	import { goto, invalidate } from '$app/navigation';
 
 	export let data;
@@ -67,14 +66,6 @@
 	$: link = type === 'bitcoin' ? text : `lightning:${text}`;
 	$: txt = type === 'bitcoin' ? hash : text;
 
-	let full;
-	let toggle = () => {
-		screenfull.toggle(qr);
-		full = !full;
-		if (full) src = lg;
-		else src = sm;
-	};
-
 	let toggleType = async () => {
 		invoice.type = invoice.type === types.lightning ? types.bitcoin : types.lightning;
 		({ hash } = await post(`/${username}/invoice`, {
@@ -111,21 +102,18 @@
 			<div class="my-auto">Bitcoin</div>
 		</button>
 	</div>
-	<div class="relative flex">
-		<div class="flex mx-auto w-[360px] h-[360px]">
-			<img
-				{src}
-				class:p-4={full}
-				class="w-[300px] h-[300px] mx-auto z-10 mt-[20px]"
-				bind:this={qr}
-				on:click={toggle}
-				on:keydown={toggle}
-				alt={txt}
-			/>
-		</div>
-		<div
-			class="absolute m-auto left-0 right-0 w-[340px] h-[340px] rounded-full bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] z-0"
-		/>
+
+	<div>
+		<a href={invoice.type === 'bitcoin' ? invoice.text : 'lightning:' + invoice.text}>
+			<div class="relative flex">
+				<div class="flex mx-auto w-[360px] h-[360px]">
+					<img {src} class="w-[300px] h-[300px] mx-auto z-10 mt-[20px]" bind:this={qr} alt={txt} />
+				</div>
+				<div
+					class="absolute m-auto left-0 right-0 w-[340px] h-[340px] rounded-full bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] z-0"
+				/>
+			</div>
+		</a>
 	</div>
 
 	{#if amount > 0}
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index b8a23605..2e170a43 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -26,14 +26,14 @@
 	{#if p.with}
 		<div>
 			<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
-      <a href={`/${p.with.username}`}>
-			<div class="flex">
-				<div class="my-auto">
-					<Avatar user={p.with} size={20} />
+			<a href={`/${p.with.username}`}>
+				<div class="flex">
+					<div class="my-auto">
+						<Avatar user={p.with} size={20} />
+					</div>
+					<div class="my-auto ml-1">{p.with.username}</div>
 				</div>
-				<div class="my-auto ml-1">{p.with.username}</div>
-			</div>
-      </a>
+			</a>
 		</div>
 	{/if}
 
@@ -42,18 +42,19 @@
 		<div>
 			{f(fiat(a, rate), currency)}
 			{#if tip}
-        <span class="text-lg">
-				+ {f(fiat(tip, rate), currency)}
-        </span>
+				<span class="text-lg">
+					+ {f(fiat(tip, rate), currency)}
+				</span>
 			{/if}
-      <span class="text-secondary">⚡️{`${s(a)}`}
-      
-			{#if tip}
-        <span class="text-lg">
-				+ ⚡️{s(tip)}
-        </span>
-			{/if}
-      </span>
+			<span class="text-secondary"
+				>⚡️{`${s(a)}`}
+
+				{#if tip}
+					<span class="text-lg">
+						+ ⚡️{s(tip)}
+					</span>
+				{/if}
+			</span>
 		</div>
 	</div>
 
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index b3a944f4..77d5fde6 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -22,7 +22,7 @@
 		loading = false;
 		if (form?.message?.includes('pin')) $pin = undefined;
 		if (form) ({ min, max, feeRate, fee, ourfee, subtract } = form);
-    if (!ourfee) ourfee = 0;
+		if (!ourfee) ourfee = 0;
 		if (feeRate) confirmed = true;
 		stale = false;
 	};
@@ -77,7 +77,9 @@
 					{f(toFiat(fee + ourfee, $selectedRate), currency)}
 				</h2>
 				<h3 class="text-secondary mb-6 mt-1">⚡️{s(fee + ourfee)}</h3>
-        <button class="absolute right-1/4 top-0 text-secondary p-4" on:click={toggleAdjusting}><Icon icon="settings" style="opacity-30" /></button>
+				<button class="absolute right-1/4 top-0 text-secondary p-4" on:click={toggleAdjusting}
+					><Icon icon="settings" style="opacity-30" /></button
+				>
 			</div>
 		</div>
 	{:else}
@@ -104,7 +106,9 @@
 				<div class="my-auto">
 					<Toggle id="subtract" checked={subtract} bind:value={subtract} />
 				</div>
-				<label for="subtract" class="text-secondary text-lg my-auto mb-2">Take fee from amount</label>
+				<label for="subtract" class="text-secondary text-lg my-auto mb-2"
+					>Take fee from amount</label
+				>
 			</div>
 		{/if}
 
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index 72511487..760d2e1d 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -7,7 +7,7 @@
 
 	export let data;
 	let { payments, user } = data;
-  let { currency, username } = user;
+	let { currency, username } = user;
 
 	let payment = payments[0];
 	let { amount, rate, tip } = payment;
-- 
cgit v1.2.3


From 759c053c3ae1eb8f3d885b12cd1a5e7ba11cfa78 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 28 Feb 2023 00:43:53 -0800
Subject: docs

---
 package.json                          |   1 +
 pnpm-lock.yaml                        | 268 +++++++---------------------------
 src/components/Code.svelte            |  22 ++-
 src/lib/samples.js                    |   9 +-
 src/routes/(static)/docs/+page.svelte |  29 ++--
 5 files changed, 95 insertions(+), 234 deletions(-)

(limited to 'src')

diff --git a/package.json b/package.json
index ac67d8b3..2af9cbd3 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
 		"leaflet": "^1.9.3",
 		"leaflet.markercluster": "^1.5.3",
 		"nostr": "^0.2.7",
+		"nostr-tools": "^1.7.1",
 		"postcss": "^8.4.20",
 		"prettier": "^2.8.1",
 		"prettier-plugin-svelte": "^2.9.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a0c68508..1e3d9beb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,6 +16,7 @@ specifiers:
   leaflet: ^1.9.3
   leaflet.markercluster: ^1.5.3
   nostr: ^0.2.7
+  nostr-tools: ^1.7.1
   postcss: ^8.4.20
   prettier: ^2.8.1
   prettier-plugin-svelte: ^2.9.0
@@ -56,6 +57,7 @@ devDependencies:
   leaflet: 1.9.3
   leaflet.markercluster: 1.5.3_leaflet@1.9.3
   nostr: 0.2.7
+  nostr-tools: 1.7.1
   postcss: 8.4.20
   prettier: 2.8.1
   prettier-plugin-svelte: 2.9.0_ajxj753sv7dbwexjherrch25ta
@@ -278,6 +280,18 @@ packages:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
     dev: false
 
+  /@noble/hashes/1.0.0:
+    resolution: {integrity: sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg==}
+    dev: true
+
+  /@noble/hashes/1.2.0:
+    resolution: {integrity: sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==}
+    dev: true
+
+  /@noble/secp256k1/1.7.1:
+    resolution: {integrity: sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==}
+    dev: true
+
   /@nodelib/fs.scandir/2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -390,6 +404,25 @@ packages:
       rollup: 3.8.1
     dev: false
 
+  /@scure/base/1.1.1:
+    resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
+    dev: true
+
+  /@scure/bip32/1.1.5:
+    resolution: {integrity: sha512-XyNh1rB0SkEqd3tXcXMi+Xe1fvg+kUIcoRIEujP1Jgv7DqW2r9lg3Ah0NkFaCs9sTkQAQA8kw7xiRXzENi9Rtw==}
+    dependencies:
+      '@noble/hashes': 1.2.0
+      '@noble/secp256k1': 1.7.1
+      '@scure/base': 1.1.1
+    dev: true
+
+  /@scure/bip39/1.1.1:
+    resolution: {integrity: sha512-t+wDck2rVkh65Hmv280fYdVdY25J9YeEUIgn2LG1WM6gxFkGzcksoDiUkWVpVp3Oex9xGC68JU2dSbUfwZ2jPg==}
+    dependencies:
+      '@noble/hashes': 1.2.0
+      '@scure/base': 1.1.1
+    dev: true
+
   /@sveltejs/adapter-node/1.1.4_@sveltejs+kit@1.2.10:
     resolution: {integrity: sha512-3iEBqi1fXLXP9YIbVuz2LXajoebRJCmAFEQbN40DlxAnA7G+InxUgnqFun3q9gBMz2Qvd99K51g/HxWetXRe8Q==}
     peerDependencies:
@@ -584,10 +617,6 @@ packages:
   /@types/estree/0.0.39:
     resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
 
-  /@types/estree/0.0.39:
-    resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
-    dev: true
-
   /@types/estree/1.0.0:
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: false
@@ -939,10 +968,6 @@ packages:
     resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==}
     dev: true
 
-  /builtin-status-codes/3.0.0:
-    resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==}
-    dev: true
-
   /busboy/1.6.0:
     resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
     engines: {node: '>=10.16.0'}
@@ -1008,14 +1033,6 @@ packages:
     resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}
     dev: true
 
-  /console-browserify/1.2.0:
-    resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==}
-    dev: true
-
-  /constants-browserify/1.0.0:
-    resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}
-    dev: true
-
   /cookie/0.5.0:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
@@ -1028,13 +1045,6 @@ packages:
       elliptic: 6.5.4
     dev: true
 
-  /create-ecdh/4.0.4:
-    resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==}
-    dependencies:
-      bn.js: 4.12.0
-      elliptic: 6.5.4
-    dev: true
-
   /create-hash/1.2.0:
     resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==}
     dependencies:
@@ -1112,14 +1122,6 @@ packages:
       object-keys: 1.1.1
     dev: true
 
-  /define-properties/1.1.4:
-    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-property-descriptors: 1.0.0
-      object-keys: 1.1.1
-    dev: true
-
   /defined/1.0.1:
     resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
     dev: true
@@ -1462,18 +1464,6 @@ packages:
       safe-buffer: 5.2.1
     dev: true
 
-  /events/3.3.0:
-    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
-    engines: {node: '>=0.8.x'}
-    dev: true
-
-  /evp_bytestokey/1.0.3:
-    resolution: {integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==}
-    dependencies:
-      md5.js: 1.3.5
-      safe-buffer: 5.2.1
-    dev: true
-
   /fast-glob/3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
@@ -1587,12 +1577,6 @@ packages:
       get-intrinsic: 1.1.3
     dev: true
 
-  /gopd/1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
-    dependencies:
-      get-intrinsic: 1.1.3
-    dev: true
-
   /graceful-fs/4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
     dev: true
@@ -1670,14 +1654,6 @@ packages:
       has-tostringtag: 1.0.0
     dev: true
 
-  /is-arguments/1.1.1:
-    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      has-tostringtag: 1.0.0
-    dev: true
-
   /is-binary-path/2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
@@ -1697,11 +1673,6 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /is-callable/1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
   /is-core-module/2.11.0:
     resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
     dependencies:
@@ -1738,14 +1709,6 @@ packages:
       define-properties: 1.1.4
     dev: true
 
-  /is-nan/1.3.2:
-    resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-    dev: true
-
   /is-number/7.0.0:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
@@ -1773,22 +1736,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /is-typed-array/1.1.10:
-    resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.0
-    dev: true
-
-  /isomorphic-timers-promises/1.0.1:
-    resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==}
-    engines: {node: '>=10'}
-    dev: true
-
   /kleur/4.1.5:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
@@ -1977,39 +1924,6 @@ packages:
       vm-browserify: 1.1.2
     dev: true
 
-  /node-stdlib-browser/1.2.0:
-    resolution: {integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==}
-    engines: {node: '>=10'}
-    dependencies:
-      assert: 2.0.0
-      browser-resolve: 2.0.0
-      browserify-zlib: 0.2.0
-      buffer: 5.7.1
-      console-browserify: 1.2.0
-      constants-browserify: 1.0.0
-      create-require: 1.1.1
-      crypto-browserify: 3.12.0
-      domain-browser: 4.22.0
-      events: 3.3.0
-      https-browserify: 1.0.0
-      isomorphic-timers-promises: 1.0.1
-      os-browserify: 0.3.0
-      path-browserify: 1.0.1
-      pkg-dir: 5.0.0
-      process: 0.11.10
-      punycode: 1.4.1
-      querystring-es3: 0.2.1
-      readable-stream: 3.6.0
-      stream-browserify: 3.0.0
-      stream-http: 3.2.0
-      string_decoder: 1.3.0
-      timers-browserify: 2.0.12
-      tty-browserify: 0.0.1
-      url: 0.11.0
-      util: 0.12.5
-      vm-browserify: 1.1.2
-    dev: true
-
   /normalize-path/3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
@@ -2020,6 +1934,17 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /nostr-tools/1.7.1:
+    resolution: {integrity: sha512-r72KpbLVz6Gaqei6LIj6m+cyp24eF3myiIMlmv93WCgDFCI5w72u+OrZzjSrJaeE94vYoEJfOF16/2Rl5o5z5w==}
+    dependencies:
+      '@noble/hashes': 1.0.0
+      '@noble/secp256k1': 1.7.1
+      '@scure/base': 1.1.1
+      '@scure/bip32': 1.1.5
+      '@scure/bip39': 1.1.1
+      prettier: 2.8.4
+    dev: true
+
   /nostr/0.2.7:
     resolution: {integrity: sha512-Yq5tkiCTJtohs7H7Fx+Ki83bR8b3xapdwYi17HunhW5EQfZ9rI0cIXFyihj2ZRkv/0YYvVBiCp/KIaLYt5LyfQ==}
     dependencies:
@@ -2098,47 +2023,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /os-browserify/0.3.0:
-    resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==}
-    dev: true
-
-  /p-limit/3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      yocto-queue: 0.1.0
-    dev: true
-
-  /p-locate/5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
-    dependencies:
-      p-limit: 3.1.0
-    dev: true
-
-  /pako/1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
-    dev: true
-
-  /parse-asn1/5.1.6:
-    resolution: {integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==}
-    dependencies:
-      asn1.js: 5.4.1
-      browserify-aes: 1.2.0
-      evp_bytestokey: 1.0.3
-      pbkdf2: 3.1.2
-      safe-buffer: 5.2.1
-    dev: true
-
-  /path-browserify/1.0.1:
-    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
-    dev: true
-
-  /path-exists/4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-    dev: true
-
   /path-is-absolute/1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
@@ -2158,17 +2042,6 @@ packages:
       sha.js: 2.4.11
     dev: true
 
-  /pbkdf2/3.1.2:
-    resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==}
-    engines: {node: '>=0.12'}
-    dependencies:
-      create-hash: 1.2.0
-      create-hmac: 1.1.7
-      ripemd160: 2.0.2
-      safe-buffer: 5.2.1
-      sha.js: 2.4.11
-    dev: true
-
   /picocolors/1.0.0:
     resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
 
@@ -2273,6 +2146,12 @@ packages:
     hasBin: true
     dev: true
 
+  /prettier/2.8.4:
+    resolution: {integrity: sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    dev: true
+
   /process/0.11.10:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
@@ -2474,10 +2353,6 @@ packages:
     resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
     dev: true
 
-  /setimmediate/1.0.5:
-    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
-    dev: true
-
   /sha.js/2.4.11:
     resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
     hasBin: true
@@ -2542,22 +2417,6 @@ packages:
       xtend: 4.0.2
     dev: true
 
-  /stream-browserify/3.0.0:
-    resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
-    dependencies:
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-    dev: true
-
-  /stream-http/3.2.0:
-    resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==}
-    dependencies:
-      builtin-status-codes: 3.0.0
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-      xtend: 4.0.2
-    dev: true
-
   /streamsearch/1.1.0:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
@@ -2734,13 +2593,6 @@ packages:
       uint8array-tools: 0.0.7
     dev: true
 
-  /tiny-secp256k1/2.2.1:
-    resolution: {integrity: sha512-/U4xfVqnVxJXN4YVsru0E6t5wVncu2uunB8+RVR40fYUxkKYUPS10f+ePQZgFBoE/Jbf9H1NBveupF2VmB58Ng==}
-    engines: {node: '>=14.0.0'}
-    dependencies:
-      uint8array-tools: 0.0.7
-    dev: true
-
   /to-regex-range/5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -2757,10 +2609,6 @@ packages:
     resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==}
     dev: true
 
-  /tty-browserify/0.0.1:
-    resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==}
-    dev: true
-
   /typeforce/1.18.0:
     resolution: {integrity: sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==}
     dev: true
@@ -2946,22 +2794,6 @@ packages:
       is-typed-array: 1.1.10
     dev: true
 
-  /vm-browserify/1.1.2:
-    resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
-    dev: true
-
-  /which-typed-array/1.1.9:
-    resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.0
-      is-typed-array: 1.1.10
-    dev: true
-
   /wif/2.0.6:
     resolution: {integrity: sha512-HIanZn1zmduSF+BQhkE+YXIbEiH0xPr1012QbFEGB0xsKqJii0/SqJjyn8dFv6y36kOznMgMB+LGcbZTJ1xACQ==}
     dependencies:
diff --git a/src/components/Code.svelte b/src/components/Code.svelte
index b3181d0a..0e09191e 100644
--- a/src/components/Code.svelte
+++ b/src/components/Code.svelte
@@ -5,11 +5,27 @@
 	export let sample;
 </script>
 
-<div class="bg-black text-white rounded-lg p-4 flex gap-4 whitespace-pre-wrap font-mono">
-	<div class="w-full break-all">{samples[sample]}</div>
+<div
+	class="bg-black text-white rounded-lg p-4 flex gap-4 whitespace-pre-wrap font-mono"
+>
+	<div class="overflow-x-scroll max-w-full scrollbar-hide">
+		<div class="break-all min-w-[800px]">{samples[sample]}</div>
+	</div>
 	<button
 		class="ml-auto my-auto invert opacity-90"
 		on:click={() => copy(samples[sample].replace(/^\s+/gm, '').replace(/\n/g, ''))}
-		><Icon icon="copy" style="w-8" /></button
+		><Icon icon="copy" style="w-10 max-w-none" /></button
 	>
 </div>
+
+<style>
+	.scrollbar-hide::-webkit-scrollbar {
+		display: none;
+	}
+
+	/* For IE, Edge and Firefox */
+	.scrollbar-hide {
+		-ms-overflow-style: none; /* IE and Edge */
+		scrollbar-width: none; /* Firefox */
+	}
+</style>
diff --git a/src/lib/samples.js b/src/lib/samples.js
index 4af61822..93b9aa24 100644
--- a/src/lib/samples.js
+++ b/src/lib/samples.js
@@ -1,13 +1,13 @@
 export default {
-	register: `curl -s "https://coinos.io/api/register" -H "application/json" -d '{
+	register: `curl "https://coinos.io/api/register" -H "application/json" -d '{
   "username": "adam",
   "password": "hunter2"
 }'`,
-	login: `curl -s "https://coinos.io/api/login" -H "application/json" -d '{
+	login: `curl "https://coinos.io/api/login" -H "application/json" -d '{
   "username": "adam",
   "password": "hunter2"
 }'`,
-	invoice: `curl -s "https://coinos.io/api/invoice" 
+	invoice: `curl "https://coinos.io/api/invoice" 
   -H "application/json" 
   -H "Authorization: Bearer $token"
   -d '{
@@ -18,5 +18,6 @@ export default {
       "secret": "hunter2"
     },
 }'`,
-	fetchInvoice: `curl -s "https://coinos.io/api/invoice/bc1qmhfk9stzffhd9umzmld92vff7zg3mdlh7rvvaj" -H "application/json" }'`
+	fetchInvoice: `curl "https://coinos.io/api/invoice/bc1qmhfk9stzffhd9umzmld92vff7zg3mdlh7rvvaj" 
+  -H "application/json"'`
 };
diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte
index d44204d8..cb82bd05 100644
--- a/src/routes/(static)/docs/+page.svelte
+++ b/src/routes/(static)/docs/+page.svelte
@@ -1,10 +1,16 @@
 <script>
+	import { copy } from '$lib/utils';
 	import { Code, Icon } from '$comp';
+	import { PUBLIC_COINOS_URL } from '$env/static/public';
 	export let data;
 	let { token } = data;
+	let api = PUBLIC_COINOS_URL + '/api';
+
+	if (!token) token = '<login to see your token here>';
+  let tokenSample = `export token="${token}"`;
 </script>
 
-<div class="space-y-8 text-xl mt-20">
+<div class="space-y-8 lg:text-xl mt-20 w-full max-w-full">
 	<h1 class="text-4xl">API Documentation</h1>
 
 	<p class="text-secondary">
@@ -16,15 +22,19 @@
 
 	<h2 class="text-2xl">Base URL</h2>
 	<div class="bg-black text-white rounded-lg p-4 flex gap-4">
-		<div>https://coinos.io/api</div>
-		<div class="ml-auto my-auto invert opacity-90"><Icon icon="copy" style="w-8" /></div>
+		<div>{api}</div>
+		<button class="ml-auto my-auto invert opacity-90" on:click={() => copy(api)}
+			><Icon icon="copy" style="w-10 max-w-none" /></button
+		>
 	</div>
 
 	<h2 class="text-2xl">Auth Token</h2>
 	<p class="text-secondary">This JWT authorizes you to use the API</p>
 	<div class="bg-black text-white rounded-lg p-4 flex gap-4">
-		<div class="w-full break-all">export token="{token}"</div>
-		<div class="ml-auto my-auto invert opacity-90"><Icon icon="copy" style="w-8" /></div>
+    <div class="w-full break-all">{tokenSample}</div>
+    <button class="ml-auto my-auto invert opacity-90" on:click={() => copy(tokenSample)}
+			><Icon icon="copy" style="w-10 max-w-none" /></button
+		>
 	</div>
 
 	<h2 class="text-2xl">POST /register</h2>
@@ -42,17 +52,17 @@
 			<span class="font-mono font-bold">type</span>: bitcoin or lightning
 		</div>
 		<div class="text-secondary">
-			<span class="font-mono font-bold">amount</span>: integer satoshis (optional)
+			<span class="font-mono font-bold">amount</span>: amount in satoshis
 		</div>
 		<div class="text-secondary">
-			<span class="font-mono font-bold">webhook</span>: a URL that we'll POST to when the invoice is
-			paid (optional)
+			<span class="font-mono font-bold">webhook</span>: an endpoint to hit when the invoice is paid
 		</div>
 		<div class="text-secondary">
-			<span class="font-mono font-bold">secret</span>: a secret to send with the POST (optional)
+			<span class="font-mono font-bold">secret</span>: a secret string for the webhook to check
 		</div>
 	</div>
 
+	hey
 	<Code sample="invoice" />
 
 	<h2 class="text-2xl">GET /invoice/:hash</h2>
@@ -123,4 +133,5 @@
 <!--  -->
 <!-- curl -s "$api/bitcoin/send" -H "$json" -H "$auth" -d '{"address": "bc1qqc9azhdjjpdxenrndt8cw4tw9del5pyrjn0wln", "tx": { "hex": "'$hex'", "fee": "'$fee'" }}' | jq -r '{ amount, fee, balance: (.account.balance)}' -->
 <!-- echo "" -->
+
 <!-- `} -->
-- 
cgit v1.2.3


From 3651919e5a2e4783b05d8af369f0d24e279b15c8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 1 Mar 2023 22:40:45 -0800
Subject: support form captcha

---
 src/routes/(app)/support/+page.server.js | 15 ---------
 src/routes/(app)/support/+page.svelte    | 57 +++++++++++++++++++++-----------
 src/routes/(app)/support/+server.js      |  7 ++++
 3 files changed, 44 insertions(+), 35 deletions(-)
 delete mode 100644 src/routes/(app)/support/+page.server.js
 create mode 100644 src/routes/(app)/support/+server.js

(limited to 'src')

diff --git a/src/routes/(app)/support/+page.server.js b/src/routes/(app)/support/+page.server.js
deleted file mode 100644
index 6d0af616..00000000
--- a/src/routes/(app)/support/+page.server.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { fd, post } from '$lib/utils';
-import { fail } from '@sveltejs/kit';
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let form = await fd(request);
-		try {
-			await post('/email', form);
-		} catch (e) {
-			return fail(400, { error: e.message });
-		}
-
-		return { success: true };
-	}
-};
diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte
index d00cc069..8dbfc1af 100644
--- a/src/routes/(app)/support/+page.svelte
+++ b/src/routes/(app)/support/+page.svelte
@@ -1,10 +1,10 @@
 <script>
-	import { enhance } from '$app/forms';
+	import { fail, success, post } from '$lib/utils';
 	import { scale } from 'svelte/transition';
 	import { AppHeader, Icon } from '$comp';
 	import { t } from '$lib/translations';
 
-	export let data, form;
+	export let data;
 
 	let { user } = data;
 	$: if (user) {
@@ -13,41 +13,58 @@
 
 	let email;
 	let message;
+	let sent;
+
+	let submit = (e) => {
+		e.preventDefault();
+		grecaptcha.ready(() => {
+			grecaptcha
+				.execute('6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM', { action: 'submit' })
+				.then((token) =>
+					post('/support', { email, message, token })
+						.then(() => (sent = true))
+						.catch(() => fail('problem submitting'))
+				);
+		});
+	};
 </script>
 
+<svelte:head>
+	<script
+		src="https://www.google.com/recaptcha/api.js?render=6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM"
+	></script>
+</svelte:head>
+
 {#if user}
 	<AppHeader {data} />
 {/if}
 
-{#if form?.error}
-	<div class="text-red-600 text-center">
-		{form.error}
-	</div>
-{/if}
+<div class="container px-4 max-w-lg mx-auto mt-20 space-y-8">
+	{#if sent}
+		<h1 class="text-center text-3xl md:text-4xl font-semibold">Thank you!</h1>
+		<div class="text-center text-lg text-secondary">Someone will be in touch shortly.</div>
 
-<div class="container px-4 max-w-lg mx-auto mt-20 space-y-5">
-	{#if form?.success}
-		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">Thank you!</h1>
-		<p class="text-center mb-8">Someone will be in touch shortly.</p>
-
-		<a href={user ? `/${user.username}` : '/'}>
-			<button class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full mb-2"
-				>Done</button
-			>
-		</a>
+		<div>
+			<a href={user ? `/${user.username}` : '/'}>
+				<button
+					class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full bg-black text-white"
+					>Ok</button
+				>
+			</a>
+		</div>
 	{:else}
 		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">
 			{$t('user.support.header')}
 		</h1>
 
-		<p class="text-secondary">
+		<p class="text-secondary text-lg">
 			Fill out this form or email us directly at <a
 				class="underline"
 				href="mailto:support@coinos.io">support@coinos.io</a
 			> and we'll do our best to get back to you in a timely manner.
 		</p>
 
-		<form method="POST" use:enhance>
+		<form on:submit={submit}>
 			<div class="mb-4">
 				<label for="account" class="font-semibold">{$t('user.support.accountName')}</label>
 				<input
@@ -79,7 +96,7 @@
 			<button
 				type="submit"
 				disabled={!email || !message}
-				class="{!email || !message
+				class="g-recaptcha {!email || !message
 					? 'opacity-50'
 					: 'opacity-100'} bg-black text-white font-bold rounded-xl py-3 w-full mx-auto {email &&
 				message
diff --git a/src/routes/(app)/support/+server.js b/src/routes/(app)/support/+server.js
new file mode 100644
index 00000000..af5fcc66
--- /dev/null
+++ b/src/routes/(app)/support/+server.js
@@ -0,0 +1,7 @@
+import { json } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export async function POST({ cookies, request }) {
+	let result = await post('/email', await request.json(), auth(cookies));
+	return json(result);
+}
-- 
cgit v1.2.3


From db6879b22559e735256a088c99c03b1d50b806e0 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 1 Mar 2023 22:54:28 -0800
Subject: disable prerendering

---
 src/routes/(app)/support/+server.js | 2 ++
 src/routes/+page.server.js          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/support/+server.js b/src/routes/(app)/support/+server.js
index af5fcc66..6b1778a8 100644
--- a/src/routes/(app)/support/+server.js
+++ b/src/routes/(app)/support/+server.js
@@ -1,6 +1,8 @@
 import { json } from '@sveltejs/kit';
 import { auth, post } from '$lib/utils';
 
+export const prerender = false;
+
 export async function POST({ cookies, request }) {
 	let result = await post('/email', await request.json(), auth(cookies));
 	return json(result);
diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index 4bcc6089..7936e88b 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -1,6 +1,6 @@
 import { get } from '$lib/utils';
 
-export const prerender = true;
+// export const prerender = true;
 export let load = async () => {
 	let data = { locations: [] };
 
-- 
cgit v1.2.3


From 0c3cb465a91941531a09cd53f3e4b0b78f24784f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 3 Mar 2023 12:33:29 -0800
Subject: use div for message input

---
 src/app.css                                        |  1 -
 .../(app)/[username]/(profile)/+layout.svelte      |  1 -
 src/routes/(app)/[username]/dashboard/+page.svelte |  1 -
 src/routes/(app)/[username]/messages/+page.svelte  | 36 +++++++++++++---------
 .../[username]/payments/[...page]/+page.svelte     |  2 +-
 .../(app)/launch/thanks/[asset]/+page.server.js    |  1 -
 src/routes/(app)/send/[...text]/+page.svelte       |  1 -
 src/routes/(app)/send/invoice/[id]/+page.server.js |  2 +-
 .../(app)/send/lightning/[payreq]/+page.server.js  |  2 +-
 .../user/[username]/[...amount]/+page.server.js    |  2 +-
 src/routes/(static)/bounties/+page.svelte          |  2 +-
 11 files changed, 27 insertions(+), 24 deletions(-)
 delete mode 100644 src/routes/(app)/launch/thanks/[asset]/+page.server.js

(limited to 'src')

diff --git a/src/app.css b/src/app.css
index 12fad732..3a722fb1 100644
--- a/src/app.css
+++ b/src/app.css
@@ -35,7 +35,6 @@ button.primary {
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	background: transparent;
-	background-image: url('/icons/down.svg');
 	background-repeat: no-repeat;
 	background-position-x: 95%;
 	background-position-y: 1em;
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 6eb2a850..133930b1 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -4,7 +4,6 @@
 	import { Icon } from '$comp';
 	import { t } from '$lib/translations';
 	import { sign, send } from '$lib/nostr';
-	import { v4 } from 'uuid';
 
 	export let data;
 	let events, user, subject, src, text;
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index 499034e6..d8761ea9 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -7,7 +7,6 @@
 	import { goto } from '$app/navigation';
 	import { t } from '$lib/translations';
 	import { events } from '$lib/store';
-	import { v4 } from 'uuid';
 
 	export let data;
 	$: ({ invoices, requests } = data);
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index 5de18c66..7a10d605 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -2,7 +2,7 @@
 	import { cubicInOut } from 'svelte/easing';
 	import { browser } from '$app/environment';
 	import { t } from '$lib/translations';
-	import { format, parseISO } from 'date-fns';
+	import { format } from 'date-fns';
 	import { scale, fade, fly } from 'svelte/transition';
 	import { enhance } from '$app/forms';
 	import { Avatar, Icon } from '$comp';
@@ -68,7 +68,6 @@
 		event.message = message;
 
 		message = '';
-		input.focus();
 
 		event.author = user;
 		event.recipient = subject;
@@ -92,9 +91,16 @@
 		message = '';
 		submitting = false;
 	};
+
+	let keydown = (e) => {
+		if (e.key === 'Enter') {
+			e.preventDefault();
+			submit();
+		}
+	};
 </script>
 
-<div class="container max-w-xl mx-auto px-4">
+<div class="container max-w-xl mx-auto px-4 space-y-5">
 	<div
 		class="h-[50vh] max-h-[50vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
 		bind:this={pane}
@@ -133,22 +139,24 @@
 		{/each}
 	</div>
 
-	<form method="POST" class="space-y-5 relative" on:submit|preventDefault={submit}>
+	<form
+		method="POST"
+		class="w-full border rounded-xl outline-none gap-4 flex p-0 pr-2"
+		on:submit|preventDefault={submit}
+	>
 		<input type="hidden" name="requester_id" value={user.id} />
 		<input type="hidden" name="recipient" value={subject.username} />
 
-		<button type="submit" class="absolute right-2 bottom-2">
-			<Icon icon="send" style="w-10" />
-		</button>
-
-		<input
+		<div
 			use:focus
-			name="message"
-			placeholder={$t('payments.sendMessage')}
-			class="w-full p-4 border rounded-xl outline-none"
-			bind:value={message}
-			bind:this={input}
+			contenteditable
+			class="grow break-all py-4 outline-none mt-0 pl-4"
+			bind:innerHTML={message}
+			on:keydown={keydown}
 		/>
+		<button type="submit" class="my-auto shrink-0">
+			<Icon icon="send" style="w-8" />
+		</button>
 	</form>
 </div>
 
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index aacba81e..a502f8c3 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { Avatar, Icon } from '$comp';
 	import { onMount } from 'svelte';
-	import { format, parseISO } from 'date-fns';
+	import { format } from 'date-fns';
 	import { newPayment, payments } from '$lib/store';
 	import { t } from '$lib/translations';
 	import { get, f, s, sat, sats } from '$lib/utils';
diff --git a/src/routes/(app)/launch/thanks/[asset]/+page.server.js b/src/routes/(app)/launch/thanks/[asset]/+page.server.js
deleted file mode 100644
index e9e01376..00000000
--- a/src/routes/(app)/launch/thanks/[asset]/+page.server.js
+++ /dev/null
@@ -1 +0,0 @@
-// export const load = ({ parent }) => parent();
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 5f37cad5..3abc5a1a 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -7,7 +7,6 @@
 	import { t } from '$lib/translations';
 	import { AppHeader, Avatar, Icon, Spinner } from '$comp';
 	import { back, fail } from '$lib/utils';
-	import { format, parseISO } from 'date-fns';
 
 	export let data;
 	export let form;
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js
index dc0d3a3d..3db03123 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.js
@@ -1,5 +1,5 @@
 import { error, fail, redirect } from '@sveltejs/kit';
-import { fd, btc as asset, auth, get, post } from '$lib/utils';
+import { fd, auth, get, post } from '$lib/utils';
 
 export async function load({ params: { id }, parent }) {
 	let { user } = await parent();
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index 02511a8f..94231376 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -1,5 +1,5 @@
 import { fail, redirect } from '@sveltejs/kit';
-import { fd, btc as asset, auth, post } from '$lib/utils';
+import { fd, auth, post } from '$lib/utils';
 
 export async function load({ params }) {
 	return post('/parse', params);
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
index ad0219e0..18eda839 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
@@ -1,5 +1,5 @@
 import { error, fail, redirect } from '@sveltejs/kit';
-import { fd, btc as asset, auth, get, post } from '$lib/utils';
+import { fd, auth, get, post } from '$lib/utils';
 
 export async function load({ params, parent }) {
 	let { user } = await parent();
diff --git a/src/routes/(static)/bounties/+page.svelte b/src/routes/(static)/bounties/+page.svelte
index d53a8edc..e3670e78 100644
--- a/src/routes/(static)/bounties/+page.svelte
+++ b/src/routes/(static)/bounties/+page.svelte
@@ -54,7 +54,7 @@
 	<p>
 		<b>⚡️750,000</b> will be awarded once the merchant has accepted bitcoin for 6 months. We'll be
 		sending
-		<a href="https://btcmap.org/leaderboard" class="text-black hover:underline" target="_blank"
+		<a href="https://btcmap.org/leaderboard" class="text-black hover:underline" target="_blank" rel="noreferrer"
 			>shadowy supertaggers</a
 		> to check up on them periodically.
 	</p>
-- 
cgit v1.2.3


From 0f44e3283c25c9783a52cf20957661da49d2f90b Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 3 Mar 2023 21:40:27 -0800
Subject: chinese language file

---
 src/lib/translations/index.js  |   5 +
 src/lib/translations/lang.json |   3 +-
 src/locales/zh.json            | 291 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 298 insertions(+), 1 deletion(-)
 create mode 100644 src/locales/zh.json

(limited to 'src')

diff --git a/src/lib/translations/index.js b/src/lib/translations/index.js
index 9c798530..dfd7f47f 100644
--- a/src/lib/translations/index.js
+++ b/src/lib/translations/index.js
@@ -46,6 +46,11 @@ const config = {
 			locale: 'de',
 			key: '',
 			loader: async () => (await import('../../locales/de.json')).default
+		},
+		{
+			locale: 'zh',
+			key: '',
+			loader: async () => (await import('../../locales/zh.json')).default
 		}
 	]
 };
diff --git a/src/lib/translations/lang.json b/src/lib/translations/lang.json
index c537d4cf..c607ebd0 100644
--- a/src/lib/translations/lang.json
+++ b/src/lib/translations/lang.json
@@ -3,5 +3,6 @@
 	"fr": "Français",
 	"es": "Español",
 	"de": "Deutsch",
-	"pt": "Português"
+	"pt": "Português",
+	"zh": "中国人"
 }
diff --git a/src/locales/zh.json b/src/locales/zh.json
new file mode 100644
index 00000000..402f0214
--- /dev/null
+++ b/src/locales/zh.json
@@ -0,0 +1,291 @@
+{
+	"404": {
+		"404": "404",
+		"pageNotFound": "Page not found."
+	},
+	"about": {
+		"header": "About",
+		"p1": "Coinos is an open source bitcoin payment app. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.",
+		"p2": "You can download the source code to run an instance and connect it to your own bitcoin and lightning nodes. We'll help you get started being a benevolent custodian and payments provider for your community.",
+		"p3": "Account transfers amongst users on our server are done off-chain so they're completely free, instant, and unlimited.",
+		"team": {
+			"header": "The Team",
+			"adam": {
+				"name": "Adam Soltys",
+				"position": "Chief Technical Officer",
+				"bio": "Adam is a web developer and bitcoin enthusiast who believes sound money is key to increasing global prosperity. He lives in North Vancouver with his wife Chelsea and two children."
+			},
+			"shauna": {
+				"name": "Shauna",
+				"position": "Operations & Marketing",
+				"bio": "Strategic & Project Management. Jack of all Trades. Can always find time to meet for coffee."
+			},
+			"cole": {
+				"name": "Cole",
+				"position": "Certified Bitcoin Professional",
+				"bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
+			},
+			"john": {
+				"name": "John Barratt",
+				"position": "Full Stack Web Developer",
+				"bio": "When not coding you can find John out in the woods hiking all the great trails that BC has to offer."
+			}
+		},
+		"locations": {
+			"header": "Locations",
+			"description": "Here are some businesses that are accepting bitcoin with Coinos. We hope that yours will be next!"
+		}
+	},
+	"error": {
+		"header": "Error",
+		"message": "Please try again or contact support.",
+		"signIn": "Please sign in to continue."
+	},
+	"faq": {
+		"header": "FAQ",
+		"cost": {
+			"question": "What does it cost?",
+			"answer": "It's free to register an account and receive payments over the lightning network. We charge a 0.1% fee to convert from lightning to bitcoin."
+		},
+		"compatibility": {
+			"question": "Do I need any special device or software?",
+			"answer": "No. Coinos is web-based, so as long as you have an internet connection, you can use it on any device. Retail merchants might use it on a phone or a tablet."
+		},
+		"safety": {
+			"question": "When do my funds settle?",
+			"answer": "Lightning payments are settled instantly. You can withdraw your balance to another wallet or exchange right after payments are received."
+		}
+	},
+	"footer": {
+		"company": "Company",
+		"followUs": "Follow Us",
+		"github": "GitHub",
+		"jobs": "Jobs",
+		"support": "Support",
+		"telegram": "Telegram",
+		"twitter": "Twitter",
+		"documentation": "Documentation"
+	},
+	"howItWorks": {
+		"header": "How it works",
+		"step1": {
+			"header": "1. Create your account",
+			"description": "A username and password is all you need to get started."
+		},
+		"step2": {
+			"header": "2. Ask for payments",
+			"description": "The same as you normally would, but with bitcoin."
+		},
+		"step3": {
+			"header": "3. That's all!",
+			"description": "Spend your coin at other merchants or save it for a rainy day, the choice is yours."
+		}
+	},
+	"invoice": {
+		"addTip": "Add a tip",
+		"addTipq": "Add a tip?",
+		"done": "Done",
+		"paymentSuccessful": "Payment received!",
+		"invoice": "Invoice",
+		"total": "Total",
+		"tip": "Tip"
+	},
+	"jobs": {
+		"header": "Jobs",
+		"subheader": "Current Openings",
+		"pitch1": "Coinos is actively looking for developers to join our growing team (full-time or part-time, remote working OK).",
+		"pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on",
+		"github": "GitHub",
+		"pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to"
+	},
+	"landing": {
+		"header_before_icon": "The",
+		"header_with_icon": "easiest",
+		"header_after_icon": "way to accept bitcoin in your store.",
+		"subheader": "Grow your customer base and revenue by accepting bitcoin with an easy-to-use web app. No software or hardware required.",
+		"info1": {
+			"title": "Instant payments via Lightning",
+			"description": "The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees."
+		},
+		"info2": {
+			"title": "Simple to use",
+			"description1": "Just enter an amount in your local currency, share the QR code and you’re done.",
+			"description2": "We do all the heavy lifting so you can focus on your business.",
+			"description3": "You always have the option of taking custody of your funds by withdrawing instantly at any time."
+		},
+		"info3": {
+			"title": "Brand it your way!",
+			"description": "Customize your point of sale look and feel, or keep it on default - it's totally up to you."
+		}
+	},
+	"login": {
+		"optional": "Optional",
+		"token": "2FA Token",
+		"username": "Username",
+		"password": "Password",
+		"email": "Email",
+		"passwordRecommendation": "We recommend a long, random password generated with a password manager.",
+		"forgotUserOrPassword": "Forgot Username or Password?",
+		"haveAccount": "Already have an account?",
+		"noAccount": "Don't have an account?",
+		"register": "Register",
+		"signIn": "Sign In",
+		"failed": "Login failed"
+	},
+	"nav": {
+		"profile": "Profile",
+		"startInSeconds": "Start in Seconds",
+		"account": "Account",
+		"signIn": "Sign In",
+		"signOut": "Sign Out",
+		"dashboard": "Dashboard",
+		"settings": "Settings",
+		"support": "Support"
+	},
+	"newSiteHeader": "Join us at our <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> in Vancouver on October 26! Looking for the old coinos? Visit <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+	"news": {
+		"header": "News",
+		"subheader": "Latest Updates",
+		"update1": ""
+	},
+	"user": {
+		"bitcoin": "Bitcoin",
+		"lightning": "Lightning",
+		"invoice": "Invoice",
+		"unfollow": "Unfollow",
+		"following": "Following",
+		"follow": "Follow",
+		"followers": "Followers",
+		"remove": "Remove",
+		"noNotes": "No notes yet",
+		"message": "Message",
+		"messages": "Messages",
+		"feed": "Feed",
+		"notes": "Notes",
+		"pay": "Pay",
+		"scanToPayBTC": "Scan to pay with bitcoin",
+		"this": "This",
+		"lightningAddress": "lightning address",
+		"likeAnEmail": "is like an email for bitcoin. You can publish it on your website or business cards and use it multiple times.",
+		"dashboard": {
+			"go": "Go",
+			"dashboard": "Dashboard",
+			"accountBalance": "Account Balance",
+			"bitcoinPrice": "bitcoin Price:",
+			"conversionFeeWarning": "You will be charged a 1% withdrawal fee on the amount.",
+			"dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.",
+			"fetchingRate": "fetching rate...",
+			"optionalNote": "Note (Optional)",
+			"send": "Send",
+			"receive": "Receive",
+			"withdraw": "Send",
+			"deposit": "Deposit",
+			"voucher": "Voucher"
+		},
+		"receive": {
+			"lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.",
+			"showQR": "Show QR"
+		},
+		"send": {
+			"contacts": "Contacts",
+			"scan": "Scan",
+			"paste": "Paste",
+			"next": "Next",
+			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
+		},
+		"settings": {
+			"bannerImage": "Banner Image",
+			"profileImage": "Profile Image",
+			"oneTimeCode": "Enter one-time code",
+			"accountId": "Account Secret",
+			"header": "Settings",
+			"ACCOUNT": "ACCOUNT",
+			"POINT_OF_SALE": "PREFERENCES",
+			"SECURITY": "SECURITY",
+			"locale": "Language",
+			"username": "Username",
+			"email": "Email",
+			"newPassword": "Change Password",
+			"about": "About",
+			"aboutPlaceholder": "A little something about you or your business address and hours",
+			"emailNotifications": "Email Notifications",
+			"emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.",
+			"smsNotifications": "SMS Notifications",
+			"smsNotificationsDescription": "Coinos will send you text notifications when this is enabled.",
+			"theme": "Color Theme",
+			"tipPrompt": "Prompt for tips",
+			"tipPromptDescription": "Ask people if they want to add a tip before paying their invoices",
+			"displayName": "Display name",
+			"themeDescription": "Select from the default color themes.",
+			"localCurrency": "Currency",
+			"btcUnit": "Display bitcoin in:",
+			"bitcoin": "bitcoin",
+			"minutes": "minutes",
+			"hour": "hour",
+			"hours": "hours",
+			"satoshis": "Satoshis",
+			"securityPIN": "Security PIN",
+			"securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
+			"setPIN": "Set PIN",
+			"autoLock": "Auto-Lock Timer",
+			"autoLockDescription": "Your account will go into a secure mode, requiring you to re-enter your credentials after a specified time:",
+			"twofa": "2-Factor Authentication",
+			"twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
+			"twofaSetup": "Set up 2FA",
+			"twofaDisable": "Disable 2FA",
+			"select": "Select",
+			"verifyPIN": "Verify PIN",
+			"enablePIN": "Enable PIN",
+			"disablePIN": "Disable PIN"
+		},
+		"support": {
+			"header": "Support",
+			"email": "Email",
+			"accountName": "Account Name",
+			"message": "Message",
+			"send": "Send"
+		}
+	},
+	"payments": {
+		"amount": "Amount",
+		"date": "Date",
+		"id": "Transaction ID",
+		"details": "Transaction Details",
+		"header": "Payments",
+		"preimage": "Proof of payment",
+		"type": "Type",
+		"time": "Time",
+		"sent": "Sent",
+		"received": "Received",
+		"empty": "No transactions yet.",
+		"send": "Send",
+		"next": "Next",
+		"sendersChoice": "Sender's choice",
+		"sendTo": "Send to",
+		"to": "to",
+		"pay": "Pay",
+		"requesting": "is requesting",
+		"sentInvoiceTo": "Sent invoice to",
+		"sentRequestTo": "Request sent!",
+		"pleasePay": "Please pay",
+		"day": "Day",
+		"week": "Week",
+		"month": "Month",
+		"all": "All",
+		"export": "Export",
+		"invoice": "Invoice",
+		"readyToPay": "is ready to pay",
+		"describeOrder": "Use this field to describe your order",
+		"requestAnInvoice": "Request Invoice",
+		"submit": "Submit",
+		"isRequesting": "is requesting",
+		"invoiceFrom": "Invoice from",
+		"awaiting": "Awaiting",
+		"tapAnywhere": "Tap anywhere to continue",
+		"from": "from",
+		"redeem": "Redeem",
+		"redeemed": "Redeemed",
+		"redeemedBy": "Redeemed by",
+		"sendMessage": "Write a message..."
+	}
+}
-- 
cgit v1.2.3