diff --git a/apps/shared-app/src/client/button.tsx b/apps/shared-app/src/client/button.tsx
index bc2e68f..99879b2 100644
--- a/apps/shared-app/src/client/button.tsx
+++ b/apps/shared-app/src/client/button.tsx
@@ -1,17 +1,18 @@
 'use client';
 
 import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import {trackClick} from '../server/track-click.js';
 
-export type ButtonProps = React.PropsWithChildren<{
-  readonly disabled?: boolean;
-}>;
+export type ButtonProps = React.PropsWithChildren<{}>;
+
+export function Button({children}: ButtonProps): JSX.Element {
+  const {pending} = ReactDOM.useFormStatus();
 
-export function Button({children, disabled}: ButtonProps): JSX.Element {
   return (
     <button
       onClick={() => void trackClick()}
-      disabled={disabled}
+      disabled={pending}
       className="rounded-full bg-cyan-500 py-1 px-4 text-white disabled:bg-zinc-300"
     >
       {children}
diff --git a/apps/shared-app/src/client/product.tsx b/apps/shared-app/src/client/product.tsx
index 9405fd7..4d4d0df 100644
--- a/apps/shared-app/src/client/product.tsx
+++ b/apps/shared-app/src/client/product.tsx
@@ -2,35 +2,20 @@
 
 import {clsx} from 'clsx';
 import * as React from 'react';
-import type {buy} from '../server/buy.js';
+import * as ReactDOM from 'react-dom';
+import {buy} from '../server/buy.js';
+import {Notification} from '../shared/notification.js';
 import {Button} from './button.js';
-import {useEphemeralState} from './use-ephemeral-state.js';
 
-export interface ProductProps {
-  readonly buy: typeof buy;
-}
-
-export function Product({buy}: ProductProps): JSX.Element {
-  const [isPending, startTransition] = React.useTransition();
-
-  const [result, setResult] = useEphemeralState<ReturnType<typeof buy>>(
-    undefined,
-    5000,
-  );
-
-  const [message, fieldErrors] = result ? React.use(result) : [];
-
-  const formAction = (formData: FormData) => {
-    startTransition(() => setResult(buy(formData)));
-  };
+export function Product(): JSX.Element {
+  const [result, formAction] = ReactDOM.useFormState(buy, undefined);
 
   return (
     <form action={formAction}>
       <p className="my-2">
         This is a client component that renders a form with a form action. On
         submit, the form action calls a server action with the current form
-        data, which in turn responds with a serialized React element that's
-        rendered below the button.
+        data, which in turn responds with a success or error result.
       </p>
       <input
         type="number"
@@ -41,14 +26,29 @@ export function Product({buy}: ProductProps): JSX.Element {
         max={99}
         className={clsx(
           `p-1`,
-          fieldErrors?.quantity
+          result?.status === `error` && result.fieldErrors?.quantity
             ? [`bg-red-100`, `outline-red-700`]
             : [`bg-zinc-100`, `outline-cyan-500`],
         )}
       />
       {` `}
-      <Button disabled={isPending}>Buy now</Button>
-      {message}
+      <Button>Buy now</Button>
+      {result && (
+        <Notification status={result.status}>
+          {result.status === `success` ? (
+            <p>
+              Bought <strong>{result.quantity}</strong>
+              {` `}
+              {result.quantity === 1 ? `item` : `items`}.
+            </p>
+          ) : (
+            <p>{result.message}</p>
+          )}
+          <p>
+            Total items bought: <strong>{result.totalQuantityInSession}</strong>
+          </p>
+        </Notification>
+      )}
     </form>
   );
 }
diff --git a/apps/shared-app/src/client/use-ephemeral-state.ts b/apps/shared-app/src/client/use-ephemeral-state.ts
deleted file mode 100644
index ace74b2..0000000
--- a/apps/shared-app/src/client/use-ephemeral-state.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import * as React from 'react';
-
-export function useEphemeralState<S>(
-  initialState: S | undefined | (() => S | undefined),
-  lifetimeInMilliseconds: number,
-): [S | undefined, React.Dispatch<React.SetStateAction<S | undefined>>] {
-  const [state, setState] = React.useState(initialState);
-  const timeoutRef = React.useRef<number>();
-
-  const setEphemeralState = React.useCallback<
-    React.Dispatch<React.SetStateAction<S | undefined>>
-  >((value) => {
-    window.clearTimeout(timeoutRef.current);
-
-    timeoutRef.current = window.setTimeout(
-      () => setState(undefined),
-      lifetimeInMilliseconds,
-    );
-
-    setState(value);
-  }, []);
-
-  React.useEffect(() => () => window.clearTimeout(timeoutRef.current), []);
-
-  return [state, setEphemeralState];
-}
diff --git a/apps/shared-app/src/server/buy.tsx b/apps/shared-app/src/server/buy.ts
similarity index 50%
rename from apps/shared-app/src/server/buy.tsx
rename to apps/shared-app/src/server/buy.ts
index f3ceebc..7e3e750 100644
--- a/apps/shared-app/src/server/buy.tsx
+++ b/apps/shared-app/src/server/buy.ts
@@ -1,12 +1,27 @@
 'use server';
 
-import * as React from 'react';
 import 'server-only';
 import {z} from 'zod';
-import {Notification} from '../shared/notification.js';
 import {wait} from './wait.js';
 
-type BuyFieldErrors = z.inferFlattenedErrors<typeof BuyFormData>['fieldErrors'];
+export type BuyResult = BuySuccessResult | BuyErrorResult;
+
+export interface BuySuccessResult {
+  readonly status: 'success';
+  readonly quantity: number;
+  readonly totalQuantityInSession: number;
+}
+
+export interface BuyErrorResult {
+  readonly status: 'error';
+  readonly message: string;
+  readonly fieldErrors?: BuyFieldErrors;
+  readonly totalQuantityInSession: number;
+}
+
+export type BuyFieldErrors = z.inferFlattenedErrors<
+  typeof BuyFormData
+>['fieldErrors'];
 
 const FormDataFields = z.instanceof(FormData).transform((formData) => {
   const fields: Record<string, string> = {};
@@ -37,14 +52,20 @@ async function fetchAvailableProductCount(): Promise<number> {
 }
 
 export async function buy(
+  prevResult: BuyResult | undefined,
   formData: FormData,
-): Promise<[React.ReactNode] | [React.ReactNode, BuyFieldErrors]> {
+): Promise<BuyResult> {
   const parsedFormData = FormDataFields.safeParse(formData);
+  const totalQuantityInSession = prevResult?.totalQuantityInSession ?? 0;
 
   if (!parsedFormData.success) {
-    return [
-      <Notification status="error">An unexpected error occured.</Notification>,
-    ];
+    console.error(parsedFormData.error);
+
+    return {
+      status: `error`,
+      message: `An unexpected error occured.`,
+      totalQuantityInSession,
+    };
   }
 
   const result = await BuyFormData.safeParseAsync(parsedFormData.data);
@@ -52,19 +73,21 @@ export async function buy(
   if (!result.success) {
     const {fieldErrors} = result.error.formErrors;
 
-    return [
-      <Notification status="error">
-        {Object.values(fieldErrors).flat().join(` `)}
-      </Notification>,
+    return {
+      status: `error`,
+      message: Object.values(fieldErrors).flat().join(` `),
       fieldErrors,
-    ];
+      totalQuantityInSession,
+    };
   }
 
   const {quantity} = result.data;
 
-  return [
-    <Notification status="success">
-      Bought <strong>{quantity}</strong> {quantity === 1 ? `item` : `items`}.
-    </Notification>,
-  ];
+  // Buy quantity number of items ...
+
+  return {
+    status: `success`,
+    quantity,
+    totalQuantityInSession: totalQuantityInSession + quantity,
+  };
 }
diff --git a/apps/shared-app/src/server/home-page.tsx b/apps/shared-app/src/server/home-page.tsx
index bd71689..1791ab0 100644
--- a/apps/shared-app/src/server/home-page.tsx
+++ b/apps/shared-app/src/server/home-page.tsx
@@ -1,7 +1,6 @@
 import * as React from 'react';
 import {Product} from '../client/product.js';
 import {Main} from '../shared/main.js';
-import {buy} from './buy.js';
 import {Hello} from './hello.js';
 import {Suspended} from './suspended.js';
 
@@ -13,7 +12,7 @@ export function HomePage(): JSX.Element {
         <Suspended />
       </React.Suspense>
       <React.Suspense>
-        <Product buy={buy} />
+        <Product />
       </React.Suspense>
     </Main>
   );