diff --git a/app/account/orders/[id]/loading.tsx b/app/account/(orderId)/orders/[id]/loading.tsx
similarity index 100%
rename from app/account/orders/[id]/loading.tsx
rename to app/account/(orderId)/orders/[id]/loading.tsx
diff --git a/app/account/orders/[id]/page.tsx b/app/account/(orderId)/orders/[id]/page.tsx
similarity index 96%
rename from app/account/orders/[id]/page.tsx
rename to app/account/(orderId)/orders/[id]/page.tsx
index 5088165d6..8868b2f2a 100644
--- a/app/account/orders/[id]/page.tsx
+++ b/app/account/(orderId)/orders/[id]/page.tsx
@@ -1,5 +1,5 @@
 import { ArrowLeftIcon, CheckCircleIcon, TruckIcon } from '@heroicons/react/24/outline';
-import { Button } from 'components/button';
+import ActivateWarranty from 'components/orders/activate-warranty';
 import OrderSummary from 'components/orders/order-summary';
 import OrderSummaryMobile from 'components/orders/order-summary-mobile';
 import Price from 'components/price';
@@ -8,7 +8,7 @@ import { Card } from 'components/ui/card';
 import Heading from 'components/ui/heading';
 import Label from 'components/ui/label';
 import Text from 'components/ui/text';
-import { getCustomerOrder } from 'lib/shopify';
+import { getCustomerOrder, getOrderMetafields } from 'lib/shopify';
 import { Fulfillment, Order } from 'lib/shopify/types';
 import { toPrintDate } from 'lib/utils';
 import Image from 'next/image';
@@ -228,7 +228,10 @@ function OrderDetails({ order }: { order: Order }) {
 }
 
 export default async function OrderPage({ params }: { params: { id: string } }) {
-  const order = await getCustomerOrder(params.id);
+  const [order, orderMetafields] = await Promise.all([
+    getCustomerOrder(params.id),
+    getOrderMetafields(params.id)
+  ]);
 
   return (
     <>
@@ -244,9 +247,7 @@ export default async function OrderPage({ params }: { params: { id: string } })
               <Label>Confirmed {toPrintDate(order.processedAt)}</Label>
             </div>
           </div>
-          <div>
-            <Button>Activate Warranty</Button>
-          </div>
+          <ActivateWarranty order={order} orderMetafields={orderMetafields} />
         </div>
         <div className="flex items-start gap-6">
           <div className="flex flex-1 flex-col gap-6">
diff --git a/app/account/loading.tsx b/app/account/(orders)/loading.tsx
similarity index 100%
rename from app/account/loading.tsx
rename to app/account/(orders)/loading.tsx
diff --git a/app/account/page.tsx b/app/account/(orders)/page.tsx
similarity index 93%
rename from app/account/page.tsx
rename to app/account/(orders)/page.tsx
index 160c5feb8..03fa41fd7 100644
--- a/app/account/page.tsx
+++ b/app/account/(orders)/page.tsx
@@ -4,7 +4,7 @@ import MobileOrderActions from 'components/orders/mobile-order-actions';
 import OrdersHeader from 'components/orders/orders-header';
 import Price from 'components/price';
 import { getCustomerOrders, getOrdersMetafields } from 'lib/shopify';
-import { isBeforeToday, toPrintDate } from 'lib/utils';
+import { toPrintDate } from 'lib/utils';
 import Image from 'next/image';
 import Link from 'next/link';
 
@@ -64,12 +64,7 @@ export default async function AccountPage() {
                       <span>View Order</span>
                       <span className="sr-only">{order.normalizedId}</span>
                     </Link>
-                    {!isBeforeToday(ordersMetafields[order.id]?.warrantyActivationDeadline) && (
-                      <ActivateWarranty
-                        order={order}
-                        orderMetafields={ordersMetafields[order.id]}
-                      />
-                    )}
+                    <ActivateWarranty order={order} orderMetafields={ordersMetafields[order.id]} />
                   </div>
                 </div>
 
diff --git a/components/orders/activate-warranty.tsx b/components/orders/activate-warranty.tsx
index 68325d27b..a8f9bb707 100644
--- a/components/orders/activate-warranty.tsx
+++ b/components/orders/activate-warranty.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { Order, OrderMetafield, WarrantyStatus } from 'lib/shopify/types';
+import { isBeforeToday } from 'lib/utils';
 import { useState } from 'react';
 import ActivateWarrantyModal from './activate-warranty-modal';
 import WarrantyActivatedBadge from './warranty-activated-badge';
@@ -13,15 +14,20 @@ type ActivateWarrantyModalProps = {
 const ActivateWarranty = ({ order, orderMetafields }: ActivateWarrantyModalProps) => {
   const [isOpen, setIsOpen] = useState(false);
   const isWarrantyActivated = orderMetafields?.warrantyStatus === WarrantyStatus.Activated;
+  const isPassDeadline = isBeforeToday(orderMetafields?.warrantyActivationDeadline);
 
   if (isWarrantyActivated) {
     return <WarrantyActivatedBadge />;
   }
 
+  if (isPassDeadline) {
+    return null;
+  }
+
   return (
     <>
       <button
-        className="flex items-center justify-center rounded-md border border-gray-300 bg-white px-2.5 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
+        className="flex h-fit items-center justify-center rounded-md border border-gray-300 bg-white px-2.5 py-2 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
         onClick={() => setIsOpen(true)}
       >
         Activate Warranty
diff --git a/components/orders/warranty-activated-badge.tsx b/components/orders/warranty-activated-badge.tsx
index 69a3658fd..516c8925f 100644
--- a/components/orders/warranty-activated-badge.tsx
+++ b/components/orders/warranty-activated-badge.tsx
@@ -2,7 +2,7 @@ import { CheckCircleIcon } from '@heroicons/react/24/solid';
 
 const WarrantyActivatedBadge = () => {
   return (
-    <span className="inline-flex items-center gap-x-2 rounded-md bg-green-50 px-2.5 py-2 text-sm font-medium text-green-700 ring-1 ring-inset ring-green-600/20">
+    <span className="inline-flex h-fit items-center gap-x-2 rounded-md bg-green-50 px-2.5 py-2 text-sm font-medium text-green-700 ring-1 ring-inset ring-green-600/20">
       <CheckCircleIcon className="h-5 w-5 text-green-500" aria-hidden="true" />
       Warranty Activated
     </span>
diff --git a/lib/shopify/fragments/customer-details.ts b/lib/shopify/fragments/customer-details.ts
index 5240a7d5f..9fc85199e 100644
--- a/lib/shopify/fragments/customer-details.ts
+++ b/lib/shopify/fragments/customer-details.ts
@@ -1,5 +1,5 @@
 import customerAddress from './customer-address';
-import orderCard from './order-card';
+import orderCard from './order';
 
 const customerDetailsFragment = /* GraphQL */ `
   ${customerAddress}
diff --git a/lib/shopify/fragments/order-card.ts b/lib/shopify/fragments/order.ts
similarity index 58%
rename from lib/shopify/fragments/order-card.ts
rename to lib/shopify/fragments/order.ts
index 4d8dc81b9..9ed12a895 100644
--- a/lib/shopify/fragments/order-card.ts
+++ b/lib/shopify/fragments/order.ts
@@ -28,4 +28,19 @@ const orderCard = /* GraphQL */ `
   ${lineItemFragment}
 `;
 
+export const orderMetafields = /* GraphQL */ `
+  fragment OrderMetafield on Order {
+    id
+    warrantyStatus: metafield(namespace: "custom", key: "warranty_status") {
+      value
+    }
+    warrantyActivationDeadline: metafield(
+      namespace: "custom"
+      key: "warranty_activation_deadline"
+    ) {
+      value
+    }
+  }
+`;
+
 export default orderCard;
diff --git a/lib/shopify/index.ts b/lib/shopify/index.ts
index 1351b1491..33f8075c4 100644
--- a/lib/shopify/index.ts
+++ b/lib/shopify/index.ts
@@ -38,7 +38,7 @@ import { getCustomerQuery } from './queries/customer';
 import { getMenuQuery } from './queries/menu';
 import { getMetaobjectQuery, getMetaobjectsQuery } from './queries/metaobject';
 import { getImageQuery, getMetaobjectsByIdsQuery } from './queries/node';
-import { getCustomerOrderQuery } from './queries/order';
+import { getCustomerOrderQuery, getOrderMetafieldsQuery } from './queries/order';
 import { getCustomerOrderMetafieldsQuery, getCustomerOrdersQuery } from './queries/orders';
 import { getPageQuery, getPagesQuery } from './queries/page';
 import {
@@ -1161,3 +1161,27 @@ export const getOrdersMetafields = async (): Promise<{ [key: string]: OrderMetaf
     {} as { [key: string]: OrderMetafield }
   );
 };
+
+export const getOrderMetafields = async (orderId: string): Promise<OrderMetafield> => {
+  const res = await adminFetch<{
+    data: {
+      order: {
+        id: string;
+      } & ShopifyOrderMetafield;
+    };
+    variables: {
+      id: string;
+    };
+  }>({
+    query: getOrderMetafieldsQuery,
+    variables: { id: `gid://shopify/Order/${orderId}` },
+    tags: [`${TAGS.orderMetafields}/${orderId}`]
+  });
+
+  const order = res.body.data.order;
+
+  return {
+    warrantyStatus: order.warrantyStatus?.value ?? null,
+    warrantyActivationDeadline: order.warrantyActivationDeadline?.value ?? null
+  };
+};
diff --git a/lib/shopify/queries/order.ts b/lib/shopify/queries/order.ts
index 826479f27..58b47a282 100644
--- a/lib/shopify/queries/order.ts
+++ b/lib/shopify/queries/order.ts
@@ -1,4 +1,5 @@
 import lineItemFragment from '../fragments/line-item';
+import { orderMetafields } from '../fragments/order';
 
 // NOTE: https://shopify.dev/docs/api/customer/latest/queries/customer
 export const getCustomerOrderQuery = /* GraphQL */ `
@@ -220,3 +221,12 @@ export const getCustomerOrderQuery = /* GraphQL */ `
   }
   ${lineItemFragment}
 `;
+
+export const getOrderMetafieldsQuery = /* GraphQL */ `
+  query getOrderMetafields($id: ID!) {
+    order(id: $id) {
+      ...OrderMetafield
+    }
+  }
+  ${orderMetafields}
+`;
diff --git a/lib/shopify/queries/orders.ts b/lib/shopify/queries/orders.ts
index 0b1cbe027..27a840428 100644
--- a/lib/shopify/queries/orders.ts
+++ b/lib/shopify/queries/orders.ts
@@ -1,4 +1,5 @@
 import customerDetailsFragment from '../fragments/customer-details';
+import { orderMetafields } from '../fragments/order';
 
 const customerFragment = `#graphql
 `;
@@ -19,18 +20,10 @@ export const getCustomerOrderMetafieldsQuery = /* GraphQL */ `
     customer(id: $id) {
       orders(first: 20, sortKey: PROCESSED_AT, reverse: true) {
         nodes {
-          id
-          warrantyStatus: metafield(namespace: "custom", key: "warranty_status") {
-            value
-          }
-          warrantyActivationDeadline: metafield(
-            namespace: "custom"
-            key: "warranty_activation_deadline"
-          ) {
-            value
-          }
+          ...OrderMetafield
         }
       }
     }
   }
+  ${orderMetafields}
 `;