diff --git a/src/components/AppSidebar.tsx b/src/components/AppSidebar.tsx
index c141a88..0f3183e 100644
--- a/src/components/AppSidebar.tsx
+++ b/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",
+        },
       ],
     },
   ],
diff --git a/src/generated/client/sdk.gen.ts b/src/generated/client/sdk.gen.ts
index e4d1df7..2b547a4 100644
--- a/src/generated/client/sdk.gen.ts
+++ b/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
+    });
+};
diff --git a/src/generated/client/types.gen.ts b/src/generated/client/types.gen.ts
index 5e0a1be..4515483 100644
--- a/src/generated/client/types.gen.ts
+++ b/src/generated/client/types.gen.ts
@@ -135,9 +135,21 @@ 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;
@@ -145,12 +157,14 @@ export type InfoReply = {
 } | {
     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}';
+};
diff --git a/src/main.tsx b/src/main.tsx
index c145461..c047c76 100644
--- a/src/main.tsx
+++ b/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 />} />
diff --git a/src/pages/quotes/QuotePage.tsx b/src/pages/quotes/QuotePage.tsx
index 59f30b1..daff027 100644
--- a/src/pages/quotes/QuotePage.tsx
+++ b/src/pages/quotes/QuotePage.tsx
@@ -12,12 +12,12 @@ import {
   adminLookupQuoteQueryKey,
   adminUpdateQuoteMutation,
 } from "@/generated/client/@tanstack/react-query.gen"
-import { activateKeyset } from "@/generated/client/sdk.gen"
+import { activateKeyset, keysetInfo } from "@/generated/client/sdk.gen"
 import { cn, getInitials } from "@/lib/utils"
 import { formatDate, humanReadableDuration } from "@/utils/dates"
 
 import { formatNumber, truncateString } from "@/utils/strings"
-import { useMutation, useQueryClient, useSuspenseQuery } from "@tanstack/react-query"
+import { useMutation, useQuery, useQueryClient, useSuspenseQuery } from "@tanstack/react-query"
 import { getDeterministicColor } from "@/utils/dev"
 
 import { LoaderIcon } from "lucide-react"
@@ -211,7 +211,7 @@ function DenyConfirmDrawer({ children, onSubmit, ...drawerProps }: DenyConfirmDr
   )
 }
 
-function QuoteActions({ value, isFetching }: { value: InfoReply; isFetching: boolean }) {
+function QuoteActions({ value, isFetching, newKeyset }: { value: InfoReply; isFetching: boolean; newKeyset: boolean }) {
   const [offerFormData, setOfferFormData] = useState<OfferFormResult>()
   const [offerFormDrawerOpen, setOfferFormDrawerOpen] = useState(false)
   const [offerConfirmDrawerOpen, setOfferConfirmDrawerOpen] = useState(false)
@@ -289,13 +289,7 @@ function QuoteActions({ value, isFetching }: { value: InfoReply; isFetching: boo
     },
     onSuccess: () => {
       toast.success("Keyset has been activated.")
-      void queryClient.invalidateQueries({
-        queryKey: adminLookupQuoteQueryKey({
-          path: {
-            id: value.id,
-          },
-        }),
-      })
+      void queryClient.invalidateQueries()
     },
   })
 
@@ -331,42 +325,50 @@ function QuoteActions({ value, isFetching }: { value: InfoReply; isFetching: boo
   const onActivateKeyset = () => {
     activateKeysetMutation.mutate()
   }
-
   return (
     <div className="flex items-center gap-2">
-      <DenyConfirmDrawer
-        title="Confirm denying quote"
-        open={denyConfirmDrawerOpen}
-        onOpenChange={setDenyConfirmDrawerOpen}
-        onSubmit={() => {
-          onDenyQuote()
-          setDenyConfirmDrawerOpen(false)
-        }}
-      >
-        <Button
-          className="flex-1"
-          disabled={isFetching || denyQuote.isPending || value.status !== "Pending"}
-          variant={value.status !== "Pending" ? "outline" : "destructive"}
+      {value.status === "Pending" ? (
+        <DenyConfirmDrawer
+          title="Confirm denying quote"
+          open={denyConfirmDrawerOpen}
+          onOpenChange={setDenyConfirmDrawerOpen}
+          onSubmit={() => {
+            onDenyQuote()
+            setDenyConfirmDrawerOpen(false)
+          }}
         >
-          Deny {denyQuote.isPending && <LoaderIcon className="stroke-1 animate-spin" />}
-        </Button>
-      </DenyConfirmDrawer>
-      <OfferFormDrawer
-        title="Offer quote"
-        description="Make an offer to the current holder of this bill"
-        value={value}
-        open={offerFormDrawerOpen}
-        onOpenChange={setOfferFormDrawerOpen}
-        onSubmit={(data) => {
-          setOfferFormData(data)
-          setOfferConfirmDrawerOpen(true)
-          setOfferFormDrawerOpen(false)
-        }}
-      >
-        <Button className="flex-1" disabled={isFetching || offerQuote.isPending || value.status !== "Pending"}>
-          Offer {offerQuote.isPending && <LoaderIcon className="stroke-1 animate-spin" />}
-        </Button>
-      </OfferFormDrawer>
+          <Button
+            className="flex-1"
+            disabled={isFetching || denyQuote.isPending || value.status !== "Pending"}
+            variant={value.status !== "Pending" ? "outline" : "destructive"}
+          >
+            Deny {denyQuote.isPending && <LoaderIcon className="stroke-1 animate-spin" />}
+          </Button>
+        </DenyConfirmDrawer>
+      ) : (
+        <></>
+      )}
+      {value.status === "Pending" ? (
+        <OfferFormDrawer
+          title="Offer quote"
+          description="Make an offer to the current holder of this bill"
+          value={value}
+          open={offerFormDrawerOpen}
+          onOpenChange={setOfferFormDrawerOpen}
+          onSubmit={(data) => {
+            setOfferFormData(data)
+            setOfferConfirmDrawerOpen(true)
+            setOfferFormDrawerOpen(false)
+          }}
+        >
+          <Button className="flex-1" disabled={isFetching || offerQuote.isPending || value.status !== "Pending"}>
+            Offer {offerQuote.isPending && <LoaderIcon className="stroke-1 animate-spin" />}
+          </Button>
+        </OfferFormDrawer>
+      ) : (
+        <></>
+      )}
+
       <OfferConfirmDrawer
         title="Confirm offering quote"
         description="Review your inputs and confirm the offer"
@@ -399,26 +401,30 @@ function QuoteActions({ value, isFetching }: { value: InfoReply; isFetching: boo
         </div>
       </OfferConfirmDrawer>
 
-      <ConfirmDrawer
-        title="Confirm activating keyset"
-        description="Are you sure you want to activate the keyset for this quote?"
-        open={activateKeysetConfirmDrawerOpen}
-        onOpenChange={setActivateKeysetConfirmDrawerOpen}
-        onSubmit={() => {
-          onActivateKeyset()
-          setActivateKeysetConfirmDrawerOpen(false)
-        }}
-        submitButtonText="Yes, activate keyset"
-        trigger={
-          <Button
-            className="flex-1"
-            disabled={isFetching || activateKeysetMutation.isPending || value.status !== "Accepted"}
-            variant="default"
-          >
-            Activate Keyset {activateKeysetMutation.isPending && <LoaderIcon className="stroke-1 animate-spin" />}
-          </Button>
-        }
-      />
+      {value.status === "Accepted" && "keyset_id" in value ? (
+        <ConfirmDrawer
+          title="Confirm activating keyset"
+          description="Are you sure you want to activate the keyset for this quote?"
+          open={activateKeysetConfirmDrawerOpen}
+          onOpenChange={setActivateKeysetConfirmDrawerOpen}
+          onSubmit={() => {
+            onActivateKeyset()
+            setActivateKeysetConfirmDrawerOpen(false)
+          }}
+          submitButtonText="Yes, activate keyset"
+          trigger={
+            <Button
+              className="flex-1"
+              disabled={isFetching || activateKeysetMutation.isPending || !newKeyset}
+              variant="default"
+            >
+              Activate Keyset {activateKeysetMutation.isPending && <LoaderIcon className="stroke-1 animate-spin" />}
+            </Button>
+          }
+        />
+      ) : (
+        <></>
+      )}
     </div>
   )
 }
@@ -565,8 +571,6 @@ function AnonPublicDataCard({ value }: { value?: AnonPublicData }) {
 function PayeePublicDataCard({ value }: { value?: PayeePublicData }) {
   if (!value) return null
 
-  console.log("Payee public data", value)
-
   if ("Ident" in value) {
     const identData = (value as { Ident: IdentityPublicData }).Ident
     return IdentityPublicDataCard({ value: identData })
@@ -579,6 +583,22 @@ function PayeePublicDataCard({ value }: { value?: PayeePublicData }) {
 }
 
 function Quote({ value, isFetching }: { value: InfoReply; isFetching: boolean }) {
+  const shouldFetchKeyset = (value.status === "Offered" || value.status === "Accepted") && "keyset_id" in value
+
+  const keysetId = "keyset_id" in value ? value.keyset_id : ""
+
+  const { data: keysetData } = useQuery({
+    queryKey: ["keyset", keysetId],
+    queryFn: () =>
+      keysetInfo({
+        path: { keyset_id: keysetId },
+      }),
+    enabled: shouldFetchKeyset,
+  })
+
+  const ebillPaid = keysetData?.data && "active" in keysetData.data && keysetData.data.active === false
+  const newKeyset = "keyset_id" in value && (!keysetData?.data || !("active" in keysetData.data))
+
   return (
     <div className="flex flex-col gap-1">
       <Table className="my-2">
@@ -589,6 +609,28 @@ function Quote({ value, isFetching }: { value: InfoReply; isFetching: boolean })
               <span className="font-mono">{value.id}</span>
             </TableCell>
           </TableRow>
+          {(value.status === "Offered" || value.status === "Accepted") && "keyset_id" in value ? (
+            <TableRow>
+              <TableCell className="font-bold">Keyset ID: </TableCell>
+              <TableCell className="flex items-center gap-2">
+                <span className="font-mono">{keysetId}</span>
+                <Badge
+                  variant={ebillPaid ? "default" : "destructive"}
+                  className={ebillPaid ? "bg-green-500" : "bg-red-500"}
+                >
+                  {ebillPaid ? "Paid" : "Unpaid"}
+                </Badge>
+                <Badge
+                  variant={newKeyset ? "default" : "destructive"}
+                  className={newKeyset ? "bg-red-500" : "bg-blue-500"}
+                >
+                  {newKeyset ? "Disabled" : "Enabled"}
+                </Badge>
+              </TableCell>
+            </TableRow>
+          ) : (
+            <></>
+          )}
           <TableRow>
             <TableCell className="font-bold">Status: </TableCell>
             <TableCell>
@@ -601,6 +643,18 @@ function Quote({ value, isFetching }: { value: InfoReply; isFetching: boolean })
             <TableCell className="font-bold">Sum: </TableCell>
             <TableCell>{formatNumber("en", value.bill?.sum)} sat</TableCell>
           </TableRow>
+          {(value.status === "Offered" ||
+            value.status === "Accepted" ||
+            value.status === "Rejected" ||
+            value.status === "OfferExpired") &&
+          "discounted" in value ? (
+            <TableRow>
+              <TableCell className="font-bold">Discounted: </TableCell>
+              <TableCell>{formatNumber("en", value.discounted)} crsat</TableCell>
+            </TableRow>
+          ) : (
+            <></>
+          )}
           <TableRow>
             <TableCell className="font-bold">Maturity date: </TableCell>
             <TableCell>
@@ -646,7 +700,7 @@ function Quote({ value, isFetching }: { value: InfoReply; isFetching: boolean })
         </TableBody>
       </Table>
 
-      <QuoteActions value={value} isFetching={isFetching} />
+      <QuoteActions value={value} isFetching={isFetching} newKeyset={newKeyset} />
     </div>
   )
 }
diff --git a/src/pages/quotes/StatusQuotePage.tsx b/src/pages/quotes/StatusQuotePage.tsx
index 2465c42..c74ff73 100644
--- a/src/pages/quotes/StatusQuotePage.tsx
+++ b/src/pages/quotes/StatusQuotePage.tsx
@@ -16,7 +16,7 @@ import { formatNumber, truncateString } from "@/utils/strings"
 import { Badge } from "@/components/ui/badge"
 import { cn } from "@/lib/utils"
 
-type QuoteStatus = "Accepted" | "Denied" | "Expired" | "Offered" | "Pending" | "Rejected" | "Cancelled"
+type QuoteStatus = "Accepted" | "Denied" | "OfferExpired" | "Offered" | "Pending" | "Rejected" | "Canceled"
 
 interface StatusQuotePageProps {
   status?: QuoteStatus