Merge branch 'main' into greg/viem-ox

Author: gregfromstl

.changeset/cyan-shrimps-battle.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Update implementations

.changeset/fair-planes-doubt.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+SDK: Fix chain switching in smart account transactions

.changeset/metal-mails-ring.md

@@ -0,0 +1,20 @@
+---
+"thirdweb": patch
+---
+
+- Add onClose callback to Connect Details modal
+
+```tsx
+<ConnectButton
+  detailsModal={{
+    onClose: (screen: string) => {
+      // The last screen name that was being shown when user closed the modal
+      console.log({ screen });
+    }
+  }}
+/>
+```
+
+- Small fix for ChainIcon: Always resolve IPFS URI
+
+- Improve test coverage

.github/pull_request_template.md

@@ -1,4 +1,12 @@
-## Problem solved
+---
+title: "[SDK/Dashboard/Portal] Feature/Fix: Concise title for the changes"
+---
 
-Short description of the bug fixed or feature added
+If you did not copy the branch name from Linear, paste the issue tag here (format is TEAM-0000):
+
+## Notes for the reviewer
+Anything important to call out? Be sure to also clarify these in your comments.
+
+## How to test
+Unit tests, playground, etc.
 

.github/workflows/auto-assign.yml

@@ -13,6 +13,7 @@ jobs:
     if: |
       github.event.pull_request.author_association == 'MEMBER' ||
       github.event.pull_request.author_association == 'OWNER' ||
-      github.event.pull_request.author_association == 'COLLABORATOR'
+      github.event.pull_request.author_association == 'COLLABORATOR' ||
+      github.event.pull_request.author_association == 'CONTRIBUTOR'
     steps:
       - uses: toshimaru/[email protected]

.github/workflows/issue.yml

@@ -5,7 +5,7 @@ on:
     types: [opened, edited, ready_for_review]
 
 env:
-  VALID_ISSUE_PREFIXES: "CORE|TOOL"
+  VALID_ISSUE_PREFIXES: "CORE|TOOL|NEB|INFRA"
 
 jobs:
   linear:

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/stale@v9
         with:
-          stale-issue-message: 'This issue has been inactive for 30 days. It is now marked as stale and will be closed in 5 days if no further activity occurs.'
-          stale-pr-message: 'This PR has been inactive for 30 days. It is now marked as stale and will be closed in 5 days if no further activity occurs.'
+          stale-issue-message: 'This issue has been inactive for 7 days. It is now marked as stale and will be closed in 2 days if no further activity occurs.'
+          stale-pr-message: 'This PR has been inactive for 7 days. It is now marked as stale and will be closed in 2 days if no further activity occurs.'
           days-before-stale: 7
           days-before-close: 2

apps/dashboard/next-env.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
+// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

apps/dashboard/package.json

@@ -31,7 +31,7 @@
     "@marsidev/react-turnstile": "^1.1.0",
     "@n8tb1t/use-scroll-position": "^2.0.3",
     "@radix-ui/react-accordion": "^1.2.2",
-    "@radix-ui/react-alert-dialog": "^1.1.3",
+    "@radix-ui/react-alert-dialog": "^1.1.4",
     "@radix-ui/react-avatar": "^1.1.2",
     "@radix-ui/react-checkbox": "^1.1.3",
     "@radix-ui/react-dialog": "1.1.3",
@@ -95,7 +95,7 @@
     "sonner": "^1.7.1",
     "spdx-correct": "^3.2.0",
     "swagger-ui-react": "^5.18.2",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "thirdweb": "workspace:*",
     "tiny-invariant": "^1.3.3",
@@ -122,7 +122,7 @@
     "@types/papaparse": "^5.3.15",
     "@types/pluralize": "^0.0.33",
     "@types/qrcode": "^1.5.5",
-    "@types/react": "19.0.1",
+    "@types/react": "19.0.2",
     "@types/react-dom": "19.0.2",
     "@types/react-table": "^7.7.20",
     "@types/spdx-correct": "^3.1.3",

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-form.tsx

@@ -18,6 +18,7 @@ import { CurrencySelector } from "components/shared/CurrencySelector";
 import { SolidityInput } from "contract-ui/components/solidity-inputs";
 import { useTrack } from "hooks/analytics/useTrack";
 import { useAllChainsData } from "hooks/chains/allChains";
+import { useTxNotifications } from "hooks/useTxNotifications";
 import { isAlchemySupported } from "lib/wallet/nfts/alchemy";
 import { isMoralisSupported } from "lib/wallet/nfts/moralis";
 import { isSimpleHashSupported } from "lib/wallet/nfts/simpleHash";
@@ -125,6 +126,15 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
     walletAddress: account?.address,
   });
   const sendAndConfirmTx = useSendAndConfirmTransaction();
+  const listingNotifications = useTxNotifications(
+    "NFT listed Successfully",
+    "Failed to list NFT",
+  );
+
+  const auctionNotifications = useTxNotifications(
+    "Auction created successfully",
+    "Failed to create an auction",
+  );
 
   const form = useForm<ListForm>({
     defaultValues:
@@ -351,14 +361,11 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
               endTimestamp,
             });
 
-            const promise = sendAndConfirmTx.mutateAsync(transaction, {
+            await sendAndConfirmTx.mutateAsync(transaction, {
               onSuccess: () => setOpen(false),
             });
-            toast.promise(promise, {
-              loading: "Listing NFT",
-              success: "NFT listed successfully",
-              error: "Failed to list NFT",
-            });
+
+            listingNotifications.onSuccess();
           } else if (formData.listingType === "auction") {
             let minimumBidAmountWei: bigint;
             let buyoutBidAmountWei: bigint;
@@ -403,7 +410,7 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
               buyoutBidAmountWei: buyoutBidAmountWei * selectedQuantity,
             });
 
-            const promise = sendAndConfirmTx.mutateAsync(transaction, {
+            await sendAndConfirmTx.mutateAsync(transaction, {
               onSuccess: () => {
                 trackEvent({
                   category: "marketplace",
@@ -423,15 +430,15 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
                 });
               },
             });
-            toast.promise(promise, {
-              loading: "Creating auction",
-              success: "Auction created successfully",
-              error: "Failed to create auction",
-            });
+            auctionNotifications.onSuccess();
           }
         } catch (err) {
           console.error(err);
-          toast.error("Failed to list NFT");
+          if (formData.listingType === "auction") {
+            auctionNotifications.onError(err);
+          } else {
+            listingNotifications.onError(err);
+          }
         }
 
         setIsFormLoading(false);