Merge branch 'adminV2' into SPV-1044/DestionationViewAdm

bitcoin-sv · Sep 20, 2024 · 0b920a3 · 0b920a3
2 parents 9094ab8 + 15d1d13
commit 0b920a3
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 29 deletions.
diff --git a/src/components/Searchbar/Searchbar.tsx b/src/components/Searchbar/Searchbar.tsx
@@ -1,32 +1,26 @@
-import { CircleX, Search } from 'lucide-react';
+import { Input } from '@/components';
+import { Search } from 'lucide-react';
 
 import React from 'react';
 
-import { Input } from '@/components';
-
 export interface SearchbarProps {
   filter: string;
   setFilter: React.Dispatch<React.SetStateAction<string>>;
+  placeholder?: string;
 }
 
-export const Searchbar = ({ filter, setFilter }: SearchbarProps) => {
+export const Searchbar = ({ filter, setFilter, placeholder }: SearchbarProps) => {
   const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setFilter(event.target.value);
   };
 
   return (
     <div className="relative flex-1 md:grow-0 mr-3">
       <Search className="absolute left-2.5 top-3 h-4 w-4 text-muted-foreground" />
-      {filter.length > 0 && (
-        <CircleX
-          onClick={() => setFilter('')}
-          className="h-4 w-4 right-2.5 top-3 text-muted-foreground absolute cursor-pointer"
-        />
-      )}
       <Input
         type="search"
-        placeholder="Search"
-        className="w-full h-10 rounded-lg bg-background pl-8 pr-8 md:w-[200px] lg:w-[336px]"
+        placeholder={placeholder || 'Search'}
+        className="w-full h-10 rounded-lg bg-background pl-8 md:w-[200px] lg:w-[336px]"
         value={filter}
         onChange={handleFilterChange}
       />

diff --git a/src/routes/admin/_admin.access-keys.tsx b/src/routes/admin/_admin.access-keys.tsx
@@ -129,7 +129,7 @@ export function AccessKeys() {
             <TabsTrigger value="deleted">Deleted</TabsTrigger>
           </TabsList>
           <div className="flex">
-            <Searchbar filter={filter} setFilter={setFilter} />
+            <Searchbar filter={filter} setFilter={setFilter} placeholder="Search by xpubID" />
             <DateRangeFilter withRevokedRange />
           </div>
         </div>

diff --git a/src/routes/admin/_admin.contacts.tsx b/src/routes/admin/_admin.contacts.tsx
@@ -150,7 +150,7 @@ export function Contacts() {
             <TabsTrigger value="deleted">Deleted</TabsTrigger>
           </TabsList>
           <div className="flex">
-            <Searchbar filter={filter} setFilter={setFilter} />
+            <Searchbar filter={filter} setFilter={setFilter} placeholder="Search by ID, Paymail or PubKey" />
             <DateRangeFilter />
           </div>
         </div>

diff --git a/src/routes/admin/_admin.destinations.tsx b/src/routes/admin/_admin.destinations.tsx
@@ -120,7 +120,7 @@ export function Destinations() {
             <TabsTrigger value="deleted">Deleted</TabsTrigger>
           </TabsList>
           <div className="flex">
-            <Searchbar filter={filter} setFilter={setFilter} />
+            <Searchbar filter={filter} setFilter={setFilter} placeholder="Search by lockingScript or address" />
             <DateRangeFilter />
           </div>
         </div>

diff --git a/src/routes/admin/_admin.paymails.tsx b/src/routes/admin/_admin.paymails.tsx
@@ -120,7 +120,7 @@ export function Paymails() {
           </TabsList>
           <div className="flex">
             <AddPaymailDialog className="mr-3" />
-            <Searchbar filter={filter} setFilter={setFilter} />
+            <Searchbar filter={filter} setFilter={setFilter} placeholder="Search by xpubID" />
             <DateRangeFilter />
           </div>
         </div>

diff --git a/src/routes/admin/_admin.transactions.tsx b/src/routes/admin/_admin.transactions.tsx
@@ -81,7 +81,7 @@ export function Transactions() {
           </TabsList>
           <div className="flex">
             {hasRecordTransaction && <RecordTxDialogAdmin />}
-            <Searchbar filter={blockHeight} setFilter={setBlockHeight} />
+            <Searchbar filter={blockHeight} setFilter={setBlockHeight} placeholder="Search by block height" />
           </div>
         </div>
         <TabsContent value="all">

diff --git a/src/routes/admin/_admin.xpub.tsx b/src/routes/admin/_admin.xpub.tsx
@@ -1,11 +1,3 @@
-import { useSuspenseQuery } from '@tanstack/react-query';
-import { createFileRoute, useSearch } from '@tanstack/react-router';
-import { useState } from 'react';
-
-import { useDebounce } from 'use-debounce';
-
-import { z } from 'zod';
-
 import {
   AddXpubDialog,
   CustomErrorComponent,
@@ -21,6 +13,13 @@ import {
 import { useSpvWalletClient } from '@/contexts';
 
 import { addStatusField, xPubQueryOptions } from '@/utils';
+import { useSuspenseQuery } from '@tanstack/react-query';
+import { createFileRoute, useSearch } from '@tanstack/react-router';
+import { useState } from 'react';
+
+import { useDebounce } from 'use-debounce';
+
+import { z } from 'zod';
 
 export const Route = createFileRoute('/admin/_admin/xpub')({
   validateSearch: z.object({
@@ -57,7 +56,7 @@ export function Xpub() {
           </TabsList>
           <div className="flex">
             <AddXpubDialog className="mr-3" />
-            <Searchbar filter={filter} setFilter={setFilter} />
+            <Searchbar filter={filter} setFilter={setFilter} placeholder="Search by ID" />
           </div>
         </div>
         <TabsContent value="all">

diff --git a/src/routes/user/_user.destinations.tsx b/src/routes/user/_user.destinations.tsx
@@ -122,7 +122,7 @@ export function Destinations() {
           </TabsList>
           <div className="flex">
             <AddDestinationDialog className="mr-3" />
-            <Searchbar filter={filter} setFilter={setFilter} />
+            <Searchbar filter={filter} setFilter={setFilter} placeholder="Search by lockingScript or address" />
             <DateRangeFilter />
           </div>
         </div>

diff --git a/src/routes/user/_user.transactions.tsx b/src/routes/user/_user.transactions.tsx
@@ -60,7 +60,7 @@ function Transactions() {
         <div className="flex items-center justify-end mb-2">
           <div className="flex">
             <PrepareTxDialogUser />
-            <Searchbar filter={blockHeight} setFilter={setBlockHeight} />
+            <Searchbar filter={blockHeight} setFilter={setBlockHeight} placeholder="Search by block height" />
           </div>
         </div>
         <TransactionsTabContent

diff --git a/src/utils/getAddress.ts b/src/utils/getAddress.ts
@@ -1 +1,3 @@
-export const getAddress = (filter: string) => (filter.length > 0 && filter.length < 30 ? filter : undefined);
+export const getAddress = (filter: string) => {
+  return filter.length > 0 && filter.length < 35 ? filter : undefined;
+};