diff --git a/apps/site.ts b/apps/site.ts
index ee0feb75..1414b433 100644
--- a/apps/site.ts
+++ b/apps/site.ts
@@ -1,9 +1,10 @@
 import commerce, { Props as CommerceProps } from "apps/commerce/mod.ts";
-import { color as shopify } from "apps/shopify/mod.ts";
+import { color as wap } from "apps/wap/mod.ts";
 import { color as vnda } from "apps/vnda/mod.ts";
 import { color as vtex } from "apps/vtex/mod.ts";
 import { color as wake } from "apps/wake/mod.ts";
 import { color as linx } from "apps/linx/mod.ts";
+import { color as shopify } from "apps/shopify/mod.ts";
 import { color as nuvemshop } from "apps/nuvemshop/mod.ts";
 import { Section } from "deco/blocks/section.ts";
 import type { App as A, AppContext as AC } from "deco/mod.ts";
@@ -25,6 +26,7 @@ export type Platform =
   | "vnda"
   | "shopify"
   | "wake"
+  | "wap"
   | "linx"
   | "nuvemshop"
   | "custom";
@@ -44,6 +46,8 @@ const color = (platform: string) => {
       return wake;
     case "shopify":
       return shopify;
+    case "wap":
+      return wap;
     case "linx":
       return linx;
     case "nuvemshop":
@@ -66,8 +70,7 @@ export default function Site(
   if (firstRun) {
     firstRun = false;
     console.info(
-      ` 🐁 ${rgb24("Storefront", color("deco"))} | ${
-        rgb24(_platform, color(_platform))
+      ` 🐁 ${rgb24("Storefront", color("deco"))} | ${rgb24(_platform, color(_platform))
       } \n`,
     );
   }
diff --git a/components/header/Buttons/Cart/wap.tsx b/components/header/Buttons/Cart/wap.tsx
new file mode 100644
index 00000000..879c8e12
--- /dev/null
+++ b/components/header/Buttons/Cart/wap.tsx
@@ -0,0 +1,20 @@
+import { itemToAnalyticsItem, useCart } from "apps/wap/hooks/useCart.ts";
+import Button from "./common.tsx";
+
+function CartButton() {
+  const { loading, cart } = useCart();
+  const { subtotal, itens } = cart.value ?? {};
+
+  return (
+    <Button
+      currency="BRL"
+      loading={loading.value}
+      total={subtotal?.valor ?? 0}
+      items={(itens ?? []).map((item, index) =>
+        itemToAnalyticsItem({ ...item! }, index)
+      )}
+    />
+  );
+}
+
+export default CartButton;
diff --git a/components/header/Navbar.tsx b/components/header/Navbar.tsx
index ece8f8da..0eb70885 100644
--- a/components/header/Navbar.tsx
+++ b/components/header/Navbar.tsx
@@ -6,6 +6,7 @@ import CartButtonShopify from "$store/islands/Header/Cart/shopify.tsx";
 import CartButtonVDNA from "$store/islands/Header/Cart/vnda.tsx";
 import CartButtonVTEX from "$store/islands/Header/Cart/vtex.tsx";
 import CartButtonWake from "$store/islands/Header/Cart/wake.tsx";
+import CartButtonWap from "$store/islands/Header/Cart/wap.tsx";
 import CartButtonNuvemshop from "$store/islands/Header/Cart/nuvemshop.tsx";
 import Searchbar from "$store/islands/Header/Searchbar.tsx";
 import { usePlatform } from "$store/sdk/usePlatform.tsx";
@@ -15,6 +16,7 @@ import NavItem from "./NavItem.tsx";
 import { navbarHeight } from "./constants.ts";
 import { Buttons, Logo } from "$store/components/header/Header.tsx";
 
+
 // Make it sure to render it on the server only. DO NOT render it on an island
 function Navbar(
   { items, searchbar, logo, buttons, logoPosition = "left", device }: {
@@ -60,11 +62,13 @@ function Navbar(
           {platform === "linx" && <CartButtonLinx />}
           {platform === "shopify" && <CartButtonShopify />}
           {platform === "nuvemshop" && <CartButtonNuvemshop />}
+          {platform === "wap" && <CartButtonWap />}
         </div>
       </div>
     );
   }
 
+
   // Desktop header
   return (
     <div class="hidden sm:grid sm:grid-cols-3 items-center border-b border-base-200 w-full px-6">
@@ -125,6 +129,7 @@ function Navbar(
               class="flex btn btn-circle btn-sm btn-ghost gap-1"
               aria-label="Wishlist"
             >
+
               <Icon id="Heart" size={24} strokeWidth={0.4} />
             </button>
             WISHLIST
@@ -138,6 +143,7 @@ function Navbar(
             {platform === "linx" && <CartButtonLinx />}
             {platform === "shopify" && <CartButtonShopify />}
             {platform === "nuvemshop" && <CartButtonNuvemshop />}
+            {platform === "wap" && <CartButtonWap />}
           </div>
         )}
       </div>
diff --git a/components/minicart/Cart.tsx b/components/minicart/Cart.tsx
index c3e43078..c58a65d5 100644
--- a/components/minicart/Cart.tsx
+++ b/components/minicart/Cart.tsx
@@ -8,6 +8,7 @@ const CartWake = lazy(() => import("./wake/Cart.tsx"));
 const CartLinx = lazy(() => import("./linx/Cart.tsx"));
 const CartShopify = lazy(() => import("./shopify/Cart.tsx"));
 const CartNuvemshop = lazy(() => import("./nuvemshop/Cart.tsx"));
+const CartWap = lazy(() => import("./wap/Cart.tsx"));
 
 export interface Props {
   platform: ReturnType<typeof usePlatform>;
@@ -26,6 +27,10 @@ function Cart({ platform }: Props) {
     return <CartWake />;
   }
 
+  if (platform === "wap") {
+    return <CartWap />;
+  }
+
   if (platform === "linx") {
     return <CartLinx />;
   }
diff --git a/components/minicart/wap/Cart.tsx b/components/minicart/wap/Cart.tsx
new file mode 100644
index 00000000..9ada588e
--- /dev/null
+++ b/components/minicart/wap/Cart.tsx
@@ -0,0 +1,59 @@
+import { itemToAnalyticsItem, useCart } from "apps/wap/hooks/useCart.ts";
+import BaseCart from "../common/Cart.tsx";
+
+function Cart() {
+  const { cart, loading, updateItem, updateCoupon, removeItem } = useCart();
+  const items = cart.value?.itens ?? [];
+
+  const total = cart.value?.subtotal?.valor ?? 0;
+  const subtotal = cart.value?.subtotal?.valor ?? 0;
+  const locale = "pt-BR";
+  const currency = "BRL";
+  const coupon = cart.value?.coupon ?? undefined;
+
+  return (
+    <BaseCart
+      items={items.map((item) => ({
+        image: { src: item!.imagem!, alt: "product image" },
+        quantity: item!.quantidade!,
+        name: item!.nome!,
+        price: { sale: item!.precos.precoPor!, list: item!.precos.precoDe! },
+      }))}
+      total={total}
+      subtotal={subtotal}
+      discounts={0}
+      locale={locale}
+      currency={currency} 
+      loading={loading.value}
+      freeShippingTarget={1000}
+      coupon={coupon}
+      checkoutHref={`/checkout/carrinho/`}
+      onAddCoupon={(code) => updateCoupon({ hashCupom: code })}
+      onUpdateQuantity={(quantidade: number, index: number) =>
+        quantidade === 0
+          ? removeItem({
+              tipo: "produto",
+              idProduto: items[index]?.hash.idProduto,
+              idAtributoSimples: items[index]?.hash.idAtributoSimples,
+              idUnidadeVenda: items[index]?.hash.idUnidadeVenda,
+              idArmazem: items[index]?.hash.idArmazem,
+            })
+          : updateItem({
+              tipo: "produto",
+              quantidade,
+              idProduto: items[index]?.hash.idProduto,
+              idAtributoSimples: items[index]?.hash.idAtributoSimples,
+              idUnidadeVenda: items[index]?.hash.idUnidadeVenda,
+              idArmazem: items[index]?.hash.idArmazem,
+            })
+      }
+      itemToAnalyticsItem={(index) => {
+        const item = items[index];
+
+        return item && itemToAnalyticsItem(item, index);
+      }}
+    />
+  );
+}
+
+export default Cart;
diff --git a/components/product/AddToCartButton/wap.tsx b/components/product/AddToCartButton/wap.tsx
new file mode 100644
index 00000000..3e7622f8
--- /dev/null
+++ b/components/product/AddToCartButton/wap.tsx
@@ -0,0 +1,33 @@
+import { useCart } from "apps/wap/hooks/useCart.ts";
+import Button, { Props as BtnProps } from "./common.tsx";
+
+export interface Props extends Omit<BtnProps, "onAddItem"> {
+  productID: string;
+  idAtributoSimples: number;
+}
+
+function AddToCartButton({
+  productID,
+  eventParams,
+  idAtributoSimples = 0,
+}: Props) {
+  const { addItems } = useCart();
+
+  const onAddItem = () =>
+    addItems({
+      tipo: "produto",
+      itens: [
+        {
+          idProduto: Number(productID),
+          quantidade: 1,
+          idAtributoSimples,
+          idUnidadeVenda: 0,
+          idArmazem: 0,
+        },
+      ],
+    });
+
+  return <Button onAddItem={onAddItem} eventParams={eventParams} />;
+}
+
+export default AddToCartButton;
diff --git a/components/product/ProductInfo.tsx b/components/product/ProductInfo.tsx
index 9b60f98a..5bec48c2 100644
--- a/components/product/ProductInfo.tsx
+++ b/components/product/ProductInfo.tsx
@@ -5,11 +5,13 @@ import AddToCartButtonShopify from "$store/islands/AddToCartButton/shopify.tsx";
 import AddToCartButtonVNDA from "$store/islands/AddToCartButton/vnda.tsx";
 import AddToCartButtonVTEX from "$store/islands/AddToCartButton/vtex.tsx";
 import AddToCartButtonWake from "$store/islands/AddToCartButton/wake.tsx";
+import AddToCartButtonWap from "$store/islands/AddToCartButton/wap.tsx";
 import AddToCartButtonNuvemshop from "$store/islands/AddToCartButton/nuvemshop.tsx";
 import OutOfStock from "$store/islands/OutOfStock.tsx";
 import ShippingSimulation from "$store/islands/ShippingSimulation.tsx";
 import WishlistButtonVtex from "../../islands/WishlistButton/vtex.tsx";
 import WishlistButtonWake from "../../islands/WishlistButton/wake.tsx";
+import WishlistButtonWap from "../../islands/WishlistButton/wap.tsx";
 import { formatPrice } from "$store/sdk/format.ts";
 import { useId } from "$store/sdk/useId.ts";
 import { useOffer } from "$store/sdk/useOffer.ts";
@@ -69,6 +71,10 @@ function ProductInfo({ page, layout }: Props) {
     listPrice,
   });
 
+  const attributoSimples = product.additionalProperty?.find(
+    (p) => p.valueReference === "ATRIBUTO SIMPLES"
+  );
+
   return (
     <div class="flex flex-col" id={id}>
       <Breadcrumb itemListElement={breadcrumb.itemListElement} />
@@ -107,66 +113,80 @@ function ProductInfo({ page, layout }: Props) {
       </div>
       {/* Add to Cart and Favorites button */}
       <div class="mt-4 sm:mt-10 flex flex-col gap-2">
-        {availability === "https://schema.org/InStock"
-          ? (
-            <>
-              {platform === "vtex" && (
-                <>
-                  <AddToCartButtonVTEX
-                    eventParams={{ items: [eventItem] }}
-                    productID={productID}
-                    seller={seller}
-                  />
-                  <WishlistButtonVtex
-                    variant="full"
-                    productID={productID}
-                    productGroupID={productGroupID}
-                  />
-                </>
-              )}
-              {platform === "wake" && (
-                <>
-                  <AddToCartButtonWake
-                    eventParams={{ items: [eventItem] }}
-                    productID={productID}
-                  />
-                  <WishlistButtonWake
-                    variant="full"
-                    productID={productID}
-                    productGroupID={productGroupID}
-                  />
-                </>
-              )}
-              {platform === "linx" && (
-                <AddToCartButtonLinx
+        {availability === "https://schema.org/InStock" ? (
+          <>
+            {platform === "vtex" && (
+              <>
+                <AddToCartButtonVTEX
                   eventParams={{ items: [eventItem] }}
                   productID={productID}
+                  seller={seller}
+                />
+                <WishlistButtonVtex
+                  variant="full"
+                  productID={productID}
                   productGroupID={productGroupID}
                 />
-              )}
-              {platform === "vnda" && (
-                <AddToCartButtonVNDA
+              </>
+            )}
+            {platform === "wake" && (
+              <>
+                <AddToCartButtonWake
                   eventParams={{ items: [eventItem] }}
                   productID={productID}
-                  additionalProperty={additionalProperty}
                 />
-              )}
-              {platform === "shopify" && (
-                <AddToCartButtonShopify
+                <WishlistButtonWake
+                  variant="full"
+                  productID={productID}
+                  productGroupID={productGroupID}
+                />
+              </>
+            )}
+            {platform === "wap" && (
+              <>
+                <AddToCartButtonWap
                   eventParams={{ items: [eventItem] }}
                   productID={productID}
+                  idAtributoSimples={Number(attributoSimples?.propertyID || 0)}
                 />
-              )}
-              {platform === "nuvemshop" && (
-                <AddToCartButtonNuvemshop
+                <WishlistButtonWap
+                  variant="full"
+                  productID={productID}
                   productGroupID={productGroupID}
-                  eventParams={{ items: [eventItem] }}
-                  additionalProperty={additionalProperty}
                 />
-              )}
-            </>
-          )
-          : <OutOfStock productID={productID} />}
+              </>
+            )}
+            {platform === "linx" && (
+              <AddToCartButtonLinx
+                eventParams={{ items: [eventItem] }}
+                productID={productID}
+                productGroupID={productGroupID}
+              />
+            )}
+            {platform === "vnda" && (
+              <AddToCartButtonVNDA
+                eventParams={{ items: [eventItem] }}
+                productID={productID}
+                additionalProperty={additionalProperty}
+              />
+            )}
+            {platform === "shopify" && (
+              <AddToCartButtonShopify
+                eventParams={{ items: [eventItem] }}
+                productID={productID}
+              />
+            )}
+            {platform === "nuvemshop" && (
+              <AddToCartButtonNuvemshop
+                productGroupID={productGroupID}
+                eventParams={{ items: [eventItem] }}
+                additionalProperty={additionalProperty}
+              />
+            )}
+          </>
+        ) : (
+          <OutOfStock productID={productID} />
+        )}
       </div>
       {/* Shipping Simulation */}
       <div class="mt-8">
diff --git a/components/wishlist/WishlistButton/wap.tsx b/components/wishlist/WishlistButton/wap.tsx
new file mode 100644
index 00000000..97388c24
--- /dev/null
+++ b/components/wishlist/WishlistButton/wap.tsx
@@ -0,0 +1,54 @@
+import { useComputed } from "@preact/signals";
+import Button from "./common.tsx";
+import { useWishlist } from "apps/wap/hooks/useWishlist.ts";
+import { useUser } from "apps/wap/hooks/useUser.ts";
+
+export interface Props {
+  productID: string;
+  productGroupID?: string;
+  variant?: "icon" | "full";
+}
+
+function WishlistButton({
+  variant = "icon",
+  productGroupID,
+  productID,
+}: Props) {
+  const { user } = useUser();
+  const { loading, addItem, removeItem, getItem } = useWishlist();
+
+  const listItem = useComputed(() => getItem(Number(productID)));
+
+  const isUserLoggedIn = Boolean(user.value?.email);
+  const inWishlist = Boolean(listItem.value);
+
+  return (
+    <Button
+      loading={loading.value}
+      inWishlist={inWishlist}
+      isUserLoggedIn={isUserLoggedIn}
+      variant={variant}
+      productGroupID={productGroupID}
+      productID={productID}
+      removeItem={() =>
+        removeItem({
+          idProduto: Number(productID),
+          idAtributoSimples: 0,
+          idUnidadeVenda: 0,
+          parametroAdicional: "",
+        })
+      }
+      addItem={() =>
+        addItem({
+          idProduto: Number(productID),
+          idAtributoSimples: 0,
+          idUnidadeVenda: 0,
+          quantidade: 1,
+          parametroAdicional: "",
+        })
+      }
+    />
+  );
+}
+
+export default WishlistButton;
diff --git a/deno.json b/deno.json
index 0ced174d..77fe2b51 100644
--- a/deno.json
+++ b/deno.json
@@ -14,7 +14,7 @@
     "daisyui": "npm:daisyui@4.6.0"
   },
   "tasks": {
-    "start": "deno task generate-icons && deno task bundle && deno run -A --unstable --env --watch=tailwind.css,sections/,functions/,loaders/,actions/,workflows/,accounts/,.env dev.ts",
+    "start": "deno task generate-icons && deno task bundle && deno run -A --unstable-kv --env --watch=tailwind.css,sections/,functions/,loaders/,actions/,workflows/,accounts/,.env dev.ts",
     "gen": "deno run -A dev.ts --gen-only",
     "play": "USE_LOCAL_STORAGE_ONLY=true deno task start",
     "component": "deno eval 'import \"deco/scripts/component.ts\"'",
@@ -32,19 +32,10 @@
   "githooks": {
     "pre-commit": "check"
   },
-  "exclude": [
-    "node_modules",
-    "static/",
-    "README.md",
-    "_fresh",
-    "**/_fresh/*"
-  ],
+  "exclude": ["node_modules", "static/", "README.md", "_fresh", "**/_fresh/*"],
   "lint": {
     "rules": {
-      "tags": [
-        "fresh",
-        "recommended"
-      ]
+      "tags": ["fresh", "recommended"]
     }
   },
   "nodeModulesDir": true,
diff --git a/fresh.gen.ts b/fresh.gen.ts
index e8cf191e..36a7fe49 100644
--- a/fresh.gen.ts
+++ b/fresh.gen.ts
@@ -9,6 +9,7 @@ import * as $AddToCartButton_shopify from "./islands/AddToCartButton/shopify.tsx
 import * as $AddToCartButton_vnda from "./islands/AddToCartButton/vnda.tsx";
 import * as $AddToCartButton_vtex from "./islands/AddToCartButton/vtex.tsx";
 import * as $AddToCartButton_wake from "./islands/AddToCartButton/wake.tsx";
+import * as $AddToCartButton_wap from "./islands/AddToCartButton/wap.tsx";
 import * as $Header_Buttons from "./islands/Header/Buttons.tsx";
 import * as $Header_Cart_linx from "./islands/Header/Cart/linx.tsx";
 import * as $Header_Cart_nuvemshop from "./islands/Header/Cart/nuvemshop.tsx";
@@ -16,6 +17,7 @@ import * as $Header_Cart_shopify from "./islands/Header/Cart/shopify.tsx";
 import * as $Header_Cart_vnda from "./islands/Header/Cart/vnda.tsx";
 import * as $Header_Cart_vtex from "./islands/Header/Cart/vtex.tsx";
 import * as $Header_Cart_wake from "./islands/Header/Cart/wake.tsx";
+import * as $Header_Cart_wap from "./islands/Header/Cart/wap.tsx";
 import * as $Header_Drawers from "./islands/Header/Drawers.tsx";
 import * as $Header_Searchbar from "./islands/Header/Searchbar.tsx";
 import * as $Newsletter from "./islands/Newsletter.tsx";
@@ -27,6 +29,7 @@ import * as $ShowMore from "./islands/ShowMore.tsx";
 import * as $SliderJS from "./islands/SliderJS.tsx";
 import * as $WishlistButton_vtex from "./islands/WishlistButton/vtex.tsx";
 import * as $WishlistButton_wake from "./islands/WishlistButton/wake.tsx";
+import * as $WishlistButton_wap from "./islands/WishlistButton/wap.tsx";
 import { type Manifest } from "$fresh/server.ts";
 
 const manifest = {
@@ -40,6 +43,7 @@ const manifest = {
     "./islands/AddToCartButton/vnda.tsx": $AddToCartButton_vnda,
     "./islands/AddToCartButton/vtex.tsx": $AddToCartButton_vtex,
     "./islands/AddToCartButton/wake.tsx": $AddToCartButton_wake,
+    "./islands/AddToCartButton/wap.tsx": $AddToCartButton_wap,
     "./islands/Header/Buttons.tsx": $Header_Buttons,
     "./islands/Header/Cart/linx.tsx": $Header_Cart_linx,
     "./islands/Header/Cart/nuvemshop.tsx": $Header_Cart_nuvemshop,
@@ -47,6 +51,7 @@ const manifest = {
     "./islands/Header/Cart/vnda.tsx": $Header_Cart_vnda,
     "./islands/Header/Cart/vtex.tsx": $Header_Cart_vtex,
     "./islands/Header/Cart/wake.tsx": $Header_Cart_wake,
+    "./islands/Header/Cart/wap.tsx": $Header_Cart_wap,
     "./islands/Header/Drawers.tsx": $Header_Drawers,
     "./islands/Header/Searchbar.tsx": $Header_Searchbar,
     "./islands/Newsletter.tsx": $Newsletter,
@@ -58,6 +63,7 @@ const manifest = {
     "./islands/SliderJS.tsx": $SliderJS,
     "./islands/WishlistButton/vtex.tsx": $WishlistButton_vtex,
     "./islands/WishlistButton/wake.tsx": $WishlistButton_wake,
+    "./islands/WishlistButton/wap.tsx": $WishlistButton_wap,
   },
   baseUrl: import.meta.url,
 } satisfies Manifest;
diff --git a/islands/AddToCartButton/wap.tsx b/islands/AddToCartButton/wap.tsx
new file mode 100644
index 00000000..e8970de7
--- /dev/null
+++ b/islands/AddToCartButton/wap.tsx
@@ -0,0 +1,8 @@
+import Component from "$store/components/product/AddToCartButton/wap.tsx";
+import type { Props } from "$store/components/product/AddToCartButton/wap.tsx";
+
+function Island(props: Props) {
+  return <Component {...props} />;
+}
+
+export default Island;
diff --git a/islands/Header/Cart/wap.tsx b/islands/Header/Cart/wap.tsx
new file mode 100644
index 00000000..260eafd9
--- /dev/null
+++ b/islands/Header/Cart/wap.tsx
@@ -0,0 +1,7 @@
+import Component from "$store/components/header/Buttons/Cart/wap.tsx";
+
+function Island() {
+  return <Component />;
+}
+
+export default Island;
diff --git a/islands/WishlistButton/wap.tsx b/islands/WishlistButton/wap.tsx
new file mode 100644
index 00000000..152d07c6
--- /dev/null
+++ b/islands/WishlistButton/wap.tsx
@@ -0,0 +1,8 @@
+import Component from "../../components/wishlist/WishlistButton/wap.tsx";
+import type { Props } from "../../components/wishlist/WishlistButton/wap.tsx";
+
+function Island(props: Props) {
+  return <Component {...props} />;
+}
+
+export default Island;
diff --git a/manifest.gen.ts b/manifest.gen.ts
index e82b0919..7958d84b 100644
--- a/manifest.gen.ts
+++ b/manifest.gen.ts
@@ -126,8 +126,8 @@ const manifest = {
     "deco-sites/storefront/sections/Theme/Theme.tsx": $$$$$$51,
   },
   "apps": {
-    "deco-sites/storefront/apps/decohub.ts": $$$$$$$$$$$0,
-    "deco-sites/storefront/apps/site.ts": $$$$$$$$$$$1,
+    "deco-sites/storefront/apps/decohub.ts": $$$$$$$$$$$1,
+    "deco-sites/storefront/apps/site.ts": $$$$$$$$$$$0,
   },
   "name": "deco-sites/storefront",
   "baseUrl": import.meta.url,