From 6a2221bf3ba4d0f5e57a56a8af859653cdebb5d0 Mon Sep 17 00:00:00 2001 From: Pablo Alayeto <55535804+Pabl0cks@users.noreply.github.com> Date: Fri, 3 May 2024 13:43:40 +0200 Subject: [PATCH 1/6] AddressInfoModal fix copy icon size on bigger fonts (#836) --- .../RainbowKitCustomConnectButton/AddressQRCodeModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressQRCodeModal.tsx b/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressQRCodeModal.tsx index 98cb1661a..b5bb2efb8 100644 --- a/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressQRCodeModal.tsx +++ b/packages/nextjs/components/scaffold-eth/RainbowKitCustomConnectButton/AddressQRCodeModal.tsx @@ -20,7 +20,7 @@ export const AddressQRCodeModal = ({ address, modalId }: AddressQRCodeModalProps ✕
-
+
From 0f9d9dbad51ed2b53179d5be4526e8263d18ab8f Mon Sep 17 00:00:00 2001 From: Rinat Date: Tue, 7 May 2024 09:21:41 +0200 Subject: [PATCH 2/6] fix: useScaffoldWatchContractEvent logs args types (#837) --- packages/nextjs/utils/scaffold-eth/contract.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/nextjs/utils/scaffold-eth/contract.ts b/packages/nextjs/utils/scaffold-eth/contract.ts index 2c5a3e8a4..bf4580d1a 100644 --- a/packages/nextjs/utils/scaffold-eth/contract.ts +++ b/packages/nextjs/utils/scaffold-eth/contract.ts @@ -214,8 +214,9 @@ export type UseScaffoldEventConfig< >, > = { contractName: TContractName; + eventName: TEventName; } & IsContractDeclarationMissing< - Omit & { + Omit & { onLogs: ( logs: Simplify< Omit, "args" | "eventName"> & { @@ -225,7 +226,7 @@ export type UseScaffoldEventConfig< >[], ) => void; }, - Omit>, "onLogs" | "address" | "abi"> & { + Omit>, "onLogs" | "address" | "abi" | "eventName"> & { onLogs: ( logs: Simplify< Omit, "args"> & { From 3ff50f2f076cc8eb91c68c4aafa9c88e4e782b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez?= Date: Tue, 7 May 2024 14:44:12 +0200 Subject: [PATCH 3/6] Improve meta handling (#811) --- packages/nextjs/app/layout.tsx | 47 ++----------------- .../nextjs/utils/scaffold-eth/getMetadata.ts | 24 +++++++--- 2 files changed, 23 insertions(+), 48 deletions(-) diff --git a/packages/nextjs/app/layout.tsx b/packages/nextjs/app/layout.tsx index 8ed8ca41f..be1234b59 100644 --- a/packages/nextjs/app/layout.tsx +++ b/packages/nextjs/app/layout.tsx @@ -1,50 +1,13 @@ import "@rainbow-me/rainbowkit/styles.css"; -import { Metadata } from "next"; import { ScaffoldEthAppWithProviders } from "~~/components/ScaffoldEthAppWithProviders"; import { ThemeProvider } from "~~/components/ThemeProvider"; import "~~/styles/globals.css"; +import { getMetadata } from "~~/utils/scaffold-eth/getMetadata"; -const baseUrl = process.env.VERCEL_URL - ? `https://${process.env.VERCEL_URL}` - : `http://localhost:${process.env.PORT || 3000}`; -const imageUrl = `${baseUrl}/thumbnail.jpg`; - -const title = "Scaffold-ETH 2 App"; -const titleTemplate = "%s | Scaffold-ETH 2"; -const description = "Built with 🏗 Scaffold-ETH 2"; - -export const metadata: Metadata = { - metadataBase: new URL(baseUrl), - title: { - default: title, - template: titleTemplate, - }, - description, - openGraph: { - title: { - default: title, - template: titleTemplate, - }, - description, - images: [ - { - url: imageUrl, - }, - ], - }, - twitter: { - card: "summary_large_image", - images: [imageUrl], - title: { - default: title, - template: titleTemplate, - }, - description, - }, - icons: { - icon: [{ url: "/favicon.png", sizes: "32x32", type: "image/png" }], - }, -}; +export const metadata = getMetadata({ + title: "Scaffold-ETH 2 App", + description: "Built with 🏗 Scaffold-ETH 2", +}); const ScaffoldEthApp = ({ children }: { children: React.ReactNode }) => { return ( diff --git a/packages/nextjs/utils/scaffold-eth/getMetadata.ts b/packages/nextjs/utils/scaffold-eth/getMetadata.ts index 918700178..23fbca4ce 100644 --- a/packages/nextjs/utils/scaffold-eth/getMetadata.ts +++ b/packages/nextjs/utils/scaffold-eth/getMetadata.ts @@ -1,5 +1,10 @@ import type { Metadata } from "next"; +const baseUrl = process.env.VERCEL_PROJECT_PRODUCTION_URL + ? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}` + : `http://localhost:${process.env.PORT || 3000}`; +const titleTemplate = "%s | Scaffold-ETH 2"; + export const getMetadata = ({ title, description, @@ -9,15 +14,19 @@ export const getMetadata = ({ description: string; imageRelativePath?: string; }): Metadata => { - const baseUrl = process.env.VERCEL_URL - ? `https://${process.env.VERCEL_URL}` - : `http://localhost:${process.env.PORT || 3000}`; const imageUrl = `${baseUrl}${imageRelativePath}`; + return { - title: title, + title: { + default: title, + template: titleTemplate, + }, description: description, openGraph: { - title: title, + title: { + default: title, + template: titleTemplate, + }, description: description, images: [ { @@ -26,7 +35,10 @@ export const getMetadata = ({ ], }, twitter: { - title: title, + title: { + default: title, + template: titleTemplate, + }, description: description, images: [imageUrl], }, From 7b2642cb4571173873764852b67dee6bc9786f6b Mon Sep 17 00:00:00 2001 From: Rinat Date: Thu, 9 May 2024 07:47:37 +0200 Subject: [PATCH 4/6] export useWatchBalance & useTargetNetwork form hooks index file (#840) --- packages/nextjs/hooks/scaffold-eth/index.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/nextjs/hooks/scaffold-eth/index.ts b/packages/nextjs/hooks/scaffold-eth/index.ts index b4b5223db..6f5c3b9a0 100644 --- a/packages/nextjs/hooks/scaffold-eth/index.ts +++ b/packages/nextjs/hooks/scaffold-eth/index.ts @@ -1,14 +1,16 @@ export * from "./useAnimationConfig"; export * from "./useBurnerWallet"; +export * from "./useContractLogs"; export * from "./useDeployedContractInfo"; +export * from "./useFetchBlocks"; export * from "./useNativeCurrencyPrice"; export * from "./useNetworkColor"; export * from "./useOutsideClick"; export * from "./useScaffoldContract"; +export * from "./useScaffoldEventHistory"; export * from "./useScaffoldReadContract"; -export * from "./useScaffoldWriteContract"; export * from "./useScaffoldWatchContractEvent"; -export * from "./useScaffoldEventHistory"; +export * from "./useScaffoldWriteContract"; +export * from "./useTargetNetwork"; export * from "./useTransactor"; -export * from "./useFetchBlocks"; -export * from "./useContractLogs"; +export * from "./useWatchBalance"; From 0db0d5f52a99f40d375977ea623d2a6bc01fff15 Mon Sep 17 00:00:00 2001 From: "Shiv Bhonde | shivbhonde.eth" Date: Fri, 10 May 2024 21:48:30 +0530 Subject: [PATCH 5/6] bump burner-connector version (#842) --- packages/nextjs/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 1b24a1b53..422901eed 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -20,7 +20,7 @@ "@uniswap/sdk-core": "^4.0.1", "@uniswap/v2-sdk": "^3.0.1", "blo": "^1.0.1", - "burner-connector": "^0.0.3", + "burner-connector": "^0.0.5", "daisyui": "4.5.0", "next": "^14.0.4", "next-themes": "^0.2.1", diff --git a/yarn.lock b/yarn.lock index d0f4d6a04..c58658237 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2260,7 +2260,7 @@ __metadata: abitype: ^1.0.2 autoprefixer: ^10.4.12 blo: ^1.0.1 - burner-connector: ^0.0.3 + burner-connector: ^0.0.5 daisyui: 4.5.0 eslint: ^8.15.0 eslint-config-next: ^14.0.4 @@ -4900,14 +4900,14 @@ __metadata: languageName: node linkType: hard -"burner-connector@npm:^0.0.3": - version: 0.0.3 - resolution: "burner-connector@npm:0.0.3" +"burner-connector@npm:^0.0.5": + version: 0.0.5 + resolution: "burner-connector@npm:0.0.5" dependencies: "@rainbow-me/rainbowkit": 2.0.2 "@wagmi/core": 2.6.9 viem: 2.8.16 - checksum: 6041e4aab56af02a01ab211cf278d8babd047db43f4ab43fdb7b9dfd8704d35cbb7da2af240de8b9c782b805031ef43c5788bd0594191b2508f2679dd3ff5041 + checksum: 39ef1af3c80c84a2da891682496d86b5092cc3d8ea0524095323bc6e40e651fb1db1697b6c7e6d260b39df77ca1cbd81dc89e919b713d8de2b7bef082581647d languageName: node linkType: hard From 7dd7be8ca19dc818783ed125ff3e4484b62243df Mon Sep 17 00:00:00 2001 From: Shiv Bhonde Date: Sat, 11 May 2024 10:25:20 +0530 Subject: [PATCH 6/6] add changeset --- .changeset/beige-steaks-notice.md | 5 +++++ .changeset/long-sloths-knock.md | 5 +++++ .changeset/metal-flies-melt.md | 5 +++++ .changeset/shiny-jars-press.md | 5 +++++ .changeset/tough-bears-switch.md | 5 +++++ 5 files changed, 25 insertions(+) create mode 100644 .changeset/beige-steaks-notice.md create mode 100644 .changeset/long-sloths-knock.md create mode 100644 .changeset/metal-flies-melt.md create mode 100644 .changeset/shiny-jars-press.md create mode 100644 .changeset/tough-bears-switch.md diff --git a/.changeset/beige-steaks-notice.md b/.changeset/beige-steaks-notice.md new file mode 100644 index 000000000..0b5b1c614 --- /dev/null +++ b/.changeset/beige-steaks-notice.md @@ -0,0 +1,5 @@ +--- +"create-eth": patch +--- + +- AddressInfoModal fix copy icon size on bigger fonts (scaffold-eth#836) diff --git a/.changeset/long-sloths-knock.md b/.changeset/long-sloths-knock.md new file mode 100644 index 000000000..be3ff4436 --- /dev/null +++ b/.changeset/long-sloths-knock.md @@ -0,0 +1,5 @@ +--- +"create-eth": patch +--- + +bump burner-connector version (scaffold-eth#842) diff --git a/.changeset/metal-flies-melt.md b/.changeset/metal-flies-melt.md new file mode 100644 index 000000000..c91371479 --- /dev/null +++ b/.changeset/metal-flies-melt.md @@ -0,0 +1,5 @@ +--- +"create-eth": patch +--- + +export useWatchBalance & useTargetNetwork form hooks index file (scaffold-eth#840) diff --git a/.changeset/shiny-jars-press.md b/.changeset/shiny-jars-press.md new file mode 100644 index 000000000..30229afe7 --- /dev/null +++ b/.changeset/shiny-jars-press.md @@ -0,0 +1,5 @@ +--- +"create-eth": patch +--- + +Improve meta handling (scaffold-eth#811) diff --git a/.changeset/tough-bears-switch.md b/.changeset/tough-bears-switch.md new file mode 100644 index 000000000..18c9a1ed5 --- /dev/null +++ b/.changeset/tough-bears-switch.md @@ -0,0 +1,5 @@ +--- +"create-eth": patch +--- + +fix: useScaffoldWatchContractEvent logs args types (scaffold-eth#837)