Update UI Dashboard 2 (#38)

* Display discounted amount

* Add american english canceled page and offer expired

* Display keyset id

* Display keyset status

* Set path for keyset lookup

* Clean up comments

* Add keyset info

* Remove comments

* Don't set keysetActive to true manually

* Force refresh when activating a keyset

* Use new enable endpoint

* Show whether ebill is paid

Author: stefanbitcr

src/components/AppSidebar.tsx

@@ -29,6 +29,10 @@ const data = {
           title: "Offered",
           url: "/quotes/offered",
         },
+        {
+          title: "Offer Expired",
+          url: "/quotes/offerexpired",
+        },
         {
           title: "Accepted",
           url: "/quotes/accepted",
@@ -41,6 +45,10 @@ const data = {
           title: "Rejected",
           url: "/quotes/rejected",
         },
+        {
+          title: "Canceled",
+          url: "/quotes/canceled",
+        },
       ],
     },
   ],

src/generated/client/sdk.gen.ts

@@ -1,7 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import type { Options as ClientOptions, TDataShape, Client } from '@hey-api/client-fetch';
-import type { ListQuotesData, ListQuotesResponse, ListPendingQuotesData, ListPendingQuotesResponse, AdminLookupQuoteData, AdminLookupQuoteResponse, AdminUpdateQuoteData, AdminUpdateQuoteResponse, ResolveOfferData, EnquireQuoteData, EnquireQuoteResponse, LookupQuoteData, LookupQuoteResponse, ActivateKeysetData, ActivateKeysetResponse, DebitData, CreditData, ECashBalance, OnChainBalanceData, OnChainData} from './types.gen';
+import type { ListQuotesData, ListQuotesResponse, ListPendingQuotesData, ListPendingQuotesResponse, AdminLookupQuoteData, AdminLookupQuoteResponse, AdminUpdateQuoteData, AdminUpdateQuoteResponse, ResolveOfferData, EnquireQuoteData, EnquireQuoteResponse, LookupQuoteData, LookupQuoteResponse, ActivateKeysetData, ActivateKeysetResponse, DebitData, CreditData, ECashBalance, OnChainBalanceData, OnChainData, KeysetInfoData, KeySetInfo} from './types.gen';
 import { client as _heyApiClient } from './client.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = ClientOptions<TData, ThrowOnError> & {
@@ -91,7 +91,7 @@ export const lookupQuote = <ThrowOnError extends boolean = false>(options: Optio
  */
 export const activateKeyset = <ThrowOnError extends boolean = false>(options: Options<ActivateKeysetData, ThrowOnError>) => {
     return (options.client ?? _heyApiClient).post<ActivateKeysetResponse, unknown, ThrowOnError>({
-        url: '/v1/admin/keys/activate',
+        url: '/v1/admin/keys/enable',
         ...options,
         headers: {
             'Content-Type': 'application/json',
@@ -125,3 +125,14 @@ export const onchainBalance = <ThrowOnError extends boolean = false>(options: Op
         ...options
     });
 };
+
+/**
+  * --------------------------- KeySetInfo
+*/
+
+export const keysetInfo = <ThrowOnError extends boolean = false>(options: Options<KeysetInfoData, ThrowOnError>) => {
+    return (options.client ?? _heyApiClient).get<KeySetInfo, unknown, ThrowOnError>({
+        url: '/v1/admin/keysets/{keyset_id}',
+        ...options
+    });
+};

src/generated/client/types.gen.ts

@@ -135,22 +135,36 @@ export type InfoReply = {
 } | {
     bill: BillInfo;
     id: string;
-    signatures: Array<BlindSignature>;
+    status: 'Canceled';
+    tstamp: string;
+} | {
+    bill: BillInfo;
+    id: string;
+    keyset_id: string;
     status: 'Offered';
+    discounted: number;
     ttl: string;
+} | {
+    bill: BillInfo;
+    id: string;
+    status: 'OfferExpired';
+    discounted: number;
+    tstamp: string;
 } | {
     bill: BillInfo;
     id: string;
     status: 'Denied';
 } | {
     bill: BillInfo;
     id: string;
-    signatures: Array<BlindSignature>;
+    keyset_id: string;
+    discounted: number;
     status: 'Accepted';
 } | {
     bill: BillInfo;
     id: string;
     status: 'Rejected';
+    discounted: number;
     tstamp: string;
 };
 
@@ -402,7 +416,7 @@ export type ActivateKeysetData = {
     body: ActivateKeysetRequest;
     path?: never;
     query?: never;
-    url: '/v1/admin/keys/activate';
+    url: '/v1/admin/keys/enable';
 };
 
 export type ActivateKeysetErrors = {
@@ -455,10 +469,30 @@ export type OnChainBalanceData = {
   confirmed: number;
 };
 
-
 export type OnChainData = {
   body?: never;
   path?: never;
   query?: never;
   url: '/v1/admin/onchain/balance';
 };
+
+/**
+ * Keyset information
+ */
+
+export type KeySetInfo = {
+  id: string;
+  unit: CurrencyUnit;
+  active: boolean;
+  input_fee_ppk: number;
+};
+
+
+export type KeysetInfoData = {
+  body?: never;
+  path: {
+      keyset_id: string;
+  };
+  query?: never;
+  url: '/v1/admin/keysets/{keyset_id}';
+};

src/main.tsx

@@ -20,10 +20,6 @@ const queryClient = new QueryClient()
 
 const prepare = async () => {
   await initKeycloak()
-  // if (meta.apiMocksEnabled) {
-  //   const { worker } = await import("./mocks/browser")
-  //   await worker.start()
-  // }
 }
 
 function App() {
@@ -39,10 +35,11 @@ function App() {
             <Route path="quotes" element={<StatusQuotePage />} />
             <Route path="quotes/pending" element={<StatusQuotePage status="Pending" />} />
             <Route path="quotes/accepted" element={<StatusQuotePage status="Accepted" />} />
+            <Route path="quotes/canceled" element={<StatusQuotePage status="Canceled" />} />
             <Route path="quotes/offered" element={<StatusQuotePage status="Offered" />} />
+            <Route path="quotes/offerexpired" element={<StatusQuotePage status="OfferExpired" />} />
             <Route path="quotes/denied" element={<StatusQuotePage status="Denied" />} />
             <Route path="quotes/rejected" element={<StatusQuotePage status="Rejected" />} />
-            {/* <Route path="quotes/expired" element={<StatusQuotePage status="Rejected" />} /> */}
             <Route path="quotes/:id" element={<QuotePage />} />
             <Route path="settings" element={<SettingsPage />} />
             <Route path="info" element={<InfoPage />} />