Skip to content

Commit

Permalink
Merge pull request #1055 from bitcoin-sv/feat/SPV-1143
Browse files Browse the repository at this point in the history
Feat/spv 1143
  • Loading branch information
dzolt-4chain authored Oct 31, 2024
2 parents ca8cc8e + 33efc74 commit a130712
Show file tree
Hide file tree
Showing 45 changed files with 188 additions and 927 deletions.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@4chain-ag/react-configuration": "^1.0.4",
"@bsv/sdk": "^1.0.37",
"@bsv/spv-wallet-js-client": "^1.0.0-beta.21",
"@bsv/spv-wallet-js-client": "^1.0.0-beta.24",
"@estruyf/github-actions-reporter": "^1.9.2",
"@heroicons/react": "^2.1.3",
"@hookform/resolvers": "^3.9.0",
Expand Down Expand Up @@ -88,5 +88,8 @@
"vite": "^5.2.0",
"vite-plugin-eslint": "^1.8.1",
"vitest": "^2.0.5"
},
"resolutions": {
"strip-ansi": "6.0.1"
}
}
2 changes: 1 addition & 1 deletion public/config.default.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"loginTitle": "Sign in to a SPV Wallet",
"loginSubtitle": "Sign in using your xPriv",
"serverUrl": "http://localhost:3003/v1",
"serverUrl": "http://localhost:3003",
"hideServerUrl": false,
"configureServerUrl": true
}
6 changes: 3 additions & 3 deletions src/components/AccessKeysColumns/AccessKeysColumns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const accessKeysColumns: ColumnDef<AccessKeysColumns>[] = [
},
},
{
accessorKey: 'xpub_id',
accessorKey: 'xpubId',
header: ({ column }) => {
return (
<Link
Expand Down Expand Up @@ -73,7 +73,7 @@ export const accessKeysColumns: ColumnDef<AccessKeysColumns>[] = [
},
},
{
accessorKey: 'created_at',
accessorKey: 'createdAt',
header: ({ column }) => {
return (
<Link
Expand All @@ -91,7 +91,7 @@ export const accessKeysColumns: ColumnDef<AccessKeysColumns>[] = [
);
},
cell: ({ row }) => {
return row.getValue('created_at') && new Date(row.getValue('created_at')).toLocaleString();
return row.getValue('createdAt') && new Date(row.getValue('createdAt')).toLocaleString();
},
},
];
104 changes: 0 additions & 104 deletions src/components/AddDestinationDialog/AddDestinationDialog.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/components/AddDestinationDialog/index.ts

This file was deleted.

6 changes: 3 additions & 3 deletions src/components/ContactsColumns/ContactsColumns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const contactsColumns: ColumnDef<Contact>[] = [
<Link
search={(prev) => ({
...prev,
order_by_field: 'full_name',
order_by_field: 'fullName',
sort_direction: getSortDirection(column),
})}
>
Expand Down Expand Up @@ -79,7 +79,7 @@ export const contactsColumns: ColumnDef<Contact>[] = [
<Link
search={(prev) => ({
...prev,
order_by_field: 'pub_key',
order_by_field: 'pubKey',
sort_direction: getSortDirection(column),
})}
>
Expand Down Expand Up @@ -110,7 +110,7 @@ export const contactsColumns: ColumnDef<Contact>[] = [
);
},
cell: ({ row }) => {
return row.original.deleted_at ? (
return row.original.deletedAt ? (
<Badge variant="destructive">Deleted</Badge>
) : row.getValue('status') === ContactStatus.Confirmed ? (
<Badge variant="outline">Confirmed</Badge>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContactsTabContent/ContactsTabContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export const ContactsTabContent = ({ contacts }: ContactsTabContentProps) => {
<>
<ViewDialog row={row} />
<ContactEditDialog row={row} />
{row.original.deleted_at == null && <ContactDeleteDialog row={row} />}
{row.original.deletedAt == null && <ContactDeleteDialog row={row} />}
</>
)}
/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/DataTable/DataTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
TableHeader,
TableRow,
} from '@/components';
import { AccessKey, Contact, Destination, PaymailAddress, Tx, XPub } from '@bsv/spv-wallet-js-client';
import { AccessKey, Contact, OldPaymailAddress, Tx, XPub } from '@bsv/spv-wallet-js-client';
import {
ColumnDef,
flexRender,
Expand All @@ -26,7 +26,7 @@ import { EllipsisVertical } from 'lucide-react';

import React from 'react';

export type RowType = XPub | Contact | AccessKey | Destination | PaymailAddress | Tx;
export type RowType = XPub | Contact | AccessKey | OldPaymailAddress | Tx;

interface DataTableProps<TData, TValue> {
columns: ColumnDef<TData, TValue>[];
Expand Down
88 changes: 0 additions & 88 deletions src/components/DestinationEditDialog/DestinationEditDialog.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/components/DestinationEditDialog/index.ts

This file was deleted.

Loading

0 comments on commit a130712

Please sign in to comment.