From a1e5e39f8e6b972c91893daa7a73c01219c6a915 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:02:26 -0700 Subject: [PATCH] =?UTF-8?q?[docs]=20init=20docs=20v2=20(#7283)-=20initial?= =?UTF-8?q?=20commit=20for=20lightspark=20docs=20v2=20=F0=9F=93=9D-=20copi?= =?UTF-8?q?es=20over=20most=20files=20from=20umame-docs=20=C2=A9=EF=B8=8F-?= =?UTF-8?q?=20removes=20mention=20of=20UMA=20and=20replaces=20with=20Light?= =?UTF-8?q?spark=20=E2=9A=A1-=20adjusts=20colors=20=F0=9F=A7=91=E2=80=8D?= =?UTF-8?q?=F0=9F=8E=A8-=20adds=20articles=20for=20all=20existing=20lights?= =?UTF-8?q?park=20and=20wallet=20sdk=20documentation=20(minus=20the=20actu?= =?UTF-8?q?al=20content)=20=F0=9F=A9=BB-=20TODO:=20refactor=20most=20of=20?= =?UTF-8?q?this=20out=20into=20a=20"documentation=20framework"![Screenshot?= =?UTF-8?q?=202023-10-31=20at=205.18.28=20PM.png](https://graphite-user-up?= =?UTF-8?q?loaded-assets-prod.s3.amazonaws.com/NU8OmLauzLqa61yWDJkY/f584e7?= =?UTF-8?q?0e-896c-45e6-b673-79ac1bfae781.png)=20(#308)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [docs] init docs v2 (#7283) - initial commit for lightspark docs v2 📝 - copies over most files from umame-docs ©️ - removes mention of UMA and replaces with Lightspark ⚡ - adjusts colors 🧑‍🎨 - adds articles for all existing lightspark and wallet sdk documentation (minus the actual content) 🩻 - TODO: refactor most of this out into a "documentation framework" ![Screenshot 2023-10-31 at 5.18.28 PM.png](https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/NU8OmLauzLqa61yWDJkY/f584e70e-896c-45e6-b673-79ac1bfae781.png) GitOrigin-RevId: f4d9f886a464f9c34f850eba0e1f6fc4e99016d1 * Add utxoCallback handler to the js test vasp (#7292) GitOrigin-RevId: 6fdff2a2c0467a9dc304d7e156168b2cb36df9cc * Exclude original PR number and extended commit message for release PR * fix syntax error --------- Co-authored-by: Brian Siao Tick Chong Co-authored-by: Jeremy Klein Co-authored-by: Corey Martin --- .github/workflows/create-release-pr.yaml | 4 ++-- apps/examples/uma-vasp/src/ReceivingVasp.ts | 2 +- apps/examples/uma-vasp/src/SendingVasp.ts | 4 +--- apps/examples/uma-vasp/src/index.ts | 6 ++++++ packages/ui/styles/colors.tsx | 9 +++++---- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/create-release-pr.yaml b/.github/workflows/create-release-pr.yaml index b52c7b37b..6f9a512a6 100644 --- a/.github/workflows/create-release-pr.yaml +++ b/.github/workflows/create-release-pr.yaml @@ -61,7 +61,7 @@ jobs: repo, head: triggeringRefHead, base, - title: latestCommit.commit.message.replace(/\sGitOrigin-RevId.*/, ""), + title: latestCommit.commit.message.replace(/\sGitOrigin-RevId.*/, "").replace(/^(.+)\s\(#[0-9]+\).*/, "$1").substring(0, 30), body: "If this change should result in new package versions please add a changeset before merging. You can do so by clicking the link provided by changeset bot below." }); pr = result.data; @@ -150,7 +150,7 @@ jobs: repo, head: triggeringRefHead, base, - title: latestCommit.commit.message.replace(/\sGitOrigin-RevId.*/, "").substring(0, 30), + title: latestCommit.commit.message.replace(/\sGitOrigin-RevId.*/, "").replace(/^(.+)\s\(#[0-9]+\).*/, "$1").substring(0, 30), body: "If this change should result in new package versions please add a changeset before merging. You can do so by clicking the maintainers link provided by changeset-bot below.\n\nPlease note that changeset-bot appears to produce inconsistent / incorrect results with the latest version of changesets when run locally. Be sure to check that it is correctly mentioning the changed packages in the referenced link, or produce the changeset locally `yarn changeset` and push it to the branch." }); pr = result.data; diff --git a/apps/examples/uma-vasp/src/ReceivingVasp.ts b/apps/examples/uma-vasp/src/ReceivingVasp.ts index 5c993dc50..c6cbc623b 100644 --- a/apps/examples/uma-vasp/src/ReceivingVasp.ts +++ b/apps/examples/uma-vasp/src/ReceivingVasp.ts @@ -249,7 +249,7 @@ export default class ReceivingVasp { } private getUtxoCallback(req: Request, txId: String): string { - const path = "/api/uma/utxoCallback?txId=${txId}"; + const path = `/api/uma/utxoCallback?txId=${txId}`; return `${req.protocol}://${req.hostname}${path}`; } } diff --git a/apps/examples/uma-vasp/src/SendingVasp.ts b/apps/examples/uma-vasp/src/SendingVasp.ts index 0b24404dd..67039225c 100644 --- a/apps/examples/uma-vasp/src/SendingVasp.ts +++ b/apps/examples/uma-vasp/src/SendingVasp.ts @@ -499,10 +499,8 @@ export default class SendingVasp { } private getUtxoCallback(req: Request, txId: string): string { - const protocol = req.protocol; - const host = req.hostname; const path = `/api/uma/utxoCallback?txId=${txId}`; - return `${protocol}://${host}${path}`; + return `${req.protocol}://${req.hostname}${path}`; } private async waitForPaymentCompletion( diff --git a/apps/examples/uma-vasp/src/index.ts b/apps/examples/uma-vasp/src/index.ts index 7eab870db..a3dc7c3ed 100644 --- a/apps/examples/uma-vasp/src/index.ts +++ b/apps/examples/uma-vasp/src/index.ts @@ -36,6 +36,12 @@ app.get("/.well-known/lnurlpubkey", (req, res) => { }); }); +app.post("/api/uma/utxoCallback", (req, res) => { + console.log(`Received UTXO callback for ${req.query.txid}`); + console.log(` ${req.body}`); + res.send("ok"); +}); + // Default 404 handler. app.use(function (req, res, next) { res.status(404); diff --git a/packages/ui/styles/colors.tsx b/packages/ui/styles/colors.tsx index da6ecc903..0f479ef05 100644 --- a/packages/ui/styles/colors.tsx +++ b/packages/ui/styles/colors.tsx @@ -220,16 +220,17 @@ const lightTheme = extend(lightBaseTheme, { text: colors.gray60, }), nav: extendBase(lightBaseTheme, { - text: colors.gray60, + text: colors.gray10, + secondary: colors.secondary, }), content: extendBase(lightBaseTheme, { bg: colors.white, smBg: colors.white, }), controls: extendBase(lightBaseTheme, { - bg: neutral.gray40, - smBg: neutral.gray40, - text: neutral.white, + bg: neutral.gray95, + smBg: neutral.gray95, + text: neutral.gray60, secondary: colors.secondary, }), });