@doswiftly/cli 0.2.6 → 1.0.1

package/templates/storefront-nextjs-shadcn/app/[locale]/checkout/page.tsx

@@ -7,15 +7,15 @@ import { useCartStore } from "@/stores/cart-store";
 import { useCartSync } from "@/hooks/use-cart-sync";
 import {
   useCheckoutCreate,
-  useCheckoutEmailUpdate,
-  useCheckoutShippingAddressUpdate,
-  useCheckoutBillingAddressUpdate,
-  useCheckoutShippingLineUpdate,
-  useCheckoutDiscountCodeApply,
-  useCheckoutDiscountCodeRemove,
-  useCheckoutGiftCardApply,
-  useCheckoutGiftCardRemove,
-  useCheckoutGiftCardRecipientUpdate,
+  useCheckoutUpdateEmail,
+  useCheckoutUpdateShippingAddress,
+  useCheckoutUpdateBillingAddress,
+  useCheckoutSelectShippingRate,
+  useCheckoutApplyDiscountCode,
+  useCheckoutRemoveDiscountCode,
+  useCheckoutApplyGiftCard,
+  useCheckoutRemoveGiftCard,
+  useCheckoutUpdateGiftCardRecipient,
   useCheckoutComplete,
   useCheckout,
 } from "@/lib/graphql/hooks";
@@ -81,11 +81,11 @@ interface ShippingRate {
 interface AddressForm {
   firstName: string;
   lastName: string;
-  address1: string;
-  address2: string;
+  streetLine1: string;
+  streetLine2: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone: string;
   company: string;
@@ -109,11 +109,11 @@ interface CheckoutFormState {
 const emptyAddress: AddressForm = {
   firstName: "",
   lastName: "",
-  address1: "",
-  address2: "",
+  streetLine1: "",
+  streetLine2: "",
   city: "",
-  province: "",
-  zip: "",
+  state: "",
+  postalCode: "",
   country: "PL",
   phone: "",
   company: "",
@@ -179,12 +179,12 @@ function AddressFormFields({ prefix, values, onChange, errors }: AddressFormFiel
       </div>
 
       <div>
-        <Label htmlFor={`${prefix}_address1`}>{t("address.address1")} *</Label>
+        <Label htmlFor={`${prefix}_address1`}>{t("address.streetLine1")} *</Label>
         <Input
           id={`${prefix}_address1`}
-          placeholder={t("address.address1Placeholder")}
-          value={values.address1}
-          onChange={(e) => onChange("address1", e.target.value)}
+          placeholder={t("address.streetLine1Placeholder")}
+          value={values.streetLine1}
+          onChange={(e) => onChange("streetLine1", e.target.value)}
           className={errors[`${prefix}_address1`] ? "border-destructive" : ""}
         />
         {errors[`${prefix}_address1`] && (
@@ -193,22 +193,22 @@ function AddressFormFields({ prefix, values, onChange, errors }: AddressFormFiel
       </div>
 
       <div>
-        <Label htmlFor={`${prefix}_address2`}>{t("address.address2")} ({tc("optional")})</Label>
+        <Label htmlFor={`${prefix}_address2`}>{t("address.streetLine2")} ({tc("optional")})</Label>
         <Input
           id={`${prefix}_address2`}
-          value={values.address2}
-          onChange={(e) => onChange("address2", e.target.value)}
+          value={values.streetLine2}
+          onChange={(e) => onChange("streetLine2", e.target.value)}
         />
       </div>
 
       <div className="grid gap-4 sm:grid-cols-2">
         <div>
-          <Label htmlFor={`${prefix}_zip`}>{t("address.zip")} *</Label>
+          <Label htmlFor={`${prefix}_zip`}>{t("address.postalCode")} *</Label>
           <Input
             id={`${prefix}_zip`}
-            placeholder={t("address.zipPlaceholder")}
-            value={values.zip}
-            onChange={(e) => onChange("zip", e.target.value)}
+            placeholder={t("address.postalCodePlaceholder")}
+            value={values.postalCode}
+            onChange={(e) => onChange("postalCode", e.target.value)}
             className={errors[`${prefix}_zip`] ? "border-destructive" : ""}
           />
           {errors[`${prefix}_zip`] && (
@@ -249,11 +249,11 @@ function AddressFormFields({ prefix, values, onChange, errors }: AddressFormFiel
           )}
         </div>
         <div>
-          <Label htmlFor={`${prefix}_province`}>{t("address.province")} ({tc("optional")})</Label>
+          <Label htmlFor={`${prefix}_province`}>{t("address.state")} ({tc("optional")})</Label>
           <Input
             id={`${prefix}_province`}
-            value={values.province}
-            onChange={(e) => onChange("province", e.target.value)}
+            value={values.state}
+            onChange={(e) => onChange("state", e.target.value)}
           />
         </div>
       </div>
@@ -290,11 +290,11 @@ export default function CheckoutPage() {
   const addressSchema = z.object({
     firstName: z.string().min(1, t("validation.firstNameRequired")),
     lastName: z.string().min(1, t("validation.lastNameRequired")),
-    address1: z.string().min(1, t("validation.addressRequired")),
-    address2: z.string().optional(),
+    streetLine1: z.string().min(1, t("validation.addressRequired")),
+    streetLine2: z.string().optional(),
     city: z.string().min(1, t("validation.cityRequired")),
-    province: z.string().optional(),
-    zip: z.string().min(1, t("validation.zipRequired")),
+    state: z.string().optional(),
+    postalCode: z.string().min(1, t("validation.zipRequired")),
     country: z.string().min(2, t("validation.countryRequired")),
     phone: z.string().optional(),
     company: z.string().optional(),
@@ -340,15 +340,15 @@ export default function CheckoutPage() {
 
   // Mutations
   const createCheckout = useCheckoutCreate();
-  const updateEmail = useCheckoutEmailUpdate();
-  const updateShippingAddress = useCheckoutShippingAddressUpdate();
-  const updateBillingAddress = useCheckoutBillingAddressUpdate();
-  const updateShippingLine = useCheckoutShippingLineUpdate();
-  const applyDiscount = useCheckoutDiscountCodeApply();
-  const removeDiscount = useCheckoutDiscountCodeRemove();
-  const applyGiftCard = useCheckoutGiftCardApply();
-  const removeGiftCard = useCheckoutGiftCardRemove();
-  const updateGiftCardRecipient = useCheckoutGiftCardRecipientUpdate();
+  const updateEmail = useCheckoutUpdateEmail();
+  const updateShippingAddress = useCheckoutUpdateShippingAddress();
+  const updateBillingAddress = useCheckoutUpdateBillingAddress();
+  const updateShippingLine = useCheckoutSelectShippingRate();
+  const applyDiscount = useCheckoutApplyDiscountCode();
+  const removeDiscount = useCheckoutRemoveDiscountCode();
+  const applyGiftCard = useCheckoutApplyGiftCard();
+  const removeGiftCard = useCheckoutRemoveGiftCard();
+  const updateGiftCardRecipient = useCheckoutUpdateGiftCardRecipient();
   const completeCheckout = useCheckoutComplete();
   const queryClient = useQueryClient();
 
@@ -359,7 +359,7 @@ export default function CheckoutPage() {
   // Sync discount codes from checkout (transferred from cart) to form state
   useEffect(() => {
     if ((checkout?.discountCodes?.length ?? 0) > 0 && !formState.appliedDiscountCode) {
-      const applicableCode = checkout?.discountCodes?.find((dc) => dc.applicable);
+      const applicableCode = checkout?.discountCodes?.find((dc) => dc.isApplicable);
       if (applicableCode) {
         setFormState((prev) => ({
           ...prev,
@@ -439,8 +439,8 @@ export default function CheckoutPage() {
           email: formState.email,
         });
 
-        if (emailResult.checkoutEmailUpdate.userErrors?.length > 0) {
-          toast.error(emailResult.checkoutEmailUpdate.userErrors[0].message);
+        if (emailResult.checkoutUpdateEmail.userErrors?.length > 0) {
+          toast.error(emailResult.checkoutUpdateEmail.userErrors[0].message);
           return;
         }
       }
@@ -530,8 +530,8 @@ export default function CheckoutPage() {
         },
       });
 
-      if (addressResult.checkoutShippingAddressUpdate.userErrors?.length > 0) {
-        toast.error(addressResult.checkoutShippingAddressUpdate.userErrors[0].message);
+      if (addressResult.checkoutUpdateShippingAddress.userErrors?.length > 0) {
+        toast.error(addressResult.checkoutUpdateShippingAddress.userErrors[0].message);
         return;
       }
 
@@ -548,8 +548,8 @@ export default function CheckoutPage() {
         },
       });
 
-      if (billingResult.checkoutBillingAddressUpdate.userErrors?.length > 0) {
-        toast.error(billingResult.checkoutBillingAddressUpdate.userErrors[0].message);
+      if (billingResult.checkoutUpdateBillingAddress.userErrors?.length > 0) {
+        toast.error(billingResult.checkoutUpdateBillingAddress.userErrors[0].message);
         return;
       }
 
@@ -584,8 +584,8 @@ export default function CheckoutPage() {
         shippingRateHandle: formState.selectedShippingRate,
       });
 
-      if (shippingResult.checkoutShippingLineUpdate.userErrors?.length > 0) {
-        toast.error(shippingResult.checkoutShippingLineUpdate.userErrors[0].message);
+      if (shippingResult.checkoutSelectShippingRate.userErrors?.length > 0) {
+        toast.error(shippingResult.checkoutSelectShippingRate.userErrors[0].message);
         return;
       }
 
@@ -673,7 +673,7 @@ export default function CheckoutPage() {
         discountCode: formState.discountCode.trim(),
       });
 
-      const payload = result.checkoutDiscountCodeApply;
+      const payload = result.checkoutApplyDiscountCode;
 
       if (payload?.userErrors?.length > 0) {
         toast.error(payload.userErrors[0].message);
@@ -709,8 +709,8 @@ export default function CheckoutPage() {
         discountCode: formState.appliedDiscountCode,
       });
 
-      if (result.checkoutDiscountCodeRemove.userErrors?.length > 0) {
-        toast.error(result.checkoutDiscountCodeRemove.userErrors[0].message);
+      if (result.checkoutRemoveDiscountCode.userErrors?.length > 0) {
+        toast.error(result.checkoutRemoveDiscountCode.userErrors[0].message);
         return;
       }
 
@@ -746,8 +746,8 @@ export default function CheckoutPage() {
         giftCardCode: formState.giftCardCode.trim().toUpperCase(),
       });
 
-      if (result.checkoutGiftCardApply.userErrors?.length > 0) {
-        const error = result.checkoutGiftCardApply.userErrors[0];
+      if (result.checkoutApplyGiftCard.userErrors?.length > 0) {
+        const error = result.checkoutApplyGiftCard.userErrors[0];
         // Translate common error codes to user-friendly messages
         const errorMessages: Record<string, string> = {
           GIFT_CARD_NOT_FOUND: t("errors.giftCardNotFound"),
@@ -783,8 +783,8 @@ export default function CheckoutPage() {
         giftCardCode,
       });
 
-      if (result.checkoutGiftCardRemove.userErrors?.length > 0) {
-        toast.error(result.checkoutGiftCardRemove.userErrors[0].message);
+      if (result.checkoutRemoveGiftCard.userErrors?.length > 0) {
+        toast.error(result.checkoutRemoveGiftCard.userErrors[0].message);
         return;
       }
 
@@ -1409,15 +1409,15 @@ export default function CheckoutPage() {
                         <p className="text-sm text-muted-foreground">
                           {checkout.shippingAddress.firstName} {checkout.shippingAddress.lastName}
                           <br />
-                          {checkout.shippingAddress.address1}
-                          {checkout.shippingAddress.address2 && (
+                          {checkout.shippingAddress.streetLine1}
+                          {checkout.shippingAddress.streetLine2 && (
                             <>
                               <br />
-                              {checkout.shippingAddress.address2}
+                              {checkout.shippingAddress.streetLine2}
                             </>
                           )}
                           <br />
-                          {checkout.shippingAddress.zip} {checkout.shippingAddress.city}
+                          {checkout.shippingAddress.postalCode} {checkout.shippingAddress.city}
                           <br />
                           {countries.find((c) => c.code === checkout.shippingAddress?.country)?.name ||
                             checkout.shippingAddress.country}
@@ -1574,7 +1574,7 @@ export default function CheckoutPage() {
                           )}
                         </div>
                         <p className="font-medium">
-                          {formatPrice(item.totalPrice.amount)}
+                          {formatPrice(item.total.amount)}
                         </p>
                       </div>
                     ))
@@ -1740,7 +1740,7 @@ export default function CheckoutPage() {
                   <span className="text-muted-foreground">{tCart("products")}</span>
                   <span>
                     {formatPrice(
-                      checkout?.subtotalPrice?.amount ||
+                      checkout?.cost?.subtotal?.amount ||
                         items.reduce(
                           (sum, item) => sum + parseFloat(item.price.amount) * item.quantity,
                           0
@@ -1753,7 +1753,7 @@ export default function CheckoutPage() {
                 {checkout?.shippingLine ? (
                   <div className="flex justify-between text-sm">
                     <span className="text-muted-foreground">{tCart("shipping")}</span>
-                    <span>{formatPrice(checkout.totalShippingPrice?.amount || "0")}</span>
+                    <span>{formatPrice(checkout?.cost?.totalShipping?.amount || "0")}</span>
                   </div>
                 ) : (
                   <div className="flex justify-between text-sm">
@@ -1763,18 +1763,18 @@ export default function CheckoutPage() {
                 )}
 
                 {/* Discount */}
-                {checkout?.totalDiscounts && parseFloat(checkout.totalDiscounts.amount) > 0 && (
+                {checkout?.totalDiscounts && parseFloat(checkout?.cost?.totalDiscounts.amount) > 0 && (
                   <div className="flex justify-between text-sm text-green-600">
                     <span>{tCart("discount")}</span>
-                    <span>-{formatPrice(checkout.totalDiscounts.amount)}</span>
+                    <span>-{formatPrice(checkout?.cost?.totalDiscounts.amount)}</span>
                   </div>
                 )}
 
                 {/* Tax */}
-                {checkout?.totalTax && parseFloat(checkout.totalTax.amount) > 0 && (
+                {checkout?.totalTax && parseFloat(checkout?.cost?.totalTax.amount) > 0 && (
                   <div className="flex justify-between text-sm">
                     <span className="text-muted-foreground">{tCart("tax")}</span>
-                    <span>{formatPrice(checkout.totalTax.amount)}</span>
+                    <span>{formatPrice(checkout?.cost?.totalTax.amount)}</span>
                   </div>
                 )}
 
@@ -1791,7 +1791,7 @@ export default function CheckoutPage() {
                   <span>{tCart("total")}</span>
                   <span>
                     {formatPrice(
-                      checkout?.totalPrice?.amount ||
+                      checkout?.cost?.total?.amount ||
                         items.reduce(
                           (sum, item) => sum + parseFloat(item.price.amount) * item.quantity,
                           0
@@ -1802,8 +1802,8 @@ export default function CheckoutPage() {
 
                 {/* Payment Due (if different from total due to gift cards) */}
                 {checkout?.paymentDue &&
-                  checkout?.totalPrice &&
-                  parseFloat(checkout.paymentDue.amount) !== parseFloat(checkout.totalPrice.amount) && (
+                  checkout?.cost?.total &&
+                  parseFloat(checkout.paymentDue.amount) !== parseFloat(checkout.cost.total.amount) && (
                     <div className="flex justify-between border-t pt-2 text-lg font-bold text-primary">
                       <span>{tCart("paymentDue")}</span>
                       <span>{formatPrice(checkout.paymentDue.amount)}</span>

package/templates/storefront-nextjs-shadcn/app/[locale]/products/[slug]/product-client.tsx

@@ -129,7 +129,7 @@ export function ProductClient({ product: initialProduct, similarProducts = [] }:
     [showConfigValidation],
   );
 
-  // Live surcharge preview — doliczane do ceny wariantu na przycisku (jak Shopify Dynamic Checkout).
+  // Live surcharge preview — doliczane do ceny wariantu na przycisku (industry-standard dynamic checkout).
   const surcharge = useMemo(
     () => computeConfiguratorSurcharge(configuratorAttributes, configuratorSelections),
     [configuratorAttributes, configuratorSelections],

package/templates/storefront-nextjs-shadcn/app/[locale]/products/products-client.tsx

@@ -15,7 +15,7 @@ import {
 import { FilterMobileSheet } from "@/components/product/filter-mobile-sheet";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Pagination } from "@/components/ui/pagination";
-import { useProducts, useAvailableFilters } from "@/lib/graphql/hooks";
+import { useProducts, useProductFilters } from "@/lib/graphql/hooks";
 import type {
   ProductFilterInput,
   AttributeFilterInput,
@@ -102,7 +102,7 @@ export function ProductsClient() {
   const {
     data: filtersData,
     isLoading: isFiltersLoading,
-  } = useAvailableFilters(
+  } = useProductFilters(
     {
       categoryId,
       collectionId,
@@ -114,7 +114,7 @@ export function ProductsClient() {
   const products = data?.products ?? [];
   const totalCount = data?.totalCount ?? 0;
   const totalPages = Math.ceil(totalCount / limit);
-  const availableFilters = filtersData?.availableFilters;
+  const availableFilters = filtersData?.productFilters;
 
   // Show dimming when transition or fetch is in progress (but data exists)
   const showDimming = (isPending || isProductsFetching) && products.length > 0;
@@ -368,7 +368,7 @@ export function ProductsClient() {
           <FilterMobileSheet
             {...filterProps}
             activeFilterCount={activeFilterCount}
-            totalProducts={availableFilters?.totalProducts}
+            totalProducts={availableFilters?.matchCount}
           />
           <p className="text-sm text-muted-foreground">
             {totalCount > 0

package/templates/storefront-nextjs-shadcn/app/api/auth/whoami/route.ts

@@ -0,0 +1,6 @@
+import { createWhoamiHandler } from '@doswiftly/storefront-sdk';
+
+export const GET = createWhoamiHandler({
+  apiUrl: process.env.NEXT_PUBLIC_API_URL,
+  shopSlug: process.env.NEXT_PUBLIC_SHOP_SLUG,
+});

package/templates/storefront-nextjs-shadcn/components/account/address-form.tsx

@@ -11,11 +11,11 @@ export interface AddressFormData {
   firstName: string;
   lastName: string;
   company?: string;
-  address1: string;
-  address2?: string;
+  streetLine1: string;
+  streetLine2?: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone?: string;
   isDefault?: boolean;
@@ -48,11 +48,11 @@ export function AddressForm({
       firstName: "",
       lastName: "",
       company: "",
-      address1: "",
-      address2: "",
+      streetLine1: "",
+      streetLine2: "",
       city: "",
-      province: "",
-      zip: "",
+      state: "",
+      postalCode: "",
       country: "Poland",
       phone: "",
       isDefault: false,
@@ -78,17 +78,17 @@ export function AddressForm({
     if (!formData.lastName.trim()) {
       newErrors.lastName = t("validation.lastNameRequired");
     }
-    if (!formData.address1.trim()) {
-      newErrors.address1 = t("validation.addressRequired");
+    if (!formData.streetLine1.trim()) {
+      newErrors.streetLine1 = t("validation.addressRequired");
     }
     if (!formData.city.trim()) {
       newErrors.city = t("validation.cityRequired");
     }
-    if (!formData.province.trim()) {
-      newErrors.province = t("validation.provinceRequired");
+    if (!formData.state.trim()) {
+      newErrors.state = t("validation.provinceRequired");
     }
-    if (!formData.zip.trim()) {
-      newErrors.zip = t("validation.zipRequired");
+    if (!formData.postalCode.trim()) {
+      newErrors.postalCode = t("validation.zipRequired");
     }
     if (!formData.country.trim()) {
       newErrors.country = t("validation.countryRequired");
@@ -175,37 +175,37 @@ export function AddressForm({
         {/* Address 1 */}
         <div>
           <label
-            htmlFor="address1"
+            htmlFor="streetLine1"
             className="block text-sm font-medium text-foreground mb-1"
           >
-            {t("address.address1")} *
+            {t("address.streetLine1")} *
           </label>
           <Input
-            id="address1"
+            id="streetLine1"
             type="text"
-            value={formData.address1}
-            onChange={(e) => handleChange("address1", e.target.value)}
+            value={formData.streetLine1}
+            onChange={(e) => handleChange("streetLine1", e.target.value)}
             disabled={isLoading}
-            className={errors.address1 ? "border-red-500" : ""}
+            className={errors.streetLine1 ? "border-red-500" : ""}
           />
-          {errors.address1 && (
-            <p className="mt-1 text-sm text-red-600">{errors.address1}</p>
+          {errors.streetLine1 && (
+            <p className="mt-1 text-sm text-red-600">{errors.streetLine1}</p>
           )}
         </div>
 
         {/* Address 2 */}
         <div>
           <label
-            htmlFor="address2"
+            htmlFor="streetLine2"
             className="block text-sm font-medium text-foreground mb-1"
           >
-            {`${t("address.address2")} (${tc("optional")})`}
+            {`${t("address.streetLine2")} (${tc("optional")})`}
           </label>
           <Input
-            id="address2"
+            id="streetLine2"
             type="text"
-            value={formData.address2 || ""}
-            onChange={(e) => handleChange("address2", e.target.value)}
+            value={formData.streetLine2 || ""}
+            onChange={(e) => handleChange("streetLine2", e.target.value)}
             disabled={isLoading}
           />
         </div>
@@ -235,42 +235,42 @@ export function AddressForm({
           {/* Province */}
           <div>
             <label
-              htmlFor="province"
+              htmlFor="state"
               className="block text-sm font-medium text-foreground mb-1"
             >
-              {t("address.province")} *
+              {t("address.state")} *
             </label>
             <Input
-              id="province"
+              id="state"
               type="text"
-              value={formData.province}
-              onChange={(e) => handleChange("province", e.target.value)}
+              value={formData.state}
+              onChange={(e) => handleChange("state", e.target.value)}
               disabled={isLoading}
-              className={errors.province ? "border-red-500" : ""}
+              className={errors.state ? "border-red-500" : ""}
             />
-            {errors.province && (
-              <p className="mt-1 text-sm text-red-600">{errors.province}</p>
+            {errors.state && (
+              <p className="mt-1 text-sm text-red-600">{errors.state}</p>
             )}
           </div>
 
           {/* Postal Code */}
           <div>
             <label
-              htmlFor="zip"
+              htmlFor="postalCode"
               className="block text-sm font-medium text-foreground mb-1"
             >
-              {t("address.zip")} *
+              {t("address.postalCode")} *
             </label>
             <Input
-              id="zip"
+              id="postalCode"
               type="text"
-              value={formData.zip}
-              onChange={(e) => handleChange("zip", e.target.value)}
+              value={formData.postalCode}
+              onChange={(e) => handleChange("postalCode", e.target.value)}
               disabled={isLoading}
-              className={errors.zip ? "border-red-500" : ""}
+              className={errors.postalCode ? "border-red-500" : ""}
             />
-            {errors.zip && (
-              <p className="mt-1 text-sm text-red-600">{errors.zip}</p>
+            {errors.postalCode && (
+              <p className="mt-1 text-sm text-red-600">{errors.postalCode}</p>
             )}
           </div>
         </div>

package/templates/storefront-nextjs-shadcn/components/account/address-list.tsx

@@ -11,11 +11,11 @@ export interface Address {
   firstName: string;
   lastName: string;
   company?: string;
-  address1: string;
-  address2?: string;
+  streetLine1: string;
+  streetLine2?: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone?: string;
   isDefault: boolean;
@@ -45,7 +45,7 @@ export function AddressList({
 
   const handleDelete = (id: string, address: Address) => {
     if (
-      confirm(t("deleteAddressConfirm", { address: address.address1 }))
+      confirm(t("deleteAddressConfirm", { address: address.streetLine1 }))
     ) {
       onDelete?.(id);
     }
@@ -114,12 +114,12 @@ export function AddressList({
               {address.company && (
                 <p className="text-muted-foreground">{address.company}</p>
               )}
-              <p className="text-muted-foreground">{address.address1}</p>
-              {address.address2 && (
-                <p className="text-muted-foreground">{address.address2}</p>
+              <p className="text-muted-foreground">{address.streetLine1}</p>
+              {address.streetLine2 && (
+                <p className="text-muted-foreground">{address.streetLine2}</p>
               )}
               <p className="text-muted-foreground">
-                {address.city}, {address.province} {address.zip}
+                {address.city}, {address.state} {address.postalCode}
               </p>
               <p className="text-muted-foreground">{address.country}</p>
               {address.phone && (

package/templates/storefront-nextjs-shadcn/components/account/customer-info.fragment.graphql

@@ -14,7 +14,7 @@ fragment CustomerInfoFields on Customer {
   lastName
   displayName
   phone
-  emailVerified
+  isEmailVerified
   ordersCount
   totalSpent {
     amount
@@ -24,11 +24,11 @@ fragment CustomerInfoFields on Customer {
     id
     firstName
     lastName
-    address1
-    address2
+    streetLine1
+    streetLine2
     city
-    province
-    zip
+    state
+    postalCode
     country
     phone
   }

package/templates/storefront-nextjs-shadcn/components/account/order-details.tsx

@@ -20,11 +20,11 @@ export interface OrderAddress {
   firstName: string;
   lastName: string;
   company?: string;
-  address1: string;
-  address2?: string;
+  streetLine1: string;
+  streetLine2?: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone?: string;
 }
@@ -111,12 +111,12 @@ export function OrderDetails({ order, className }: OrderDetailsProps) {
         {address.company && (
           <p className="text-muted-foreground">{address.company}</p>
         )}
-        <p className="text-muted-foreground">{address.address1}</p>
-        {address.address2 && (
-          <p className="text-muted-foreground">{address.address2}</p>
+        <p className="text-muted-foreground">{address.streetLine1}</p>
+        {address.streetLine2 && (
+          <p className="text-muted-foreground">{address.streetLine2}</p>
         )}
         <p className="text-muted-foreground">
-          {address.city}, {address.province} {address.zip}
+          {address.city}, {address.state} {address.postalCode}
         </p>
         <p className="text-muted-foreground">{address.country}</p>
         {address.phone && (