Use preferred explorer

Author: ChiefWoods

app/src/app/stores/[storePda]/(auth)/earnings/page.tsx

@@ -15,7 +15,7 @@ import {
   TableRow,
 } from '@/components/ui/table';
 import { ACCEPTED_MINTS_METADATA } from '@/lib/constants';
-import { buildTx, getTransactionLink } from '@/lib/client/solana';
+import { buildTx } from '@/lib/client/solana';
 import { atomicToUsd } from '@/lib/utils';
 import { usePyth } from '@/providers/PythProvider';
 import { useStoreTokenAccount } from '@/providers/StoreTokenAccountProvider';
@@ -26,10 +26,12 @@ import { useMemo, useState } from 'react';
 import { toast } from 'sonner';
 import { sendTx } from '@/lib/api';
 import { useProgram } from '@/providers/ProgramProvider';
+import { useSettings } from '@/providers/SettingsProvider';
 
 export default function Page() {
   const { publicKey, signTransaction } = useUnifiedWallet();
   const { splurgeClient } = useProgram();
+  const { getTransactionLink } = useSettings();
   const {
     storeTokenAccountsData,
     storeTokenAccountsLoading,

app/src/components/AccountLinkText.tsx

@@ -1,20 +1,21 @@
 import { truncateAddress } from '@/lib/utils';
-import { getAccountLink } from '@/lib/client/solana';
 import { AccountLinkButton } from './AccountLinkButton';
 
 export function AccountLinkText({
   prefix,
   subject,
+  href,
 }: {
   prefix: string;
   subject: string;
+  href: string;
 }) {
   return (
     <div className="flex items-center gap-2">
       <p className="text-muted-foreground">
         {prefix} {truncateAddress(subject)}
       </p>
-      <AccountLinkButton href={getAccountLink(subject)} />
+      <AccountLinkButton href={href} />
     </div>
   );
 }

app/src/components/AccountSection.tsx

@@ -10,6 +10,7 @@ import {
 import { AccountLinkText } from './AccountLinkText';
 import { SectionHeader } from './SectionHeader';
 import { LargeImage } from './LargeImage';
+import { useSettings } from '@/providers/SettingsProvider';
 
 export function AccountSection({
   header,
@@ -28,6 +29,8 @@ export function AccountSection({
   content: ReactNode;
   buttons?: ReactNode;
 }) {
+  const { getAccountLink } = useSettings();
+
   return (
     <section className="flex w-full flex-col gap-6">
       {header && <SectionHeader text={header} />}
@@ -37,7 +40,11 @@ export function AccountSection({
           <CardHeader className="flex flex-1 flex-col p-0">
             <CardTitle className="truncate font-medium">{title}</CardTitle>
             <CardDescription>
-              <AccountLinkText prefix={prefix} subject={address} />
+              <AccountLinkText
+                prefix={prefix}
+                subject={address}
+                href={getAccountLink(address)}
+              />
             </CardDescription>
             <CardContent className="flex flex-1 flex-col gap-y-1 p-0">
               {content}

app/src/components/OrderTable.tsx

@@ -26,13 +26,13 @@ import { ParsedItem, ParsedOrder } from '@/types/accounts';
 import { InfoTooltip } from './InfoTooltip';
 import { TimestampTooltip } from './TimestampTooltip';
 import Image from 'next/image';
-import { getAccountLink } from '@/lib/client/solana';
 import { ACCEPTED_MINTS_METADATA } from '@/lib/constants';
 import { OrderTablePagination } from './OrderTablePagination';
 import { AccountLinkButton } from './AccountLinkButton';
 import { SortButton } from './SortButton';
 import { OrderTableRow } from './OrderTableRow';
 import { MintIcon } from './MintIcon';
+import { useSettings } from '@/providers/SettingsProvider';
 
 const ORDER_TABS = ['all', 'pending', 'shipping', 'completed', 'cancelled'];
 
@@ -54,6 +54,7 @@ export function OrderTable({
   showTotalTooltip?: boolean;
   statusRenderer: (order: ParsedOrder) => ReactNode;
 }) {
+  const { getAccountLink } = useSettings();
   const [sorting, setSorting] = useState<SortingState>([
     { id: 'timestamp', desc: true },
   ]);
@@ -174,7 +175,7 @@ export function OrderTable({
         enableSorting: false,
       },
     ],
-    [showTotalTooltip]
+    [showTotalTooltip, getAccountLink]
   );
 
   // eslint-disable-next-line react-hooks/incompatible-library

app/src/components/TransactionToast.tsx

@@ -3,16 +3,13 @@ export function TransactionToast({
   link,
 }: {
   title: string;
-  link?: string;
+  link: string;
 }) {
   return (
     <div className="flex flex-col">
-      <p>{title}</p>
-      {link && (
-        <a href={link} target="_blank" className="text-info underline">
-          {link}
-        </a>
-      )}
+      <a href={link} target="_blank" className="text-info underline">
+        {title}
+      </a>
     </div>
   );
 }

app/src/components/formDialogs/AddItemDialog.tsx

@@ -20,7 +20,7 @@ import { WalletGuardButton } from '@/components/WalletGuardButton';
 import { useIrysUploader } from '@/hooks/useIrysUploader';
 import { toast } from 'sonner';
 import { TransactionToast } from '@/components/TransactionToast';
-import { buildTx, getTransactionLink } from '@/lib/client/solana';
+import { buildTx } from '@/lib/client/solana';
 import { Textarea } from '../ui/textarea';
 import { DicebearStyles, getDicebearFile } from '@/lib/client/dicebear';
 import { useItems } from '@/providers/ItemsProvider';
@@ -36,10 +36,12 @@ import { FormSubmitButton } from '../FormSubmitButton';
 import { FormCancelButton } from '../FormCancelButton';
 import { sendTx } from '@/lib/api';
 import { useProgram } from '@/providers/ProgramProvider';
+import { useSettings } from '@/providers/SettingsProvider';
 
 export function AddItemDialog({ storePda }: { storePda: string }) {
   const { publicKey, signTransaction } = useUnifiedWallet();
   const { splurgeClient } = useProgram();
+  const { getTransactionLink } = useSettings();
   const { upload } = useIrysUploader();
   const { itemsMutate } = useItems();
   const [isOpen, setIsOpen] = useState(false);
@@ -174,6 +176,7 @@ export function AddItemDialog({ storePda }: { storePda: string }) {
       storePda,
       closeAndReset,
       splurgeClient,
+      getTransactionLink,
     ]
   );
 

app/src/components/formDialogs/AddReviewDialog.tsx

@@ -5,7 +5,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { useCallback, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { TransactionToast } from '../TransactionToast';
-import { buildTx, getTransactionLink } from '@/lib/client/solana';
+import { buildTx } from '@/lib/client/solana';
 import { toast } from 'sonner';
 import { PublicKey } from '@solana/web3.js';
 import { Plus } from 'lucide-react';
@@ -30,10 +30,12 @@ import { FormSubmitButton } from '../FormSubmitButton';
 import { FormCancelButton } from '../FormCancelButton';
 import { sendTx } from '@/lib/api';
 import { useProgram } from '@/providers/ProgramProvider';
+import { useSettings } from '@/providers/SettingsProvider';
 
 export function AddReviewDialog({ orderPda }: { orderPda: string }) {
   const { publicKey, signTransaction } = useUnifiedWallet();
   const { splurgeClient } = useProgram();
+  const { getTransactionLink } = useSettings();
   const { reviewsMutate } = useReviews();
   const [isOpen, setIsOpen] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -131,6 +133,7 @@ export function AddReviewDialog({ orderPda }: { orderPda: string }) {
       signTransaction,
       closeAndReset,
       splurgeClient,
+      getTransactionLink,
     ]
   );
 

app/src/components/formDialogs/CheckoutDialog.tsx

@@ -6,7 +6,7 @@ import { useConnection } from '@solana/wallet-adapter-react';
 import { ReactNode, useCallback, useMemo, useState } from 'react';
 import { useForm, useWatch } from 'react-hook-form';
 import { TransactionToast } from '../TransactionToast';
-import { buildTx, getTransactionLink } from '@/lib/client/solana';
+import { buildTx } from '@/lib/client/solana';
 import { toast } from 'sonner';
 import { PublicKey } from '@solana/web3.js';
 import { Dialog, DialogHeader, DialogTrigger } from '../ui/dialog';
@@ -30,7 +30,6 @@ import {
 } from '../ui/select';
 import { z } from 'zod';
 import { ACCEPTED_MINTS_METADATA } from '@/lib/constants';
-import { confirmTransaction } from '@solana-developers/helpers';
 import { useItems } from '@/providers/ItemsProvider';
 import { useShopper } from '@/providers/ShopperProvider';
 import { atomicToUsd, removeTrailingZeroes } from '@/lib/utils';
@@ -49,6 +48,7 @@ import { FormSubmitButton } from '../FormSubmitButton';
 import { FormCancelButton } from '../FormCancelButton';
 import { LargeImage } from '../LargeImage';
 import { useProgram } from '@/providers/ProgramProvider';
+import { useSettings } from '@/providers/SettingsProvider';
 
 export function CheckoutDialog({
   name,
@@ -76,6 +76,7 @@ export function CheckoutDialog({
   const { connection } = useConnection();
   const { publicKey } = useUnifiedWallet();
   const { splurgeClient } = useProgram();
+  const { getTransactionLink } = useSettings();
   const { pythSolanaReceiver, getUpdatePriceFeedTx } = usePyth();
   const { configData, configLoading } = useConfig();
   const { itemsMutate } = useItems();
@@ -170,8 +171,11 @@ export function CheckoutDialog({
           ]);
 
           // checkout transaction is the last one
-          await confirmTransaction(
-            connection,
+          // await confirmTransaction(
+          //   connection,
+          //   signatures[signatures.length - 1]
+          // );
+          await connection.confirmTransaction(
             signatures[signatures.length - 1]
           );
 
@@ -259,6 +263,7 @@ export function CheckoutDialog({
       orderSubtotal,
       closeAndReset,
       splurgeClient,
+      getTransactionLink,
     ]
   );
 

app/src/components/formDialogs/CreateProfileDialog.tsx

@@ -20,7 +20,7 @@ import { WalletGuardButton } from '@/components/WalletGuardButton';
 import { useIrysUploader } from '@/hooks/useIrysUploader';
 import { toast } from 'sonner';
 import { TransactionToast } from '@/components/TransactionToast';
-import { buildTx, getTransactionLink } from '@/lib/client/solana';
+import { buildTx } from '@/lib/client/solana';
 import { DicebearStyles, getDicebearFile } from '@/lib/client/dicebear';
 import { useShopper } from '@/providers/ShopperProvider';
 import { ImageInputLabel } from '../ImageInputLabel';
@@ -32,10 +32,12 @@ import { FormSubmitButton } from '../FormSubmitButton';
 import { FormCancelButton } from '../FormCancelButton';
 import { sendTx } from '@/lib/api';
 import { useProgram } from '@/providers/ProgramProvider';
+import { useSettings } from '@/providers/SettingsProvider';
 
 export function CreateProfileDialog() {
   const { publicKey, signTransaction } = useUnifiedWallet();
   const { splurgeClient } = useProgram();
+  const { getTransactionLink } = useSettings();
   const { shopperMutate } = useShopper();
   const { upload } = useIrysUploader();
   const [isOpen, setIsOpen] = useState(false);
@@ -154,6 +156,7 @@ export function CreateProfileDialog() {
       publicKey,
       closeAndReset,
       splurgeClient,
+      getTransactionLink,
     ]
   );
 

app/src/components/formDialogs/CreateStoreDialog.tsx

@@ -18,7 +18,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { ImageInput } from '@/components/ImageInput';
 import { useIrysUploader } from '@/hooks/useIrysUploader';
 import { TransactionToast } from '@/components/TransactionToast';
-import { buildTx, getTransactionLink } from '@/lib/client/solana';
+import { buildTx } from '@/lib/client/solana';
 import { toast } from 'sonner';
 import { WalletGuardButton } from '@/components/WalletGuardButton';
 import { DicebearStyles, getDicebearFile } from '@/lib/client/dicebear';
@@ -32,10 +32,12 @@ import { FormSubmitButton } from '../FormSubmitButton';
 import { FormCancelButton } from '../FormCancelButton';
 import { sendTx } from '@/lib/api';
 import { useProgram } from '@/providers/ProgramProvider';
+import { useSettings } from '@/providers/SettingsProvider';
 
 export function CreateStoreDialog() {
   const { publicKey, signTransaction } = useUnifiedWallet();
   const { splurgeClient } = useProgram();
+  const { getTransactionLink } = useSettings();
   const { personalStoreMutate } = usePersonalStore();
   const { upload } = useIrysUploader();
   const [isOpen, setIsOpen] = useState(false);
@@ -152,6 +154,7 @@ export function CreateStoreDialog() {
       upload,
       closeAndReset,
       splurgeClient,
+      getTransactionLink,
     ]
   );