diff --git a/package.json b/package.json
index 45af903..1f05399 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "make-scoped-magic-app",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A tool for quickly scaffolding an app with Magic authentication baked-in!",
   "repository": "magiclabs/make-scoped-magic-app",
   "license": "MIT",
@@ -30,8 +30,8 @@
     "@types/node": "^14.14.12",
     "@types/parse-package-name": "^0.1.0",
     "@types/pretty-time": "^1.1.3",
-    "@types/react": "^17.0.0",
-    "@types/react-is": "^17.0.0",
+    "@types/react": "^19.0.12",
+    "@types/react-is": "^19.0.0",
     "@types/tar": "^4.0.4",
     "@types/watch": "^1.0.6",
     "@types/yargs-parser": "^20.2.0",
@@ -94,5 +94,6 @@
     "tar": "^6.2.1",
     "braces": "^3.0.3",
     "merge": "^2.1.1"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/scaffolds/nextjs-dedicated-wallet/template/package.json b/scaffolds/nextjs-dedicated-wallet/template/package.json
index 28ddc62..c00258c 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/package.json
+++ b/scaffolds/nextjs-dedicated-wallet/template/package.json
@@ -11,15 +11,15 @@
   "dependencies": {
     "@magic-ext/oauth": "^23.0.3",
     "@types/node": "20.3.3",
-    "@types/react": "18.2.14",
-    "@types/react-dom": "18.2.6",
+    "@types/react": "19.0.12",
+    "@types/react-dom": "19.0.4",
     "autoprefixer": "10.4.14",
     "classnames": "^2.3.2",
     "magic-sdk": "^29.0.2",
-    "next": "13.4.7",
+    "next": "15.2.4",
     "postcss": "8.4.24",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "react-toastify": "^9.1.3",
     "tailwindcss": "3.3.2",
     "typescript": "5.1.6",
@@ -27,6 +27,6 @@
   },
   "devDependencies": {
     "eslint": "^8.45.0",
-    "eslint-config-next": "13.4.10"
+    "eslint-config-next": "15.2.4"
   }
 }
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
new file mode 100644
index 0000000..32ff535
--- /dev/null
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
@@ -0,0 +1,38 @@
+import React, { useCallback } from 'react';
+import DevLinks from './DevLinks';
+import Image from 'next/image';
+
+const MagicDashboardRedirect = () => {
+  const onClick = useCallback(() => {
+    window.open('https://dashboard.magic.link/signup', '_blank');
+  }, []);
+
+  return (
+    <div className="redirect-container">
+      <div className="flex flex-col mt-10 gap-2.5 items-center">
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
+        <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
+        <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
+          Demo
+        </div>
+      </div>
+      <div className="flex flex-col items-center flex-1">
+        <div className="redirect-card">
+          <div className="flex gap-2 mx-4 my-2 ">
+            <Image src="/info.svg" alt="info" width={24} height={24} />
+            <h3 className="max-w-[480px] text-[#4E4D52] text-base font-normal">
+              Please set your <code>NEXT_PUBLIC_MAGIC_API_KEY</code> environment variable in <code>.env</code>. You can
+              get your Magic API key from the Magic Dashboard.
+            </h3>
+          </div>
+        </div>
+
+        <button className="api-button" onClick={onClick} disabled={false}>
+          Get API keys
+          <Image src="/link_white.svg" alt="link-icon" width={24} height={24} className="ml-[6px] my-auto" />
+        </button>
+      </div>
+      <DevLinks />
+    </div>
+  );
+};
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Discord.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
index e25d35a..61752b8 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveUserInfo } from '@/utils/common';
 import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import discord from 'public/social/Discord.svg';
 import Card from '@/components/ui/Card';
 import CardHeader from '@/components/ui/CardHeader';
 
@@ -63,7 +62,7 @@ const Discord = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={discord} alt="Discord" height={24} width={24} className="mr-6" />
+            <Image src="/social/Discord.svg" alt="Discord" height={24} width={24} className="mr-6" />
             <div className="w-full text-xs font-semibold text-center">Continue with Discord</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
index 676553b..2a3ff65 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveUserInfo } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import facebook from 'public/social/Facebook.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -64,7 +63,7 @@ const Facebook = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={facebook} alt="Facebook" height={24} width={24} className="mr-6" />
+            <Image src="/social/Facebook.svg" alt="Facebook" height={24} width={24} className="mr-6" />
             <div className="w-full text-xs font-semibold text-center">Continue with Facebook</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Github.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Github.tsx
index e5eacf9..94d9591 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Github.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Github.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveUserInfo } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import github from 'public/social/Github.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -64,7 +63,7 @@ const Github = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={github} alt="Github" height={24} width={24} className="mr-6" />
+            <Image src="/social/Github.svg" alt="Github" height={24} width={24} className="mr-6" />
             <div className="w-full text-xs font-semibold text-center">Continue with Github</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Google.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Google.tsx
index e683ba2..928363b 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Google.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Google.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveUserInfo } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import google from 'public/social/Google.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -64,7 +63,7 @@ const Google = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={google} alt="Google" height={24} width={24} className="mr-6" />
+            <Image src="/social/Google.svg" alt="Google" height={24} width={24} className="mr-6" />
             <div className="w-full text-xs font-semibold text-center">Continue with Google</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
index 19a186a..c656e2b 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveUserInfo } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import twitch from 'public/social/Twitch.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -64,7 +63,7 @@ const Twitch = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitch} alt="Twitch" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitch.svg" alt="Twitch" height={24} width={24} className="mr-6" />
             <div className="w-full text-xs font-semibold text-center">Continue with Twitch</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
index a00dc55..d919f2c 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveUserInfo } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import twitter from 'public/social/Twitter.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -64,7 +63,7 @@ const Twitter = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitter} alt="Twitter" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitter.svg" alt="Twitter" height={24} width={24} className="mr-6" />
             <div className="w-full text-xs font-semibold text-center">Continue with Twitter</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx
index 80fe44d..99df414 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx
@@ -11,7 +11,6 @@ import showToast from '@/utils/showToast';
 import Spacer from '@/components/ui/Spacer';
 import TransactionHistory from '@/components/ui/TransactionHistory';
 import Image from 'next/image';
-import Link from 'public/link.svg';
 import { TxnParams } from '@/utils/types';
 
 const SendTransaction = () => {
@@ -76,7 +75,6 @@ const SendTransaction = () => {
           type: 'error',
         });
       });
-
   }, [web3, amount, publicAddress, toAddress]);
 
   return (
@@ -87,7 +85,7 @@ const SendTransaction = () => {
           <a href={getFaucetUrl()} target="_blank" rel="noreferrer">
             <FormButton onClick={() => null} disabled={false}>
               Get Test {getNetworkToken()}
-              <Image src={Link} alt="link-icon" className="ml-[3px]" />
+              <Image src="/link.svg" alt="link-icon" width={24} height={24} className="ml-[3px]" />
             </FormButton>
           </a>
           <Divider />
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/Header.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/Header.tsx
index 1a8981c..f982d10 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/Header.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/Header.tsx
@@ -1,19 +1,28 @@
 import Image from 'next/image';
-import Logo from 'public/logo.svg';
 import DevLinks from './DevLinks';
 
 const Header = () => {
   return (
     <div className="app-header-container">
       <div className="flex flex-col gap-2.5 items-center">
-        <Image src={Logo} alt="logo" />
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
         <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
         <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
           Demo
         </div>
       </div>
       <DevLinks />
-      <p className="text-sm font-semibold text-white">Take a look at our <a href="https://github.com/magiclabs/make-scoped-magic-app/blob/master/scaffolds/nextjs-dedicated-wallet/template/README.md" target='_blank' className="cursor-pointer text-[#6851ff]">developer guide</a> to learn more about this template</p>
+      <p className="text-sm font-semibold text-white">
+        Take a look at our{' '}
+        <a
+          href="https://github.com/magiclabs/make-scoped-magic-app/blob/master/scaffolds/nextjs-dedicated-wallet/template/README.md"
+          target="_blank"
+          className="cursor-pointer text-[#6851ff]"
+        >
+          developer guide
+        </a>{' '}
+        to learn more about this template
+      </p>
     </div>
   );
 };
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/MagicDashboardRedirect.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/MagicDashboardRedirect.tsx
index 4c2cbed..5e37595 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/MagicDashboardRedirect.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/MagicDashboardRedirect.tsx
@@ -1,9 +1,6 @@
 import React, { useCallback } from 'react';
 import DevLinks from './DevLinks';
 import Image from 'next/image';
-import Info from 'public/info.svg';
-import Link from 'public/link_white.svg';
-import Logo from 'public/logo.svg';
 
 const MagicDashboardRedirect = () => {
   const onClick = useCallback(() => {
@@ -13,7 +10,7 @@ const MagicDashboardRedirect = () => {
   return (
     <div className="redirect-container">
       <div className="flex flex-col mt-10 gap-2.5 items-center">
-        <Image src={Logo} alt="logo" />
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
         <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
         <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
           Demo
@@ -22,7 +19,7 @@ const MagicDashboardRedirect = () => {
       <div className="flex flex-col items-center flex-1">
         <div className="redirect-card">
           <div className="flex gap-2 mx-4 my-2 ">
-            <Image src={Info} alt="logo" />
+            <Image src="/info.svg" alt="info" width={24} height={24} />
             <h3 className="max-w-[480px] text-[#4E4D52] text-base font-normal">
               Please set your <code>NEXT_PUBLIC_MAGIC_API_KEY</code> environment variable in <code>.env</code>. You can
               get your Magic API key from the Magic Dashboard.
@@ -32,7 +29,7 @@ const MagicDashboardRedirect = () => {
 
         <button className="api-button" onClick={onClick} disabled={false}>
           Get API keys
-          <Image src={Link} alt="link-icon" className="ml-[6px] my-auto" />
+          <Image src="/link_white.svg" alt="link-icon" width={24} height={24} className="ml-[6px] my-auto" />
         </button>
       </div>
       <DevLinks />
diff --git a/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx b/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
index 42595c8..aeb468b 100644
--- a/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
+++ b/scaffolds/nextjs-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import Image from 'next/image';
-import Link from 'public/link.svg';
 import { getBlockExplorer } from '@/utils/network';
 
 const TransactionHistory = () => {
@@ -9,7 +8,7 @@ const TransactionHistory = () => {
   return (
     <a className="action-button" href={getBlockExplorer(publicAddress as string)} target="_blank" rel="noreferrer">
       <div className="flex items-center justify-center">
-        Transaction History <Image src={Link} alt="link-icon" className="ml-[3px]" />
+        Transaction History <Image src="/link.svg" alt="link-icon" width={24} height={24} className="ml-[3px]" />
       </div>
     </a>
   );
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/package.json b/scaffolds/nextjs-flow-dedicated-wallet/template/package.json
index aa264a0..db8de0e 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/package.json
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/package.json
@@ -13,21 +13,21 @@
     "@magic-ext/oauth": "^23.0.3",
     "@onflow/fcl": "^1.6.0",
     "@types/node": "20.3.3",
-    "@types/react": "18.2.14",
-    "@types/react-dom": "18.2.6",
+    "@types/react": "19.0.12",
+    "@types/react-dom": "19.0.4",
     "autoprefixer": "10.4.14",
     "classnames": "^2.3.2",
     "magic-sdk": "^29.0.2",
-    "next": "13.4.7",
+    "next": "15.2.4",
     "postcss": "8.4.24",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "react-toastify": "^9.1.3",
     "tailwindcss": "3.3.2",
     "typescript": "5.1.6"
   },
   "devDependencies": {
     "eslint": "^8.45.0",
-    "eslint-config-next": "13.4.10"
+    "eslint-config-next": "15.2.4"
   }
 }
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/Header.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/Header.tsx
index b02dbb1..2ea17d1 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/Header.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/Header.tsx
@@ -1,11 +1,10 @@
 import Image from 'next/image';
-import MagicLogo from 'public/logo.svg';
 import DevLinks from './DevLinks';
 
 const Header = () => {
   return (
     <div className="app-header-container">
-      <Image src={MagicLogo} alt="magic-logo" className="magic-logo" />
+      <Image src="/logo.svg" alt="magic-logo" width={32} height={32} className="magic-logo" />
       <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
       <h3 className="demo-sub-header">Demo</h3>
       <DevLinks />
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
index 4c2cbed..5e37595 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
@@ -1,9 +1,6 @@
 import React, { useCallback } from 'react';
 import DevLinks from './DevLinks';
 import Image from 'next/image';
-import Info from 'public/info.svg';
-import Link from 'public/link_white.svg';
-import Logo from 'public/logo.svg';
 
 const MagicDashboardRedirect = () => {
   const onClick = useCallback(() => {
@@ -13,7 +10,7 @@ const MagicDashboardRedirect = () => {
   return (
     <div className="redirect-container">
       <div className="flex flex-col mt-10 gap-2.5 items-center">
-        <Image src={Logo} alt="logo" />
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
         <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
         <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
           Demo
@@ -22,7 +19,7 @@ const MagicDashboardRedirect = () => {
       <div className="flex flex-col items-center flex-1">
         <div className="redirect-card">
           <div className="flex gap-2 mx-4 my-2 ">
-            <Image src={Info} alt="logo" />
+            <Image src="/info.svg" alt="info" width={24} height={24} />
             <h3 className="max-w-[480px] text-[#4E4D52] text-base font-normal">
               Please set your <code>NEXT_PUBLIC_MAGIC_API_KEY</code> environment variable in <code>.env</code>. You can
               get your Magic API key from the Magic Dashboard.
@@ -32,7 +29,7 @@ const MagicDashboardRedirect = () => {
 
         <button className="api-button" onClick={onClick} disabled={false}>
           Get API keys
-          <Image src={Link} alt="link-icon" className="ml-[6px] my-auto" />
+          <Image src="/link_white.svg" alt="link-icon" width={24} height={24} className="ml-[6px] my-auto" />
         </button>
       </div>
       <DevLinks />
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Discord.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
index 763aed7..090ec91 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
@@ -3,9 +3,7 @@ import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
 import Spinner from '@/components/ui/Spinner';
-import classNames from 'classnames';
 import Image from 'next/image';
-import discord from 'public/social/Discord.svg';
 import Card from '@/components/ui/Card';
 import CardHeader from '@/components/ui/CardHeader';
 
@@ -62,7 +60,7 @@ const Discord = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={discord} alt="Discord" height={24} width={24} className="mr-6" />
+            <Image src="/social/Discord.svg" alt="Discord" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Discord</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
index 17bd3a1..1d02610 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import facebook from 'public/social/Facebook.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Facebook = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Facebook = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={facebook} alt="Facebook" height={24} width={24} className="mr-6" />
+            <Image src="/social/Facebook.svg" alt="Facebook" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Facebook</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Github.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Github.tsx
index 8004de7..db07509 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Github.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Github.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import github from 'public/social/Github.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Github = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Github = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={github} alt="Github" height={24} width={24} className="mr-6" />
+            <Image src="/social/Github.svg" alt="Github" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Github</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Google.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Google.tsx
index 4dc8087..635c9b6 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Google.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Google.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import google from 'public/social/Google.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Google = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Google = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={google} alt="Google" height={24} width={24} className="mr-6" />
+            <Image src="/social/Google.svg" alt="Google" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Google</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
index 8986ba7..732c850 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import twitch from 'public/social/Twitch.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Twitch = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Twitch = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitch} alt="Twitch" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitch.svg" alt="Twitch" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Twitch</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
index f90a7a2..bdfd4ff 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import twitter from 'public/social/Twitter.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Twitter = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Twitter = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitter} alt="Twitter" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitter.svg" alt="Twitter" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Twitter</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx
index 078537e..f9c06d5 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/magic/cards/SendTransactionCard.tsx
@@ -10,7 +10,6 @@ import showToast from '@/utils/showToast';
 import Spinner from '@/components/ui/Spinner';
 import { getFaucetUrl, getNetwork } from '@/utils/network';
 import Image from 'next/image';
-import Link from 'public/link.svg';
 import * as fcl from '@onflow/fcl';
 import Spacer from '@/components/ui/Spacer';
 import TransactionHistory from '@/components/ui/TransactionHistory';
@@ -78,8 +77,8 @@ const SendTransaction = () => {
         <div>
           <a href={getFaucetUrl()} target="_blank" rel="noreferrer">
             <FormButton onClick={() => null} disabled={false}>
-              Get Test FLOW
-              <Image src={Link} alt="link-icon" className="ml-[3px]" />
+              {/* Get Test {getNetworkToken()} getNetworkToken() is not defined */}
+              <Image src="/link.svg" alt="link-icon" width={24} height={24} className="ml-[3px]" />
             </FormButton>
           </a>
           <Divider />
diff --git a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
index 42595c8..aeb468b 100644
--- a/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
+++ b/scaffolds/nextjs-flow-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import Image from 'next/image';
-import Link from 'public/link.svg';
 import { getBlockExplorer } from '@/utils/network';
 
 const TransactionHistory = () => {
@@ -9,7 +8,7 @@ const TransactionHistory = () => {
   return (
     <a className="action-button" href={getBlockExplorer(publicAddress as string)} target="_blank" rel="noreferrer">
       <div className="flex items-center justify-center">
-        Transaction History <Image src={Link} alt="link-icon" className="ml-[3px]" />
+        Transaction History <Image src="/link.svg" alt="link-icon" width={24} height={24} className="ml-[3px]" />
       </div>
     </a>
   );
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/package.json b/scaffolds/nextjs-kadena-dedicated-wallet/template/package.json
index d242312..4aad0f8 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/package.json
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/package.json
@@ -9,27 +9,27 @@
     "lint": "next lint --fix"
   },
   "dependencies": {
-    "@kadena/client": "^1.14.0",
+    "@kadena/client": "^1.17.1",
     "@kadena/pactjs": "^0.4.3",
     "@kadena/types": "^0.7.0",
     "@magic-ext/kadena": "0.9.0",
     "@magic-ext/oauth": "^23.0.3",
     "@types/node": "20.3.3",
-    "@types/react": "18.2.14",
-    "@types/react-dom": "18.2.6",
+    "@types/react": "19.0.12",
+    "@types/react-dom": "19.0.4",
     "autoprefixer": "10.4.14",
     "classnames": "^2.3.2",
     "magic-sdk": "^29.0.2",
-    "next": "13.4.7",
+    "next": "15.2.4",
     "postcss": "8.4.24",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "react-toastify": "^9.1.3",
     "tailwindcss": "3.3.2",
     "typescript": "5.1.6"
   },
   "devDependencies": {
     "eslint": "^8.45.0",
-    "eslint-config-next": "13.4.10"
+    "eslint-config-next": "15.2.4"
   }
 }
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/Header.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/Header.tsx
index a6e4012..e509652 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/Header.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/Header.tsx
@@ -1,12 +1,11 @@
 import Image from 'next/image';
-import Logo from 'public/logo.svg';
 import DevLinks from './DevLinks';
 
 const Header = () => {
   return (
     <div className="app-header-container">
       <div className="flex flex-col gap-2.5 items-center">
-        <Image src={Logo} alt="logo" />
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
         <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
         <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
           Demo
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
index 4c2cbed..5e37595 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
@@ -1,9 +1,6 @@
 import React, { useCallback } from 'react';
 import DevLinks from './DevLinks';
 import Image from 'next/image';
-import Info from 'public/info.svg';
-import Link from 'public/link_white.svg';
-import Logo from 'public/logo.svg';
 
 const MagicDashboardRedirect = () => {
   const onClick = useCallback(() => {
@@ -13,7 +10,7 @@ const MagicDashboardRedirect = () => {
   return (
     <div className="redirect-container">
       <div className="flex flex-col mt-10 gap-2.5 items-center">
-        <Image src={Logo} alt="logo" />
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
         <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
         <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
           Demo
@@ -22,7 +19,7 @@ const MagicDashboardRedirect = () => {
       <div className="flex flex-col items-center flex-1">
         <div className="redirect-card">
           <div className="flex gap-2 mx-4 my-2 ">
-            <Image src={Info} alt="logo" />
+            <Image src="/info.svg" alt="info" width={24} height={24} />
             <h3 className="max-w-[480px] text-[#4E4D52] text-base font-normal">
               Please set your <code>NEXT_PUBLIC_MAGIC_API_KEY</code> environment variable in <code>.env</code>. You can
               get your Magic API key from the Magic Dashboard.
@@ -32,7 +29,7 @@ const MagicDashboardRedirect = () => {
 
         <button className="api-button" onClick={onClick} disabled={false}>
           Get API keys
-          <Image src={Link} alt="link-icon" className="ml-[6px] my-auto" />
+          <Image src="/link_white.svg" alt="link-icon" width={24} height={24} className="ml-[6px] my-auto" />
         </button>
       </div>
       <DevLinks />
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Discord.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
index 0c73450..090ec91 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
 import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import discord from 'public/social/Discord.svg';
 import Card from '@/components/ui/Card';
 import CardHeader from '@/components/ui/CardHeader';
 
@@ -61,7 +60,7 @@ const Discord = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={discord} alt="Discord" height={24} width={24} className="mr-6" />
+            <Image src="/social/Discord.svg" alt="Discord" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Discord</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
index e6ec008..5efea8d 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import facebook from 'public/social/Facebook.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -61,7 +60,7 @@ const Facebook = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={facebook} alt="Facebook" height={24} width={24} className="mr-6" />
+            <Image src="/social/Facebook.svg" alt="Facebook" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Facebook</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Github.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Github.tsx
index ab59253..1a2c3e3 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Github.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Github.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import github from 'public/social/Github.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -61,7 +60,7 @@ const Github = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={github} alt="Github" height={24} width={24} className="mr-6" />
+            <Image src="/social/Github.svg" alt="Github" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Github</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Google.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Google.tsx
index b381b92..d74ddf8 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Google.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Google.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import google from 'public/social/Google.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -61,7 +60,7 @@ const Google = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={google} alt="Google" height={24} width={24} className="mr-6" />
+            <Image src="/social/Google.svg" alt="Google" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Google</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
index 515279f..a6fb930 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import twitch from 'public/social/Twitch.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -61,7 +60,7 @@ const Twitch = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitch} alt="Twitch" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitch.svg" alt="Twitch" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Twitch</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
index fdb06fb..87d0717 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
 import Spinner from '../../ui/Spinner';
 import Image from 'next/image';
-import twitter from 'public/social/Twitter.svg';
 import Card from '../../ui/Card';
 import CardHeader from '../../ui/CardHeader';
 
@@ -61,7 +60,7 @@ const Twitter = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitter} alt="Twitter" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitter.svg" alt="Twitter" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Twitter</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
index ee21857..9cfba30 100644
--- a/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
+++ b/scaffolds/nextjs-kadena-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
@@ -1,13 +1,12 @@
 import React from 'react';
 import Image from 'next/image';
-import Link from 'public/link.svg';
 import { getBlockExplorer } from '@/utils/network';
 
 const TransactionHistory = ({ reqKey }: { reqKey: string }) => {
   return (
     <a className="action-button" href={getBlockExplorer(reqKey)} target="_blank" rel="noreferrer">
       <div className="flex items-center justify-center">
-        Transaction History <Image src={Link} alt="link-icon" className="ml-[3px]" />
+        Transaction History <Image src="/link.svg" alt="link-icon" width={24} height={24} className="ml-[3px]" />
       </div>
     </a>
   );
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/package.json b/scaffolds/nextjs-solana-dedicated-wallet/template/package.json
index 168d8d6..a27f0c4 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/package.json
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/package.json
@@ -13,21 +13,21 @@
     "@magic-ext/solana": "^17.0.0",
     "@solana/web3.js": "^1.87.1",
     "@types/node": "20.3.3",
-    "@types/react": "18.2.14",
-    "@types/react-dom": "18.2.6",
+    "@types/react": "19.0.12",
+    "@types/react-dom": "19.0.4",
     "autoprefixer": "10.4.14",
     "classnames": "^2.3.2",
     "magic-sdk": "^29.0.2",
-    "next": "13.4.7",
+    "next": "15.2.4",
     "postcss": "8.4.24",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
     "react-toastify": "^9.1.3",
     "tailwindcss": "3.3.2",
     "typescript": "5.1.6"
   },
   "devDependencies": {
     "eslint": "^8.45.0",
-    "eslint-config-next": "13.4.10"
+    "eslint-config-next": "15.2.4"
   }
 }
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/Header.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/Header.tsx
index a6e4012..e509652 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/Header.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/Header.tsx
@@ -1,12 +1,11 @@
 import Image from 'next/image';
-import Logo from 'public/logo.svg';
 import DevLinks from './DevLinks';
 
 const Header = () => {
   return (
     <div className="app-header-container">
       <div className="flex flex-col gap-2.5 items-center">
-        <Image src={Logo} alt="logo" />
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
         <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
         <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
           Demo
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
index 4c2cbed..5e37595 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/MagicDashboardRedirect.tsx
@@ -1,9 +1,6 @@
 import React, { useCallback } from 'react';
 import DevLinks from './DevLinks';
 import Image from 'next/image';
-import Info from 'public/info.svg';
-import Link from 'public/link_white.svg';
-import Logo from 'public/logo.svg';
 
 const MagicDashboardRedirect = () => {
   const onClick = useCallback(() => {
@@ -13,7 +10,7 @@ const MagicDashboardRedirect = () => {
   return (
     <div className="redirect-container">
       <div className="flex flex-col mt-10 gap-2.5 items-center">
-        <Image src={Logo} alt="logo" />
+        <Image src="/logo.svg" alt="logo" width={32} height={32} />
         <div className="text-center text-white text-xl font-extrabold font-['Inter'] leading-[30px]">Magic</div>
         <div className="text-center text-white text-opacity-50 text-base font-normal font-['SF Mono'] leading-normal">
           Demo
@@ -22,7 +19,7 @@ const MagicDashboardRedirect = () => {
       <div className="flex flex-col items-center flex-1">
         <div className="redirect-card">
           <div className="flex gap-2 mx-4 my-2 ">
-            <Image src={Info} alt="logo" />
+            <Image src="/info.svg" alt="info" width={24} height={24} />
             <h3 className="max-w-[480px] text-[#4E4D52] text-base font-normal">
               Please set your <code>NEXT_PUBLIC_MAGIC_API_KEY</code> environment variable in <code>.env</code>. You can
               get your Magic API key from the Magic Dashboard.
@@ -32,7 +29,7 @@ const MagicDashboardRedirect = () => {
 
         <button className="api-button" onClick={onClick} disabled={false}>
           Get API keys
-          <Image src={Link} alt="link-icon" className="ml-[6px] my-auto" />
+          <Image src="/link_white.svg" alt="link-icon" width={24} height={24} className="ml-[6px] my-auto" />
         </button>
       </div>
       <DevLinks />
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Discord.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
index 763aed7..b8223e0 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Discord.tsx
@@ -5,7 +5,6 @@ import { saveToken } from '@/utils/common';
 import Spinner from '@/components/ui/Spinner';
 import classNames from 'classnames';
 import Image from 'next/image';
-import discord from 'public/social/Discord.svg';
 import Card from '@/components/ui/Card';
 import CardHeader from '@/components/ui/CardHeader';
 
@@ -62,7 +61,7 @@ const Discord = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={discord} alt="Discord" height={24} width={24} className="mr-6" />
+            <Image src="/social/Discord.svg" alt="Discord" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Discord</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
index 17bd3a1..1d02610 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Facebook.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import facebook from 'public/social/Facebook.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Facebook = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Facebook = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={facebook} alt="Facebook" height={24} width={24} className="mr-6" />
+            <Image src="/social/Facebook.svg" alt="Facebook" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Facebook</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Github.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Github.tsx
index 8004de7..db07509 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Github.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Github.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import github from 'public/social/Github.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Github = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Github = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={github} alt="Github" height={24} width={24} className="mr-6" />
+            <Image src="/social/Github.svg" alt="Github" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Github</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Google.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Google.tsx
index 4dc8087..635c9b6 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Google.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Google.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import google from 'public/social/Google.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Google = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Google = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={google} alt="Google" height={24} width={24} className="mr-6" />
+            <Image src="/social/Google.svg" alt="Google" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Google</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
index 8986ba7..732c850 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitch.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import twitch from 'public/social/Twitch.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Twitch = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Twitch = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitch} alt="Twitch" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitch.svg" alt="Twitch" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Twitch</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
index f90a7a2..bdfd4ff 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/magic/auth/Twitter.tsx
@@ -2,12 +2,10 @@ import { LoginProps } from '@/utils/types';
 import { useMagic } from '../MagicProvider';
 import { useEffect, useState } from 'react';
 import { saveToken } from '@/utils/common';
-import Spinner from '../../ui/Spinner';
-import classNames from 'classnames';
+import Spinner from '@/components/ui/Spinner';
 import Image from 'next/image';
-import twitter from 'public/social/Twitter.svg';
-import Card from '../../ui/Card';
-import CardHeader from '../../ui/CardHeader';
+import Card from '@/components/ui/Card';
+import CardHeader from '@/components/ui/CardHeader';
 
 const Twitter = ({ token, setToken }: LoginProps) => {
   const { magic } = useMagic();
@@ -62,7 +60,7 @@ const Twitter = ({ token, setToken }: LoginProps) => {
             }}
             disabled={false}
           >
-            <Image src={twitter} alt="Twitter" height={24} width={24} className="mr-6" />
+            <Image src="/social/Twitter.svg" alt="Twitter" height={24} width={24} className="mr-6" />
             <div className="text-xs font-semibold text-center w-full">Continue with Twitter</div>
           </button>
         </div>
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
index 42595c8..aeb468b 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/components/ui/TransactionHistory.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import Image from 'next/image';
-import Link from 'public/link.svg';
 import { getBlockExplorer } from '@/utils/network';
 
 const TransactionHistory = () => {
@@ -9,7 +8,7 @@ const TransactionHistory = () => {
   return (
     <a className="action-button" href={getBlockExplorer(publicAddress as string)} target="_blank" rel="noreferrer">
       <div className="flex items-center justify-center">
-        Transaction History <Image src={Link} alt="link-icon" className="ml-[3px]" />
+        Transaction History <Image src="/link.svg" alt="link-icon" width={24} height={24} className="ml-[3px]" />
       </div>
     </a>
   );
diff --git a/scaffolds/nextjs-solana-dedicated-wallet/template/src/utils/network.ts b/scaffolds/nextjs-solana-dedicated-wallet/template/src/utils/network.ts
index b655ced..bb5b001 100644
--- a/scaffolds/nextjs-solana-dedicated-wallet/template/src/utils/network.ts
+++ b/scaffolds/nextjs-solana-dedicated-wallet/template/src/utils/network.ts
@@ -1,5 +1,5 @@
 export enum Network {
-  SOLANA_DEVNET = 'solana-devnet',
+  SOLANA_DEVNET = 'solana-testnet',
   SOLANA_MAINNET_BETA = 'solana-mainnet',
 }
 
diff --git a/yarn.lock b/yarn.lock
index cfe7afd..4c5f1ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -579,25 +579,18 @@
   resolved "https://registry.npmjs.org/@types/pretty-time/-/pretty-time-1.1.3.tgz"
   integrity sha512-UYK7XOF05c1IjENpVMOOtPmOkWpnqKILMtZIWbDYrSXOzyIw2oZ5yv9wpYIQlMVFYmra4eRHe2NmSBLQAh4WRg==
 
-"@types/prop-types@*":
-  version "15.7.5"
-  resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz"
-  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
-
-"@types/react-is@^17.0.0":
-  version "17.0.4"
-  resolved "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.4.tgz"
-  integrity sha512-FLzd0K9pnaEvKz4D1vYxK9JmgQPiGk1lu23o1kqGsLeT0iPbRSF7b76+S5T9fD8aRa0B8bY7I/3DebEj+1ysBA==
+"@types/react-is@^19.0.0":
+  version "19.0.0"
+  resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-19.0.0.tgz#eccf45556cf1858e9116eed1f9e7b51496501a7a"
+  integrity sha512-71dSZeeJ0t3aoPyY9x6i+JNSvg5m9EF2i2OlSZI5QoJuI8Ocgor610i+4A10TQmURR+0vLwcVCEYFpXdzM1Biw==
   dependencies:
-    "@types/react" "^17"
+    "@types/react" "*"
 
-"@types/react@^17", "@types/react@^17.0.0":
-  version "17.0.62"
-  resolved "https://registry.npmjs.org/@types/react/-/react-17.0.62.tgz"
-  integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw==
+"@types/react@*", "@types/react@^19.0.12":
+  version "19.0.12"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.0.12.tgz#338b3f7854adbb784be454b3a83053127af96bd3"
+  integrity sha512-V6Ar115dBDrjbtXSrS+/Oruobc+qVbbUxDFC1RSbRqLt5SYvxxyIDrSC85RWml54g+jfNeEMZhEj7wW07ONQhA==
   dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
     csstype "^3.0.2"
 
 "@types/responselike@^1.0.0":
@@ -607,11 +600,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/scheduler@*":
-  version "0.16.3"
-  resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz"
-  integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
-
 "@types/tar@^4.0.4":
   version "4.0.5"
   resolved "https://registry.npmjs.org/@types/tar/-/tar-4.0.5.tgz"