diff --git a/components/Layout/FiltersFrame.js b/components/Layout/FiltersFrame.js
index c772e4e83..fcd01610e 100644
--- a/components/Layout/FiltersFrame.js
+++ b/components/Layout/FiltersFrame.js
@@ -68,7 +68,9 @@ export default function FiltersFrame({
   rowsPerPage,
   setRowsPerPage,
   onlyCsv,
-  filters
+  filters,
+  loading,
+  setLoading
 }) {
   const { t } = useTranslation()
   const router = useRouter()
@@ -104,6 +106,8 @@ export default function FiltersFrame({
   }, [activeView])
 
   const handleChangePage = (event, newPage) => {
+    if(loading) return
+    setLoading(true)
     setPage(newPage)
   }
 
@@ -148,6 +152,7 @@ export default function FiltersFrame({
                   rowsPerPage={rowsPerPage}
                   onRowsPerPageChange={handleChangeRowsPerPage}
                   rowsPerPageOptions={width <= 440 ? [] : rowsPerPageOptions}
+                  disabled={loading}
                   //slotProps={{ select: </> }}
                 />
               </>
@@ -157,7 +162,7 @@ export default function FiltersFrame({
 
             {orderList && (
               <>
-                <SimpleSelect value={order} setValue={setOrder} optionsList={orderList} className="dropdown--desktop" />
+                <SimpleSelect value={order} setValue={setOrder} optionsList={orderList} className="dropdown--desktop" disabled={loading} />
                 <button className="dropdown-btn" onClick={() => setSortMenuOpen(!sortMenuOpen)}>
                   <TbArrowsSort />
                 </button>
@@ -182,6 +187,7 @@ export default function FiltersFrame({
                   rowsPerPage={rowsPerPage}
                   onRowsPerPageChange={handleChangeRowsPerPage}
                   rowsPerPageOptions={rowsPerPageOptions}
+                  disabled={loading}
                   //slotProps={{ select: </> }}
                 />
               </>
@@ -203,7 +209,9 @@ export default function FiltersFrame({
             {orderList?.map((item, i) => (
               <li
                 key={i}
-                style={{ fontWeight: item.value === order ? 'bold' : 'normal' }}
+                style={{
+                  fontWeight: item.value === order ? 'bold' : 'normal',
+                }}
                 onClick={() => hideMobileSortMenu(item.value)}
                 suppressHydrationWarning
               >
diff --git a/components/Layout/Header/MobileMenu.js b/components/Layout/Header/MobileMenu.js
index d4fc939a5..67a58ad4e 100644
--- a/components/Layout/Header/MobileMenu.js
+++ b/components/Layout/Header/MobileMenu.js
@@ -173,6 +173,9 @@ export default function MobileMenu({
           <Link href="/learn/xrp-xah-taxes" className="mobile-menu-item" onClick={mobileMenuToggle}>
             {t('menu.services.tax-reports')}
           </Link>
+          <Link href="/admin/pro/history" className="mobile-menu-item" onClick={mobileMenuToggle}>
+            Try Out Tax Reports
+          </Link>
 
           <Link href="/submit-account-information" className="mobile-menu-item" onClick={mobileMenuToggle}>
             {t('menu.project-registration')}
diff --git a/components/Layout/Header/index.js b/components/Layout/Header/index.js
index 81376d486..ed4b458a5 100644
--- a/components/Layout/Header/index.js
+++ b/components/Layout/Header/index.js
@@ -199,6 +199,7 @@ export default function Header({
             <Link href="/services/nft-mint">{t('menu.services.nft-mint')}</Link>
             <Link href="/username">{t('menu.usernames')}</Link>
             <Link href="/learn/xrp-xah-taxes">{t('menu.services.tax-reports')}</Link>
+            <Link href="/admin/pro/history">Try Out Tax Reports</Link>
             <Link href="/submit-account-information">{t('menu.project-registration')}</Link>
             {!devNet && <Link href="/alerts">{t('menu.price-alerts', { nativeCurrency })}</Link>}
             <a href={'/submit/'}>{t('menu.submit-offline-tx')}</a>
diff --git a/components/UI/SimpleSelect.js b/components/UI/SimpleSelect.js
index e146a8c5a..6bf7394d5 100644
--- a/components/UI/SimpleSelect.js
+++ b/components/UI/SimpleSelect.js
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react'
 import Select from 'react-select'
 
-export default function SimpleSelect({ value, setValue, optionsList, className }) {
+export default function SimpleSelect({ value, setValue, optionsList, className, disabled }) {
   const [rendered, setRendered] = useState(false)
   const [choosenOption, setChoosenOption] = useState()
 
@@ -36,6 +36,7 @@ export default function SimpleSelect({ value, setValue, optionsList, className }
         setValue(a.value)
       }}
       isSearchable={false}
+      isDisabled={disabled}
       className={`dropdown ${className}`}
       classNamePrefix="react-select"
     />
diff --git a/pages/admin/pro/history.js b/pages/admin/pro/history.js
index 51833ab7c..ac8242810 100644
--- a/pages/admin/pro/history.js
+++ b/pages/admin/pro/history.js
@@ -48,6 +48,7 @@ const showAmount = (amount) => {
 }
 
 const showFiat = (fiat, selectedCurrency) => {
+  if (isNaN(fiat)) return ''
   if (!fiat && fiat !== 0) return ''
   return (
     <span className={'no-brake ' + (fiat > 0 ? 'green' : fiat < 0 ? 'red' : '')}>
@@ -195,6 +196,12 @@ const platformList = [
   { value: 'CryptoTax', label: 'CryptoTax' }
 ]
 
+const defaultWalletList = [
+  'rDLNm4ehD7XQCtYKWuMjEKY7TCfmf3CwzH',
+  'r3sQYvXxc82iSNs5DnUUvXtcQQQqigCdW',
+  'raWYT6DD2XFAvjCqRPsCCzr1CMBzJydf9E',
+]
+
 export default function History({
   queryAddress,
   selectedCurrency,
@@ -368,6 +375,7 @@ export default function History({
   }, [])
 
   useEffect(() => {
+    setLoading(true)
     if (filteredActivities.length > 0) {
       if (rowsPerPage === -1) {
         setCurrentList(filteredActivities)
@@ -377,8 +385,14 @@ export default function History({
     } else {
       setCurrentList([])
     }
-    if ((page + 2) * rowsPerPage > filteredActivities.length && data?.marker) {
+
+    if(page * rowsPerPage > data?.total) {
+      setPage(0)
+      getProAddressHistory()
+    }else if ((page + 2) * rowsPerPage > filteredActivities.length && data?.marker) {
       getProAddressHistory({ marker: data.marker })
+    } else {
+      setLoading(false)
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [filteredActivities, page, rowsPerPage])
@@ -430,8 +444,12 @@ export default function History({
   ]
 
   const getProAddressHistory = async (options) => {
-    if (addressesToCheck.length === 0) return
-    setLoading(true)
+    if (addressesToCheck.length === 0) {
+      setLoading(false)
+      setActivities([])
+      setData(null)
+      return
+    }
 
     let orderPart = order
     let sortCurrency = null
@@ -475,7 +493,6 @@ export default function History({
           setErrorMessage(t(error.response?.data?.error || 'error.' + error.message))
         }
       })
-    setLoading(false)
     let res = response?.data
     /*
       {
@@ -535,7 +552,7 @@ export default function History({
       }
       setData(res) // last request data
       if (options?.marker) {
-        setActivities(activities.concat(res.activities)) // joines data
+        setActivities(prevActivities => prevActivities.concat(res.activities)) // joins data
       } else {
         setActivities(res.activities) // rewrite old data
       }
@@ -544,58 +561,70 @@ export default function History({
 
   const getVerifiedAddresses = async () => {
     setLoadingVerifiedAddresses(true)
-    const response = await axiosAdmin.get('user/addresses').catch((error) => {
+    if (!sessionToken) {
+      // Create hardcoded wallet data for non-authenticated users
+      const walletDatas = defaultWalletList.map((address, index) => ({
+        address: address,
+        name: `Test Wallet ${index + 1}`,
+        crawler: { status: "synced" }
+      }))
+      setVerifiedAddresses(walletDatas)
       setLoadingVerifiedAddresses(false)
-      if (error.response?.data?.error === 'errors.token.required') {
-        router.push('/admin')
-        return
+      // Set first hardcoded wallet as default selection
+      if (addressesToCheck?.length === 0 && walletDatas[0]?.address) {
+        setAddressesToCheck([walletDatas[0].address])
       }
-      if (error && error.message !== 'canceled') {
-        setErrorMessage(t(error.response?.data?.error || 'error.' + error.message))
-      }
-    })
-    setLoadingVerifiedAddresses(false)
-    const data = response?.data
-    /*
-      {
-        "total": 1,
-        "count": 1,
-        "addresses": [
-          {
-            "id": 28,
-            "createdAt": 1721741550,
-            "address": "raN6cSu",
-            "name": "vasia",
-            "crawler": {
-              "status": "queued",
-              "createdAt": 1728212999,
-              "updatedAt": 1728212999,
-              "lastCrawledAt": null,
-              "firstLedgerIndex": null,
-              "currentLedgerIndex": null,
-              "lastLedgerIndex": null
+    } else {
+      const response = await axiosAdmin.get('user/addresses').catch((error) => {
+        setLoadingVerifiedAddresses(false)
+        if (error.response?.data?.error === 'errors.token.required') {
+          router.push('/admin')
+          return
+        }
+        if (error && error.message !== 'canceled') {
+          setErrorMessage(t(error.response?.data?.error || 'error.' + error.message))
+        }
+      })
+      const data = response?.data
+      /*
+        {
+          "total": 1,
+          "count": 1,
+          "addresses": [
+            {
+              "id": 28,
+              "createdAt": 1721741550,
+              "address": "raN6cSu",
+              "name": "vasia",
+              "crawler": {
+                "status": "queued",
+                "createdAt": 1728212999,
+                "updatedAt": 1728212999,
+                "lastCrawledAt": null,
+                "firstLedgerIndex": null,
+                "currentLedgerIndex": null,
+                "lastLedgerIndex": null
+              }
             }
-          }
-        ]
+          ]
+        }
+      */
+      setVerifiedAddresses(data?.addresses)
+      setLoadingVerifiedAddresses(false)
+      if (addressesToCheck?.length === 0 && data?.addresses?.[0]?.address) {
+        setAddressesToCheck([data.addresses[0].address])
       }
-    */
-    setVerifiedAddresses(data?.addresses)
-    if (addressesToCheck?.length === 0 && data?.addresses?.[0]?.address) {
-      setAddressesToCheck([data.addresses[0].address])
     }
   }
 
   useEffect(() => {
-    if (sessionToken) {
-      getVerifiedAddresses()
-    }
+    getVerifiedAddresses()
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [sessionToken])
 
   useEffect(() => {
-    if (sessionToken) {
-      getProAddressHistory()
-    }
+    setLoading(true)
+    getProAddressHistory()
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [addressesToCheck, selectedCurrency, period, order, sessionToken])
 
@@ -613,6 +642,17 @@ export default function History({
       <div className="page-pro-history">
         <h1 className="center">Pro address balances history</h1>
 
+        {!sessionToken && (
+          <div className="center" style={{ padding: '15px' }}>
+            <p>
+              Use these test wallets to try all features of the page. Want to add your address?{' '}
+              <Link href="/admin" style={{ color: '#007bff' }}>
+                Sign in here
+              </Link>
+            </p>
+          </div>
+        )}
+
         <AdminTabs name="mainTabs" tab="pro" />
 
         <div className="tabs-inline" style={{ marginTop: -10 }}>
@@ -630,285 +670,268 @@ export default function History({
           </Link>
         </div>
 
-        {sessionToken ? (
+        <FiltersFrame
+          order={order}
+          setOrder={setOrder}
+          orderList={[
+            { value: 'DESC', label: 'Latest first' },
+            { value: 'ASC', label: 'Earliest first' },
+            { value: 'nativeCurrencyAmountLow', label: nativeCurrency.toUpperCase() + ': low to high' },
+            { value: 'nativeCurrencyAmountHigh', label: nativeCurrency.toUpperCase() + ': high to low' },
+            { value: 'fiatAmountLow', label: 'FIAT: low to high' },
+            { value: 'fiatAmountHigh', label: 'FIAT: high to low' }
+          ]}
+          count={activities?.length || 0}
+          total={data?.total || 0}
+          hasMore={data?.marker}
+          data={filteredActivities || []}
+          csvHeaders={csvHeaders}
+          setSelectedCurrency={setSelectedCurrency}
+          selectedCurrency={selectedCurrency}
+          setFiltersHide={setFiltersHide}
+          filtersHide={filtersHide}
+          page={page}
+          setPage={setPage}
+          rowsPerPage={rowsPerPage}
+          setRowsPerPage={setRowsPerPage}
+          loading={loading}
+          setLoading={setLoading}
+        >
           <>
-            <FiltersFrame
-              order={order}
-              setOrder={setOrder}
-              orderList={[
-                { value: 'DESC', label: 'Latest first' },
-                { value: 'ASC', label: 'Earliest first' },
-                { value: 'nativeCurrencyAmountLow', label: nativeCurrency.toUpperCase() + ': low to high' },
-                { value: 'nativeCurrencyAmountHigh', label: nativeCurrency.toUpperCase() + ': high to low' },
-                { value: 'fiatAmountLow', label: 'FIAT: low to high' },
-                { value: 'fiatAmountHigh', label: 'FIAT: high to low' }
-              ]}
-              count={activities?.length || 0}
-              total={data?.total || 0}
-              hasMore={data?.marker}
-              data={filteredActivities || []}
-              csvHeaders={csvHeaders}
-              setSelectedCurrency={setSelectedCurrency}
-              selectedCurrency={selectedCurrency}
-              setFiltersHide={setFiltersHide}
-              filtersHide={filtersHide}
-              page={page}
-              setPage={setPage}
-              rowsPerPage={rowsPerPage}
-              setRowsPerPage={setRowsPerPage}
-            >
+            {verifiedAddresses?.length > 0 && data && activities && data.total > activities.length && (
+              <div className="center" style={{ margin: 'auto' }}>
+                <button
+                  className="button-action narrow thin"
+                  onClick={() => getProAddressHistory({ marker: data.marker })}
+                  style={{ minWidth: '120px' }}
+                  disabled={loading}
+                >
+                  {
+                    loading ? 'Loading...' : 'Load more data'
+                  }
+                </button>
+                <br />
+                <br />
+              </div>
+            )}
+            <div style={{ margin: 'auto' }}>Addresses</div>
+            {verifiedAddresses?.length > 0 ? (
               <>
-                {verifiedAddresses?.length > 0 && data && activities && data.total > activities.length && (
-                  <div className="center" style={{ margin: 'auto' }}>
-                    <button
-                      className="button-action narrow thin"
-                      onClick={() => getProAddressHistory({ marker: data.marker })}
+                {verifiedAddresses.map((address, i) => (
+                  <div className="filters-check-box" key={i}>
+                    <CheckBox
+                      checked={addressesToCheck.includes(address.address)}
+                      setChecked={() => {
+                        setLoading(true)
+                        setAddressesToCheck(
+                          addressesToCheck.includes(address.address)
+                            ? addressesToCheck.filter((a) => a !== address.address)
+                            : [...addressesToCheck, address.address]
+                        )
+                      }}
+                      outline
+                      checkmarkStyle={{ top: '10px' }}
+                      disabled={loading}
                     >
-                      Load more data
-                    </button>
-                    <br />
-                    <br />
+                      <table>
+                        <tbody>
+                          <tr>
+                            <td style={{ padding: 0 }}>
+                              <Image alt="avatar" src={avatarServer + address.address} width="40" height="40" />
+                            </td>
+                            <td style={{ padding: '0 0 0 5px' }}>
+                              <b className="orange">{address.name}</b> -{' '}
+                              <small>{crawlerStatus(address.crawler, { inline: true })}</small>
+                              <br />
+                              {addressLink(address.address, { short: 10 })}
+                            </td>
+                          </tr>
+                        </tbody>
+                      </table>
+                    </CheckBox>
                   </div>
-                )}
-                <div style={{ margin: 'auto' }}>Addresses</div>
-                {verifiedAddresses?.length > 0 ? (
-                  <>
-                    {verifiedAddresses.map((address, i) => (
-                      <div className="filters-check-box" key={i}>
-                        <CheckBox
-                          checked={addressesToCheck.includes(address.address)}
-                          setChecked={() => {
-                            setAddressesToCheck(
-                              addressesToCheck.includes(address.address)
-                                ? addressesToCheck.filter((a) => a !== address.address)
-                                : [...addressesToCheck, address.address]
-                            )
-                          }}
-                          outline
-                          checkmarkStyle={{ top: '10px' }}
-                        >
-                          <table>
-                            <tbody>
-                              <tr>
-                                <td style={{ padding: 0 }}>
-                                  <Image alt="avatar" src={avatarServer + address.address} width="40" height="40" />
-                                </td>
-                                <td style={{ padding: '0 0 0 5px' }}>
-                                  <b className="orange">{address.name}</b> -{' '}
-                                  <small>{crawlerStatus(address.crawler, { inline: true })}</small>
-                                  <br />
-                                  {addressLink(address.address, { short: 10 })}
-                                </td>
-                              </tr>
-                            </tbody>
-                          </table>
-                        </CheckBox>
-                      </div>
-                    ))}
-                  </>
+                ))}
+              </>
+            ) : (
+              <>
+                {loadingVerifiedAddresses ? (
+                  'Loading data...'
                 ) : (
-                  <>
-                    {loadingVerifiedAddresses ? (
-                      'Loading data...'
-                    ) : (
-                      <div>
-                        <br />
-                        <Link href="/admin/pro" className="button-action narrow thin">
-                          Add
-                        </Link>
-                      </div>
-                    )}
-                  </>
+                  <div>
+                    <br />
+                    <Link href="/admin/pro" className="button-action narrow thin">
+                      Add
+                    </Link>
+                  </div>
                 )}
-                <div>
-                  Period
-                  <DateAndTimeRange setPeriod={setPeriod} defaultPeriod="all" radio={true} />
-                </div>
-                <div>
-                  <CheckBox checked={removeDust} outline setChecked={setRemoveDust}>
-                    Remove dust transactions
-                  </CheckBox>
-                </div>
-                <div>
-                  Tax Export Platform
-                  <RadioOptions
-                    tabList={platformList}
-                    tab={platformCSVExport}
-                    setTab={setPlatformCSVExport}
-                    name="platformSelect"
-                  />
-                  {rendered && (
-                    <CSVLink
-                      data={processDataForExport(filteredActivities || [], platformCSVExport)}
-                      headers={
-                        platformCSVHeaders.find(
-                          (header) => header.platform.toLowerCase() === platformCSVExport.toLowerCase()
-                        )?.headers || []
-                      }
-                      filename={'export ' + platformCSVExport + ' ' + new Date().toISOString() + '.csv'}
-                      className={'button-action' + (!(activities?.length > 0) ? ' disabled' : '')}
-                      uFEFF={platformCSVExport === 'BlockPit' ? false : undefined}
-                    >
-                      <DownloadIcon /> CSV for {platformCSVExport}
-                    </CSVLink>
-                  )}
-                  {platformCSVExport === 'Koinly' && (
-                    <>
-                      <br />
-                      <br />
-                      Let us know if we miss koinlyIDs for your tokens. We will add them to the system.
-                    </>
-                  )}
-                </div>
               </>
+            )}
+            <div>
+              Period
+              <DateAndTimeRange setPeriod={setPeriod} defaultPeriod="all" radio={true} />
+            </div>
+            <div>
+              <CheckBox checked={removeDust} outline setChecked={setRemoveDust}>
+                Remove dust transactions
+              </CheckBox>
+            </div>
+            <div>
+              Tax Export Platform
+              <RadioOptions
+                tabList={platformList}
+                tab={platformCSVExport}
+                setTab={setPlatformCSVExport}
+                name="platformSelect"
+              />
+              {rendered && (
+                <CSVLink
+                  data={processDataForExport(filteredActivities || [], platformCSVExport)}
+                  headers={
+                    platformCSVHeaders.find(
+                      (header) => header.platform.toLowerCase() === platformCSVExport.toLowerCase()
+                    )?.headers || []
+                  }
+                  filename={'export ' + platformCSVExport + ' ' + new Date().toISOString() + '.csv'}
+                  className={'button-action' + (!(activities?.length > 0) ? ' disabled' : '')}
+                  uFEFF={platformCSVExport === 'BlockPit' ? false : undefined}
+                >
+                  <DownloadIcon /> CSV for {platformCSVExport}
+                </CSVLink>
+              )}
+              {platformCSVExport === 'Koinly' && (
+                <>
+                  <br />
+                  <br />
+                  Let us know if we miss koinlyIDs for your tokens. We will add them to the system.
+                </>
+              )}
+            </div>
+          </>
+          <>
+            {addressesToCheck.length > 0 && (
               <>
-                {addressesToCheck.length > 0 && (
-                  <>
-                    {!width || width > 800 ? (
-                      <table className="table-large no-border no-hover" style={width > 800 ? { width: 780 } : {}}>
-                        <thead>
-                          <tr>
-                            <th className="center">#</th>
-                            <th>Timestamp</th>
-                            {addressesToCheck.length > 1 && <th>Address</th>}
-                            <th className="center">Tx</th>
-                            <th>Memo</th>
-                            <th className="right">Transfer Fee</th>
-                            <th className="right">Tx Fee</th>
-                            <th className="right">Balance change</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          {currentList?.length > 0 ? (
-                            <>
-                              {currentList.map((a, i) => (
-                                <tr key={i}>
-                                  <td className="center">{a.index}</td>
-                                  <td>{fullDateAndTime(a.timestamp)}</td>
-                                  {addressesToCheck.length > 1 && <td>{addressName(a.address)}</td>}
-                                  <td className="center">
-                                    <LinkTx tx={a.hash}>
-                                      <TypeToIcon type={a.txType} direction={isSending(a) ? 'sent' : 'received'} />
-                                    </LinkTx>
-                                  </td>
-                                  <td>
-                                    <div style={{ width: 160 }}>
-                                      <span className={a.memo?.length > 20 ? 'tooltip' : ''}>
-                                        {a.memo && a.memo?.slice(0, 20) + (a.memo?.length > 20 ? '...' : '')}
-                                        {a.memo?.length > 20 && <span className="tooltiptext right">{a.memo}</span>}
-                                      </span>
-                                    </div>
-                                  </td>
-                                  <td className="right" style={{ width: 110 }}>
-                                    {/* showAmount(a.transferFee) */}
-                                    <br />
-                                    {a.transferFee ? (
-                                      niceNumber(a.transferFeeInFiats?.[selectedCurrency], 0, selectedCurrency, 6)
-                                    ) : (
-                                      <br />
-                                    )}
-                                  </td>
-                                  <td className="right" style={{ width: 110 }}>
-                                    {showAmount(a.txFee)}
-                                    <br />
-                                    {a.txFee ? (
-                                      niceNumber(a.txFeeInFiats?.[selectedCurrency], 0, selectedCurrency, 6)
-                                    ) : (
-                                      <br />
-                                    )}
-                                  </td>
-                                  <td className="right" style={{ width: 110 }}>
-                                    {showAmount(a.amount)}
-                                    <br />
-                                    {showFiat(a.amountInFiats?.[selectedCurrency], selectedCurrency) || <br />}
-                                  </td>
-                                </tr>
-                              ))}
-                            </>
-                          ) : (
-                            <tr>
-                              <td colSpan="100" className="center">
-                                {loading ? 'Loading data...' : 'There is no data to show here.'}
+                {!width || width > 800 ? (
+                  <table className="table-large no-border no-hover" style={width > 800 ? { width: 780 } : {}}>
+                    <thead>
+                      <tr>
+                        <th className="center">#</th>
+                        <th>Timestamp</th>
+                        {addressesToCheck.length > 1 && <th>Address</th>}
+                        <th className="center">Tx</th>
+                        <th>Memo</th>
+                        <th className="right">Transfer Fee</th>
+                        <th className="right">Tx Fee</th>
+                        <th className="right">Balance change</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {currentList?.length > 0 ? (
+                        <>
+                          {currentList.map((a, i) => (
+                            <tr key={i}>
+                              <td className="center">{a.index}</td>
+                              <td>{fullDateAndTime(a.timestamp)}</td>
+                              {addressesToCheck.length > 1 && <td>{addressName(a.address)}</td>}
+                              <td className="center">
+                                <LinkTx tx={a.hash}>
+                                  <TypeToIcon type={a.txType} direction={isSending(a) ? 'sent' : 'received'} />
+                                </LinkTx>
+                              </td>
+                              <td>
+                                <div style={{ width: 160 }}>
+                                  <span className={a.memo?.length > 20 ? 'tooltip' : ''}>
+                                    {a.memo && a.memo?.slice(0, 20) + (a.memo?.length > 20 ? '...' : '')}
+                                    {a.memo?.length > 20 && <span className="tooltiptext right">{a.memo}</span>}
+                                  </span>
+                                </div>
+                              </td>
+                              <td className="right" style={{ width: 110 }}>
+                                {/* showAmount(a.transferFee) */}
+                                <br />
+                                {a.transferFee ? (
+                                  niceNumber(a.transferFeeInFiats?.[selectedCurrency], 0, selectedCurrency, 6)
+                                ) : (
+                                  <br />
+                                )}
+                              </td>
+                              <td className="right" style={{ width: 110 }}>
+                                {showAmount(a.txFee)}
+                                <br />
+                                {a.txFee ? (
+                                  niceNumber(a.txFeeInFiats?.[selectedCurrency], 0, selectedCurrency, 6)
+                                ) : (
+                                  <br />
+                                )}
+                              </td>
+                              <td className="right" style={{ width: 110 }}>
+                                {showAmount(a.amount)}
+                                <br />
+                                {showFiat(a.amountInFiats?.[selectedCurrency], selectedCurrency) || <br />}
                               </td>
                             </tr>
-                          )}
-                        </tbody>
-                      </table>
-                    ) : (
-                      <table className="table-mobile">
-                        <tbody>
-                          {currentList?.length > 0 ? (
-                            <>
-                              {currentList.map((a, i) => (
-                                <tr key={i}>
-                                  <td style={{ padding: '5px' }}>#{a.index}</td>
-                                  <td>
-                                    <p>
-                                      Timestamp: <b>{fullDateAndTime(a.timestamp)}</b>
-                                    </p>
-                                    {addressesToCheck.length > 1 && (
-                                      <p>
-                                        Address: <b>{addressName(a.address)}</b>
-                                      </p>
-                                    )}
-                                    <p>Type: {a.txType}</p>
-                                    <p>
-                                      Ledger Amount: <b>{showAmount(a.amount)}</b>
-                                    </p>
-                                    <p>
-                                      {selectedCurrency.toUpperCase()} equavalent:{' '}
-                                      {showFiat(a.amountInFiats?.[selectedCurrency], selectedCurrency)}
-                                    </p>
-                                    {a.memo && (
-                                      <p>Memo: {a.memo?.slice(0, 197) + (a.memo?.length > 197 ? '...' : '')}</p>
-                                    )}
-                                    <p>
-                                      Tx: <LinkTx tx={a.hash} />
-                                    </p>
-                                  </td>
-                                </tr>
-                              ))}
-                            </>
-                          ) : (
-                            <tr>
-                              <td colSpan="100" className="center">
-                                {loading ? 'Loading data...' : 'There is no data to show here.'}
+                          ))}
+                        </>
+                      ) : (
+                        <tr>
+                          <td colSpan="100" className="center">
+                            {loading ? 'Loading data...' : 'There is no data to show here.'}
+                          </td>
+                        </tr>
+                      )}
+                    </tbody>
+                  </table>
+                ) : (
+                  <table className="table-mobile">
+                    <tbody>
+                      {currentList?.length > 0 ? (
+                        <>
+                          {currentList.map((a, i) => (
+                            <tr key={i}>
+                              <td style={{ padding: '5px' }}>#{a.index}</td>
+                              <td>
+                                <p>
+                                  Timestamp: <b>{fullDateAndTime(a.timestamp)}</b>
+                                </p>
+                                {addressesToCheck.length > 1 && (
+                                  <p>
+                                    Address: <b>{addressName(a.address)}</b>
+                                  </p>
+                                )}
+                                <p>Type: {a.txType}</p>
+                                <p>
+                                  Ledger Amount: <b>{showAmount(a.amount)}</b>
+                                </p>
+                                <p>
+                                  {selectedCurrency.toUpperCase()} equavalent:{' '}
+                                  {showFiat(a.amountInFiats?.[selectedCurrency], selectedCurrency)}
+                                </p>
+                                {a.memo && (
+                                  <p>Memo: {a.memo?.slice(0, 197) + (a.memo?.length > 197 ? '...' : '')}</p>
+                                )}
+                                <p>
+                                  Tx: <LinkTx tx={a.hash} />
+                                </p>
                               </td>
                             </tr>
-                          )}
-                        </tbody>
-                      </table>
-                    )}
-                  </>
+                          ))}
+                        </>
+                      ) : (
+                        <tr>
+                          <td colSpan="100" className="center">
+                            {loading ? 'Loading data...' : 'There is no data to show here.'}
+                          </td>
+                        </tr>
+                      )}
+                    </tbody>
+                  </table>
                 )}
-                <br />
-                <br />
-                {errorMessage ? <div className="center orange bold">{errorMessage}</div> : <br />}
               </>
-            </FiltersFrame>
-          </>
-        ) : (
-          <>
-            <div className="center">
-              <div style={{ maxWidth: '440px', margin: 'auto', textAlign: 'left' }}>
-                <p>- View detailed balance history for your verified addresses.</p>
-                <p>- Export data for tax reporting and analysis.</p>
-                <br />
-                <center>
-                  Read how it works: <Link href="/learn/xrp-xah-taxes">XRP and XAH Taxes</Link>
-                </center>
-                <br />
-              </div>
-              <br />
-              <center>
-                <button className="button-action" onClick={() => openEmailLogin()}>
-                  Register or Sign In
-                </button>
-              </center>
-            </div>
+            )}
             <br />
+            <br />
+            {errorMessage ? <div className="center orange bold">{errorMessage}</div> : <br />}
           </>
-        )}
+        </FiltersFrame>
       </div>
     </>
   )