@pradip1995/segment-jewelry-checkout-form 0.1.6 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pradip1995/segment-jewelry-checkout-form",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "license": "MIT",
   "publishConfig": {
     "access": "public"

package/src/address-fields.tsx

@@ -108,8 +108,7 @@ function pickPreferredFromList(
     addresses.find((a) => a.is_default_billing) ||
     addresses.find(
       (a) => a.metadata?.is_default === true || a.metadata?.is_default === "true"
-    ) ||
-    addresses[0]
+    )
   )
 }
 
@@ -156,34 +155,69 @@ function buildInitialValues(
   const matched = findMatchingSavedAddress(cart, addresses)
   const preferred = pickPreferredAddress(customer)
   const shipping = cart?.shipping_address
+  const fallbackCountry =
+    preferred?.country_code ||
+    matched?.country_code ||
+    shipping?.country_code ||
+    cart?.region?.countries?.[0]?.iso_2 ||
+    "in"
+
+  if (preferred) {
+    return addressToFormValues(preferred, {
+      email,
+      phone: customer?.phone,
+      countryCode: fallbackCountry,
+    })
+  }
 
-  if (addresses.length) {
-    const source = preferred || matched
-    if (source) {
-      return addressToFormValues(source, {
-        email,
-        phone: customer?.phone,
-        countryCode: source.country_code || cart?.region?.countries?.[0]?.iso_2 || "in",
-      })
+  if (matched) {
+    return addressToFormValues(matched, {
+      email,
+      phone: customer?.phone,
+      countryCode: fallbackCountry,
+    })
+  }
+
+  if (shipping?.address_1 || shipping?.postal_code) {
+    const fullName = shipping?.first_name
+      ? `${shipping.first_name} ${shipping.last_name === "." ? "" : shipping.last_name || ""}`.trim()
+      : ""
+
+    return {
+      fullName,
+      firstName: shipping?.first_name || "",
+      lastName: shipping?.last_name || "",
+      email,
+      phone: toFormPhoneValue(shipping?.phone || customer?.phone),
+      address1: shipping?.address_1 || "",
+      address2: shipping?.address_2 || "",
+      postalCode: shipping?.postal_code || "",
+      city: shipping?.city || "",
+      province: shipping?.province || "",
+      countryCode: fallbackCountry,
     }
   }
 
-  const fullName = shipping?.first_name
-    ? `${shipping.first_name} ${shipping.last_name === "." ? "" : shipping.last_name || ""}`.trim()
-    : ""
+  if (addresses[0]) {
+    return addressToFormValues(addresses[0], {
+      email,
+      phone: customer?.phone,
+      countryCode: fallbackCountry,
+    })
+  }
 
   return {
-    fullName,
-    firstName: shipping?.first_name || "",
-    lastName: shipping?.last_name || "",
+    fullName: "",
+    firstName: "",
+    lastName: "",
     email,
-    phone: toFormPhoneValue(shipping?.phone || customer?.phone),
-    address1: shipping?.address_1 || "",
-    address2: shipping?.address_2 || "",
-    postalCode: shipping?.postal_code || "",
-    city: shipping?.city || "",
-    province: shipping?.province || "",
-    countryCode: shipping?.country_code || cart?.region?.countries?.[0]?.iso_2 || "in",
+    phone: toFormPhoneValue(customer?.phone),
+    address1: "",
+    address2: "",
+    postalCode: "",
+    city: "",
+    province: "",
+    countryCode: fallbackCountry,
   }
 }
 
@@ -200,7 +234,12 @@ function resolveInitialSelectedId(
   const matched = findMatchingSavedAddress(cart, addresses)
   if (matched?.id) return matched.id
 
-  return NEW_ADDRESS_ID
+  // Cart already has an address (e.g. reorder from a past order) — don't force another saved one.
+  if (cart?.shipping_address?.address_1 || cart?.shipping_address?.postal_code) {
+    return NEW_ADDRESS_ID
+  }
+
+  return addresses[0]?.id || NEW_ADDRESS_ID
 }
 
 function formatAddressParts(address: {