diff --git a/examples/next/src/app/page.tsx b/examples/next/src/app/page.tsx
index 7efd511f81..236f2ae3a9 100644
--- a/examples/next/src/app/page.tsx
+++ b/examples/next/src/app/page.tsx
@@ -1,42 +1,64 @@
 "use client";
 
-import { FC } from "react";
-
-import { ColorModeToggle } from "components/ColorModeToggle";
-import Header from "components/Header";
-import { DelegateAccount } from "components/DelegateAccount";
-import { InvalidTxn } from "components/InvalidTxn";
-import { LookupControllers } from "components/LookupControllers";
-import { ManualTransferEth } from "components/ManualTransferEth";
-import { PlayButton } from "components/PlayButton";
-import { Profile } from "components/Profile";
-import { SignMessage } from "components/SignMessage";
-import { Transfer } from "components/Transfer";
-import { Starterpack } from "components/Starterpack";
-import { UpdateSession } from "components/UpdateSession";
-import { ControllerToaster } from "@cartridge/ui";
+import { FC, useEffect, useMemo, useState } from "react";
+import { useAccount, useConnect, useDisconnect } from "@starknet-react/core";
+import ControllerConnector from "@cartridge/connector/controller";
+import { Button } from "@cartridge/ui";
 
 const Home: FC = () => {
+  const { status } = useAccount();
+  const { connect, connectors } = useConnect();
+  const { disconnect } = useDisconnect();
+  const [isControllerReady, setIsControllerReady] = useState(false);
+
+  const controllerConnector = useMemo(
+    () => ControllerConnector.fromConnectors(connectors),
+    [connectors],
+  );
+
+  useEffect(() => {
+    const checkReady = () => {
+      try {
+        if (controllerConnector) {
+          setIsControllerReady(controllerConnector.isReady());
+        }
+      } catch (e) {
+        console.error("Error checking controller readiness:", e);
+      }
+    };
+
+    checkReady();
+    const interval = setInterval(checkReady, 1000);
+    return () => clearInterval(interval);
+  }, [controllerConnector]);
+
   return (
-    <main className="w-screen overflow-x-hidden flex flex-col p-4 gap-4">
-      <div className="flex justify-between">
-        <h2 className="text-3xl font-bold underline text-primary">
-          Controller Example (Next.js)
-        </h2>
-        <ColorModeToggle />
-      </div>
-      <Header />
-      <PlayButton />
-      <Profile />
-      <Transfer />
-      <ManualTransferEth />
-      <Starterpack />
-      <UpdateSession />
-      <DelegateAccount />
-      <InvalidTxn />
-      <SignMessage />
-      <LookupControllers />
-      <ControllerToaster />
+    <main className="h-screen w-screen flex flex-col items-center justify-center gap-4">
+      {status !== "connected" ? (
+        <Button
+          onClick={() => connect({ connector: controllerConnector })}
+          disabled={!isControllerReady}
+        >
+          {isControllerReady ? "Connect" : "Waiting for keychain..."}
+        </Button>
+      ) : (
+        <div className="flex flex-col items-center gap-4">
+          <Button
+            onClick={() => {
+              controllerConnector.controller.openStarterPack(5);
+            }}
+          >
+            Purchase Starterpack
+          </Button>
+          <Button
+            variant="outline"
+            onClick={() => disconnect()}
+            className="mt-4"
+          >
+            Disconnect
+          </Button>
+        </div>
+      )}
     </main>
   );
 };
diff --git a/examples/next/src/components/providers/StarknetProvider.tsx b/examples/next/src/components/providers/StarknetProvider.tsx
index dfb666f5ea..84ca003f49 100644
--- a/examples/next/src/components/providers/StarknetProvider.tsx
+++ b/examples/next/src/components/providers/StarknetProvider.tsx
@@ -204,7 +204,7 @@ export const controllerConnector = new ControllerConnector({
   //
   // However, if you want to use custom RPC URLs, you can still specify them:
   chains: controllerConnectorChains,
-  url: getKeychainUrl(),
+  url: "https://x.cartridge.gg",
   signupOptions,
   // By default, preset policies take precedence over manually provided policies
   // Set shouldOverridePresetPolicies to true if you want your policies to override preset
diff --git a/packages/keychain/src/components/purchasenew/checkout/onchain/wallet-drawer.tsx b/packages/keychain/src/components/purchasenew/checkout/onchain/wallet-drawer.tsx
index f31baf5149..2ad834332b 100644
--- a/packages/keychain/src/components/purchasenew/checkout/onchain/wallet-drawer.tsx
+++ b/packages/keychain/src/components/purchasenew/checkout/onchain/wallet-drawer.tsx
@@ -16,7 +16,6 @@ import {
 import { ExternalWallet } from "@cartridge/controller";
 import { useOnchainPurchaseContext, useStarterpackContext } from "@/context";
 import { useConnection } from "@/hooks/connection";
-import { useFeature } from "@/hooks/features";
 import { networkWalletData } from "../../wallet/config";
 import { Network } from "../../types";
 
@@ -31,7 +30,7 @@ export function WalletSelectionDrawer({
   isOpen,
   onClose,
 }: WalletSelectionDrawerProps) {
-  const isApplePayEnabled = useFeature("apple-pay-support");
+  const isApplePayEnabled = true;
 
   const { isMainnet, externalDetectWallets } = useConnection();
   const { starterpackDetails } = useStarterpackContext();
diff --git a/packages/keychain/src/context/starterpack/onchain-purchase.tsx b/packages/keychain/src/context/starterpack/onchain-purchase.tsx
index 01fa5c4ab0..a9e78375b3 100644
--- a/packages/keychain/src/context/starterpack/onchain-purchase.tsx
+++ b/packages/keychain/src/context/starterpack/onchain-purchase.tsx
@@ -207,7 +207,7 @@ export const OnchainPurchaseProvider = ({
     onError: setDisplayError,
   });
 
-  const [isApplePaySelected, setIsApplePaySelected] = useState(false);
+  const [isApplePaySelected, setIsApplePaySelected] = useState(true);
   const {
     orderId,
     paymentLink,