chore: resolve merge conflicts

Made-with: Cursor

Author: stevesarmiento

.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
 permissions:
   contents: read
   pull-requests: write
+  issues: write
   actions: read
 
 jobs:
@@ -92,7 +93,8 @@ jobs:
           find coverage-artifacts/ -name "*.json" -o -name "*.lcov" -o -name "*.xml" 2>/dev/null || echo "No coverage artifacts found"
 
       - name: Post coverage comment on PR
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
+        continue-on-error: true
         uses: actions/github-script@v7
         with:
           script: |

examples/next-js/components/playground/featured-section.tsx

@@ -110,7 +110,7 @@ import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@/
 import { Wallet, ExternalLink } from 'lucide-react';
 import { useState, useEffect } from 'react';
 
-export function WalletModal({ open, onOpenChange, walletConnectUri, onClearWalletConnectUri }) {
+export function WalletModal({ open, onOpenChange, walletConnectUri, onClearWalletConnectUri }: { open: boolean; onOpenChange: (open: boolean) => void; walletConnectUri?: string | null; onClearWalletConnectUri?: () => void }) {
     const { walletStatus, isConnecting, connectorId, connectors, connectWallet, disconnectWallet } = useConnector();
     const status = walletStatus.status;
     const [connectingConnectorId, setConnectingConnectorId] = useState<WalletConnectorId | null>(null);
@@ -215,7 +215,7 @@ import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigge
 import { Wallet, Copy, Globe, Check, RefreshCw, Coins, History, ExternalLink, LogOut } from 'lucide-react';
 import { useState } from 'react';
 
-export function WalletDropdownContent({ selectedAccount, walletIcon, walletName }) {
+export function WalletDropdownContent({ selectedAccount, walletIcon, walletName }: { selectedAccount: string; walletIcon?: string; walletName: string }) {
     const [copied, setCopied] = useState(false);
     const shortAddress = \`\${selectedAccount.slice(0, 4)}...\${selectedAccount.slice(-4)}\`;
 
@@ -319,7 +319,7 @@ import { WalletDropdownContentBaseUI } from './wallet-dropdown-content-baseui';
 import { Wallet, ChevronDown } from 'lucide-react';
 
 // Custom Avatar component for Base UI
-function Avatar({ src, alt, fallback, className }) {
+function Avatar({ src, alt, fallback, className }: { src?: string; alt?: string; fallback?: React.ReactNode; className?: string }) {
     const [hasError, setHasError] = useState(false);
     return (
         <div className={\`relative flex shrink-0 overflow-hidden rounded-full \${className}\`}>
@@ -332,7 +332,7 @@ function Avatar({ src, alt, fallback, className }) {
     );
 }
 
-export function ConnectButtonBaseUI({ className }) {
+export function ConnectButtonBaseUI({ className }: { className?: string }) {
     const [isModalOpen, setIsModalOpen] = useState(false);
     const { isConnected, isConnecting, account, connector } = useConnector();
 
@@ -394,7 +394,7 @@ import { Collapsible } from '@base-ui/react/collapsible';
 import { Wallet, ExternalLink, ChevronDown, X } from 'lucide-react';
 import { useState, useEffect } from 'react';
 
-export function WalletModalBaseUI({ open, onOpenChange }) {
+export function WalletModalBaseUI({ open, onOpenChange }: { open: boolean; onOpenChange: (open: boolean) => void }) {
     const { walletStatus, isConnecting, connectorId, connectors, connectWallet, disconnectWallet } = useConnector();
     const status = walletStatus.status;
     const [connectingConnectorId, setConnectingConnectorId] = useState<WalletConnectorId | null>(null);
@@ -490,7 +490,7 @@ import { BalanceElement, ClusterElement, TokenListElement, TransactionHistoryEle
 import { Wallet, Copy, Globe, ChevronDown, Check, RefreshCw, Coins, History, LogOut } from 'lucide-react';
 import { useState } from 'react';
 
-export function WalletDropdownContentBaseUI({ selectedAccount, walletIcon, walletName }) {
+export function WalletDropdownContentBaseUI({ selectedAccount, walletIcon, walletName }: { selectedAccount: string; walletIcon?: string; walletName: string }) {
     const [copied, setCopied] = useState(false);
     const [isTokensOpen, setIsTokensOpen] = useState(false);
     const [isTransactionsOpen, setIsTransactionsOpen] = useState(false);

examples/next-js/package.json

@@ -22,7 +22,7 @@
         "@solana/connector": "workspace:*",
         "@solana/devtools": "workspace:*",
         "@solana/keychain": "^0.2.1",
-        "@solana/kit": "^5.0.0",
+        "@solana/kit": "^6.0.0",
         "@solana/web3.js": "^1.98.4",
         "@tanstack/react-query": "^5.90.5",
         "@wallet-standard/app": "^1.1.0",

package.json

@@ -37,7 +37,7 @@
         "turbo": "^2.8.12"
     },
     "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.18.0"
     },
     "packageManager": "pnpm@10.28.0"
 }

packages/connector/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solana/connector",
-    "version": "0.2.4",
+    "version": "0.2.5",
     "description": "Headless wallet connector client and React provider built on Wallet Standard",
     "main": "./dist/index.js",
     "module": "./dist/index.mjs",
@@ -96,7 +96,7 @@
         "@solana/addresses": "^5.0.0",
         "@solana/codecs": "^5.0.0",
         "@solana/keys": "^5.0.0",
-        "@solana/kit": "^5.0.0",
+        "@solana/kit": "^6.0.0",
         "@solana/signers": "^5.0.0",
         "@solana/transaction-messages": "^5.0.0",
         "@solana/transactions": "^5.0.0",

packages/connector/src/ui/connector-provider.tsx

@@ -113,9 +113,9 @@ function ConnectorProviderInternal({
 
                 const extendedConfig = config as ExtendedConnectorConfig;
                 if (extendedConfig?.errorBoundary?.onError) {
+                    const constructorDigest = `constructor-${new Date().toISOString()}`;
                     extendedConfig.errorBoundary.onError(err, {
-                        componentStack: 'client-initialization',
-                        digest: `constructor-${new Date().toISOString()}`,
+                        componentStack: `client-initialization (${constructorDigest})`,
                     });
                 }
 

packages/devtools/package.json

@@ -53,7 +53,7 @@
         "@solana-program/system": "^0.10.0",
         "@solana-program/token": "^0.9.0",
         "@solana-program/token-2022": "^0.6.1",
-        "@solana/kit": "^5.0.0",
+        "@solana/kit": "^6.0.0",
         "@solana/transaction-messages": "^5.0.0",
         "@solana/transactions": "^5.0.0"
     }