@kiva/kv-shop 1.2.21 → 1.2.23

package/dist/basket.cjs

@@ -22,9 +22,9 @@ __export(basket_exports, {
   createBasket: () => createBasket,
   getBasketID: () => getBasketID,
   getCookieValue: () => getCookieValue,
-  handleInvalidBasketForDonation: () => handleInvalidBasketForDonation,
   hasBasketExpired: () => hasBasketExpired,
-  setBasketID: () => setBasketID
+  setBasketID: () => setBasketID,
+  setCookieValue: () => setCookieValue
 });
 module.exports = __toCommonJS(basket_exports);
 var import_core = require("@apollo/client/core");
@@ -42,9 +42,8 @@ var ShopError = class extends Error {
   }
 };
 function parseShopError(error) {
-  const errorCode = error?.code ?? error?.name ?? "";
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   const errorMessage = typeof error === "string" ? error : error?.message ?? "";
-  const ctxErrorMsg = error?.ctxErrorMsg ?? null;
   if (errorCode === "invalidMethodParameter" && errorMessage.includes("paymentMethod.create")) {
     return new ShopError({
       code: "paymentMethod.create.invalidMethodParameter",
@@ -55,7 +54,7 @@ function parseShopError(error) {
     return new ShopError({
       code: errorCode,
       original: error
-    }, ctxErrorMsg ?? "Something went wrong. Please, refresh the page and try again.");
+    }, "There was a problem with your basket. Please, refresh the page and try again.");
   }
   return new ShopError({
     code: "shop.unknown",
@@ -69,42 +68,39 @@ var getCookieValue = (name) => {
     return decodeURIComponent(document.cookie.match(`(^|;)\\s*${name}\\s*=\\s*([^;]+)`)?.pop() || "");
   }
 };
+var setCookieValue = (name, value, options = "") => {
+  document.cookie = `${name}=${encodeURIComponent(value)};${options}`;
+};
 function getBasketID() {
   return getCookieValue("kvbskt");
 }
-function setBasketID() {
+function setBasketID(basketId) {
+  setCookieValue("kvbskt", basketId, "path=/;secure;");
 }
 async function createBasket(apollo) {
   try {
-    apollo.mutate({
+    return apollo.mutate({
       mutation: import_core.gql`mutation createNewBasketForUser { shop { id createBasket } }`
     }).then(({ data }) => {
       const newBasketId = data.shop?.createBasket ?? null;
       if (newBasketId) {
-        document.cookie = `kvbskt=${newBasketId}; path=/; secure=true;`;
+        setBasketID(newBasketId);
       }
     });
   } catch (error) {
     throw parseShopError(error);
   }
 }
-function hasBasketExpired(errorCode) {
+function hasBasketExpired(error) {
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   return ["shop.invalidBasketId", "shop.basketRequired"].includes(errorCode);
 }
-async function handleInvalidBasketForDonation({ donationAmount, navigateToCheckout = false, apollo }) {
-  if (typeof window !== "undefined" && typeof document !== "undefined") {
-    document.cookie = `kvbskt=; expires=${(/* @__PURE__ */ new Date(0)).toUTCString()}; path=/;`;
-    await createBasket(apollo);
-    document.cookie = `kvatbamt=${JSON.stringify({ donationAmount, navigateToCheckout })}; path=/;`;
-    window.location.reload();
-  }
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createBasket,
   getBasketID,
   getCookieValue,
-  handleInvalidBasketForDonation,
   hasBasketExpired,
-  setBasketID
+  setBasketID,
+  setCookieValue
 });

package/dist/basket.d.ts

@@ -1,12 +1,8 @@
 declare const getCookieValue: (name: string) => string;
+declare const setCookieValue: (name: string, value: string, options?: string) => void;
 declare function getBasketID(): string;
-declare function setBasketID(): void;
-declare function createBasket(apollo: any): Promise<void>;
-declare function hasBasketExpired(errorCode: any): boolean;
-declare function handleInvalidBasketForDonation({ donationAmount, navigateToCheckout, apollo }: {
-    donationAmount: any;
-    navigateToCheckout?: boolean;
-    apollo: any;
-}): Promise<void>;
+declare function setBasketID(basketId: any): void;
+declare function createBasket(apollo: any): Promise<any>;
+declare function hasBasketExpired(error: any): boolean;
 
-export { createBasket, getBasketID, getCookieValue, handleInvalidBasketForDonation, hasBasketExpired, setBasketID };
+export { createBasket, getBasketID, getCookieValue, hasBasketExpired, setBasketID, setCookieValue };

package/dist/basket.js

@@ -2,16 +2,16 @@ import {
   createBasket,
   getBasketID,
   getCookieValue,
-  handleInvalidBasketForDonation,
   hasBasketExpired,
-  setBasketID
-} from "./chunk-V7MS7POQ.js";
-import "./chunk-BHFCSJBE.js";
+  setBasketID,
+  setCookieValue
+} from "./chunk-RZZTEPBR.js";
+import "./chunk-WXX4N673.js";
 export {
   createBasket,
   getBasketID,
   getCookieValue,
-  handleInvalidBasketForDonation,
   hasBasketExpired,
-  setBasketID
+  setBasketID,
+  setCookieValue
 };

package/dist/basketItems.cjs

@@ -51,9 +51,8 @@ var ShopError = class extends Error {
   }
 };
 function parseShopError(error) {
-  const errorCode = error?.code ?? error?.name ?? "";
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   const errorMessage = typeof error === "string" ? error : error?.message ?? "";
-  const ctxErrorMsg = error?.ctxErrorMsg ?? null;
   if (errorCode === "invalidMethodParameter" && errorMessage.includes("paymentMethod.create")) {
     return new ShopError({
       code: "paymentMethod.create.invalidMethodParameter",
@@ -64,7 +63,7 @@ function parseShopError(error) {
     return new ShopError({
       code: errorCode,
       original: error
-    }, ctxErrorMsg ?? "Something went wrong. Please, refresh the page and try again.");
+    }, "There was a problem with your basket. Please, refresh the page and try again.");
   }
   return new ShopError({
     code: "shop.unknown",
@@ -78,90 +77,82 @@ var getCookieValue = (name) => {
     return decodeURIComponent(document.cookie.match(`(^|;)\\s*${name}\\s*=\\s*([^;]+)`)?.pop() || "");
   }
 };
+var setCookieValue = (name, value, options = "") => {
+  document.cookie = `${name}=${encodeURIComponent(value)};${options}`;
+};
 function getBasketID() {
   return getCookieValue("kvbskt");
 }
+function setBasketID(basketId) {
+  setCookieValue("kvbskt", basketId, "path=/;secure;");
+}
 async function createBasket(apollo) {
   try {
-    apollo.mutate({
+    return apollo.mutate({
       mutation: import_core.gql`mutation createNewBasketForUser { shop { id createBasket } }`
     }).then(({ data }) => {
       const newBasketId = data.shop?.createBasket ?? null;
       if (newBasketId) {
-        document.cookie = `kvbskt=${newBasketId}; path=/; secure=true;`;
+        setBasketID(newBasketId);
       }
     });
   } catch (error) {
     throw parseShopError(error);
   }
 }
-function hasBasketExpired(errorCode) {
+function hasBasketExpired(error) {
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   return ["shop.invalidBasketId", "shop.basketRequired"].includes(errorCode);
 }
-async function handleInvalidBasketForDonation({ donationAmount, navigateToCheckout = false, apollo }) {
-  if (typeof window !== "undefined" && typeof document !== "undefined") {
-    document.cookie = `kvbskt=; expires=${(/* @__PURE__ */ new Date(0)).toUTCString()}; path=/;`;
-    await createBasket(apollo);
-    document.cookie = `kvatbamt=${JSON.stringify({ donationAmount, navigateToCheckout })}; path=/;`;
-    window.location.reload();
-  }
-}
 
 // src/basketItems.ts
-async function setTipDonation({ amount, apollo }) {
-  let data;
-  let error;
-  let hasFailedAddToBasket = false;
-  const donationAmount = (0, import_numeral.default)(amount).format("0.00");
+async function callShopMutation(apollo, mutation, variables, maxretries = 2) {
   try {
     const result = await apollo.mutate({
-      mutation: import_core2.gql`mutation setTipDonation($price: Money!, $basketId: String) {
-				shop (basketId: $basketId) {
-					id
-					updateDonation (donation: {
-						price: $price,
-						isTip: true
-					})
-					{
-						id
-						price
-						isTip
-					}
-				}
-			}`,
+      mutation,
       variables: {
-        price: donationAmount,
+        ...variables,
         basketId: getBasketID()
       }
     });
     if (result?.errors?.length) {
-      error = result?.errors?.[0];
-      (result?.errors ?? []).forEach((err) => {
-        if (hasBasketExpired(err?.extensions?.code)) {
-          hasFailedAddToBasket = true;
-          error = {
-            ...err,
-            code: err?.extensions?.code,
-            ctxErrorMsg: "Something went wrong with your donation, refreshing the page to try again"
-          };
+      const basketErrors = result?.errors.filter((err) => hasBasketExpired(err));
+      if (basketErrors.length) {
+        if (maxretries > 0) {
+          await createBasket(apollo);
+          return callShopMutation(apollo, mutation, variables, maxretries - 1);
         }
-      });
-      if (hasFailedAddToBasket) {
-        await handleInvalidBasketForDonation({
-          donationAmount,
-          navigateToCheckout: true,
-          apollo
-        });
+        throw basketErrors[0];
+      }
+      const otherErrors = result?.errors?.filter((err) => !hasBasketExpired(err));
+      if (otherErrors.length) {
+        throw otherErrors[0];
       }
-    } else {
-      data = result?.data;
     }
+    return result?.data;
   } catch (e) {
-    error = e;
-  }
-  if (error) {
-    throw parseShopError(error);
+    if (e instanceof ShopError) {
+      throw e;
+    }
+    throw parseShopError(e);
   }
+}
+async function setTipDonation({ amount, apollo }) {
+  const donationAmount = (0, import_numeral.default)(amount).format("0.00");
+  const data = await callShopMutation(apollo, import_core2.gql`mutation setTipDonation($price: Money!, $basketId: String) {
+		shop (basketId: $basketId) {
+			id
+			updateDonation (donation: {
+				price: $price,
+				isTip: true
+			})
+			{
+				id
+				price
+				isTip
+			}
+		}
+	}`, { price: donationAmount });
   return data?.shop?.updateDonation;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/basketItems.d.ts

@@ -1,8 +1,8 @@
-import { ApolloClient, NormalizedCacheObject } from '@apollo/client/core';
+import { ApolloClient } from '@apollo/client/core';
 
 interface SetTipDonationOptions {
     amount: string | number;
-    apollo: ApolloClient<NormalizedCacheObject>;
+    apollo: ApolloClient<any>;
 }
 declare function setTipDonation({ amount, apollo }: SetTipDonationOptions): Promise<any>;
 

package/dist/basketItems.js

@@ -1,8 +1,8 @@
 import {
   setTipDonation
-} from "./chunk-7KE2LSWP.js";
-import "./chunk-V7MS7POQ.js";
-import "./chunk-BHFCSJBE.js";
+} from "./chunk-6TIZWV2J.js";
+import "./chunk-RZZTEPBR.js";
+import "./chunk-WXX4N673.js";
 export {
   setTipDonation
 };

package/dist/chunk-6TIZWV2J.js

@@ -0,0 +1,66 @@
+import {
+  createBasket,
+  getBasketID,
+  hasBasketExpired
+} from "./chunk-RZZTEPBR.js";
+import {
+  ShopError,
+  parseShopError
+} from "./chunk-WXX4N673.js";
+
+// src/basketItems.ts
+import { gql } from "@apollo/client/core";
+import numeral from "numeral";
+async function callShopMutation(apollo, mutation, variables, maxretries = 2) {
+  try {
+    const result = await apollo.mutate({
+      mutation,
+      variables: {
+        ...variables,
+        basketId: getBasketID()
+      }
+    });
+    if (result?.errors?.length) {
+      const basketErrors = result?.errors.filter((err) => hasBasketExpired(err));
+      if (basketErrors.length) {
+        if (maxretries > 0) {
+          await createBasket(apollo);
+          return callShopMutation(apollo, mutation, variables, maxretries - 1);
+        }
+        throw basketErrors[0];
+      }
+      const otherErrors = result?.errors?.filter((err) => !hasBasketExpired(err));
+      if (otherErrors.length) {
+        throw otherErrors[0];
+      }
+    }
+    return result?.data;
+  } catch (e) {
+    if (e instanceof ShopError) {
+      throw e;
+    }
+    throw parseShopError(e);
+  }
+}
+async function setTipDonation({ amount, apollo }) {
+  const donationAmount = numeral(amount).format("0.00");
+  const data = await callShopMutation(apollo, gql`mutation setTipDonation($price: Money!, $basketId: String) {
+		shop (basketId: $basketId) {
+			id
+			updateDonation (donation: {
+				price: $price,
+				isTip: true
+			})
+			{
+				id
+				price
+				isTip
+			}
+		}
+	}`, { price: donationAmount });
+  return data?.shop?.updateDonation;
+}
+
+export {
+  setTipDonation
+};

package/dist/{chunk-23ED7LBZ.js → chunk-O63WXJQ5.js}

@@ -1,7 +1,7 @@
 import {
   ShopError,
   parseShopError
-} from "./chunk-BHFCSJBE.js";
+} from "./chunk-WXX4N673.js";
 
 // src/subscriptionCheckout.ts
 import { gql } from "@apollo/client/core";

package/dist/{chunk-V7MS7POQ.js → chunk-RZZTEPBR.js}

@@ -1,6 +1,6 @@
 import {
   parseShopError
-} from "./chunk-BHFCSJBE.js";
+} from "./chunk-WXX4N673.js";
 
 // src/basket.ts
 import { gql } from "@apollo/client/core";
@@ -9,42 +9,39 @@ var getCookieValue = (name) => {
     return decodeURIComponent(document.cookie.match(`(^|;)\\s*${name}\\s*=\\s*([^;]+)`)?.pop() || "");
   }
 };
+var setCookieValue = (name, value, options = "") => {
+  document.cookie = `${name}=${encodeURIComponent(value)};${options}`;
+};
 function getBasketID() {
   return getCookieValue("kvbskt");
 }
-function setBasketID() {
+function setBasketID(basketId) {
+  setCookieValue("kvbskt", basketId, "path=/;secure;");
 }
 async function createBasket(apollo) {
   try {
-    apollo.mutate({
+    return apollo.mutate({
       mutation: gql`mutation createNewBasketForUser { shop { id createBasket } }`
     }).then(({ data }) => {
       const newBasketId = data.shop?.createBasket ?? null;
       if (newBasketId) {
-        document.cookie = `kvbskt=${newBasketId}; path=/; secure=true;`;
+        setBasketID(newBasketId);
       }
     });
   } catch (error) {
     throw parseShopError(error);
   }
 }
-function hasBasketExpired(errorCode) {
+function hasBasketExpired(error) {
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   return ["shop.invalidBasketId", "shop.basketRequired"].includes(errorCode);
 }
-async function handleInvalidBasketForDonation({ donationAmount, navigateToCheckout = false, apollo }) {
-  if (typeof window !== "undefined" && typeof document !== "undefined") {
-    document.cookie = `kvbskt=; expires=${(/* @__PURE__ */ new Date(0)).toUTCString()}; path=/;`;
-    await createBasket(apollo);
-    document.cookie = `kvatbamt=${JSON.stringify({ donationAmount, navigateToCheckout })}; path=/;`;
-    window.location.reload();
-  }
-}
 
 export {
   getCookieValue,
+  setCookieValue,
   getBasketID,
   setBasketID,
   createBasket,
-  hasBasketExpired,
-  handleInvalidBasketForDonation
+  hasBasketExpired
 };

package/dist/{chunk-VMLGWF7L.js → chunk-VHRGXVDB.js}

@@ -1,7 +1,7 @@
 import {
   ShopError,
   parseShopError
-} from "./chunk-BHFCSJBE.js";
+} from "./chunk-WXX4N673.js";
 
 // src/useBraintreeDropIn.ts
 import { gql } from "@apollo/client/core";

package/dist/{chunk-BHFCSJBE.js → chunk-WXX4N673.js}

@@ -11,9 +11,8 @@ var ShopError = class extends Error {
   }
 };
 function parseShopError(error) {
-  const errorCode = error?.code ?? error?.name ?? "";
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   const errorMessage = typeof error === "string" ? error : error?.message ?? "";
-  const ctxErrorMsg = error?.ctxErrorMsg ?? null;
   if (errorCode === "invalidMethodParameter" && errorMessage.includes("paymentMethod.create")) {
     return new ShopError({
       code: "paymentMethod.create.invalidMethodParameter",
@@ -24,7 +23,7 @@ function parseShopError(error) {
     return new ShopError({
       code: errorCode,
       original: error
-    }, ctxErrorMsg ?? "Something went wrong. Please, refresh the page and try again.");
+    }, "There was a problem with your basket. Please, refresh the page and try again.");
   }
   return new ShopError({
     code: "shop.unknown",

package/dist/index.cjs

@@ -38,10 +38,10 @@ __export(src_exports, {
   getBasketID: () => getBasketID,
   getClientToken: () => getClientToken,
   getCookieValue: () => getCookieValue,
-  handleInvalidBasketForDonation: () => handleInvalidBasketForDonation,
   hasBasketExpired: () => hasBasketExpired,
   parseShopError: () => parseShopError,
   setBasketID: () => setBasketID,
+  setCookieValue: () => setCookieValue,
   setTipDonation: () => setTipDonation,
   useBraintreeDropIn: () => useBraintreeDropIn,
   waitOnTransaction: () => waitOnTransaction
@@ -64,9 +64,8 @@ var ShopError = class extends Error {
   }
 };
 function parseShopError(error) {
-  const errorCode = error?.code ?? error?.name ?? "";
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   const errorMessage = typeof error === "string" ? error : error?.message ?? "";
-  const ctxErrorMsg = error?.ctxErrorMsg ?? null;
   if (errorCode === "invalidMethodParameter" && errorMessage.includes("paymentMethod.create")) {
     return new ShopError({
       code: "paymentMethod.create.invalidMethodParameter",
@@ -77,7 +76,7 @@ function parseShopError(error) {
     return new ShopError({
       code: errorCode,
       original: error
-    }, ctxErrorMsg ?? "Something went wrong. Please, refresh the page and try again.");
+    }, "There was a problem with your basket. Please, refresh the page and try again.");
   }
   return new ShopError({
     code: "shop.unknown",
@@ -91,94 +90,84 @@ var getCookieValue = (name) => {
     return decodeURIComponent(document.cookie.match(`(^|;)\\s*${name}\\s*=\\s*([^;]+)`)?.pop() || "");
   }
 };
+var setCookieValue = (name, value, options = "") => {
+  document.cookie = `${name}=${encodeURIComponent(value)};${options}`;
+};
 function getBasketID() {
   return getCookieValue("kvbskt");
 }
-function setBasketID() {
+function setBasketID(basketId) {
+  setCookieValue("kvbskt", basketId, "path=/;secure;");
 }
 async function createBasket(apollo) {
   try {
-    apollo.mutate({
+    return apollo.mutate({
       mutation: import_core.gql`mutation createNewBasketForUser { shop { id createBasket } }`
     }).then(({ data }) => {
       const newBasketId = data.shop?.createBasket ?? null;
       if (newBasketId) {
-        document.cookie = `kvbskt=${newBasketId}; path=/; secure=true;`;
+        setBasketID(newBasketId);
       }
     });
   } catch (error) {
     throw parseShopError(error);
   }
 }
-function hasBasketExpired(errorCode) {
+function hasBasketExpired(error) {
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   return ["shop.invalidBasketId", "shop.basketRequired"].includes(errorCode);
 }
-async function handleInvalidBasketForDonation({ donationAmount, navigateToCheckout = false, apollo }) {
-  if (typeof window !== "undefined" && typeof document !== "undefined") {
-    document.cookie = `kvbskt=; expires=${(/* @__PURE__ */ new Date(0)).toUTCString()}; path=/;`;
-    await createBasket(apollo);
-    document.cookie = `kvatbamt=${JSON.stringify({ donationAmount, navigateToCheckout })}; path=/;`;
-    window.location.reload();
-  }
-}
 
 // src/basketItems.ts
 var import_core2 = require("@apollo/client/core");
 var import_numeral = __toESM(require("numeral"), 1);
-async function setTipDonation({ amount, apollo }) {
-  let data;
-  let error;
-  let hasFailedAddToBasket = false;
-  const donationAmount = (0, import_numeral.default)(amount).format("0.00");
+async function callShopMutation(apollo, mutation, variables, maxretries = 2) {
   try {
     const result = await apollo.mutate({
-      mutation: import_core2.gql`mutation setTipDonation($price: Money!, $basketId: String) {
-				shop (basketId: $basketId) {
-					id
-					updateDonation (donation: {
-						price: $price,
-						isTip: true
-					})
-					{
-						id
-						price
-						isTip
-					}
-				}
-			}`,
+      mutation,
       variables: {
-        price: donationAmount,
+        ...variables,
         basketId: getBasketID()
       }
     });
     if (result?.errors?.length) {
-      error = result?.errors?.[0];
-      (result?.errors ?? []).forEach((err) => {
-        if (hasBasketExpired(err?.extensions?.code)) {
-          hasFailedAddToBasket = true;
-          error = {
-            ...err,
-            code: err?.extensions?.code,
-            ctxErrorMsg: "Something went wrong with your donation, refreshing the page to try again"
-          };
+      const basketErrors = result?.errors.filter((err) => hasBasketExpired(err));
+      if (basketErrors.length) {
+        if (maxretries > 0) {
+          await createBasket(apollo);
+          return callShopMutation(apollo, mutation, variables, maxretries - 1);
         }
-      });
-      if (hasFailedAddToBasket) {
-        await handleInvalidBasketForDonation({
-          donationAmount,
-          navigateToCheckout: true,
-          apollo
-        });
+        throw basketErrors[0];
+      }
+      const otherErrors = result?.errors?.filter((err) => !hasBasketExpired(err));
+      if (otherErrors.length) {
+        throw otherErrors[0];
       }
-    } else {
-      data = result?.data;
     }
+    return result?.data;
   } catch (e) {
-    error = e;
-  }
-  if (error) {
-    throw parseShopError(error);
+    if (e instanceof ShopError) {
+      throw e;
+    }
+    throw parseShopError(e);
   }
+}
+async function setTipDonation({ amount, apollo }) {
+  const donationAmount = (0, import_numeral.default)(amount).format("0.00");
+  const data = await callShopMutation(apollo, import_core2.gql`mutation setTipDonation($price: Money!, $basketId: String) {
+		shop (basketId: $basketId) {
+			id
+			updateDonation (donation: {
+				price: $price,
+				isTip: true
+			})
+			{
+				id
+				price
+				isTip
+			}
+		}
+	}`, { price: donationAmount });
   return data?.shop?.updateDonation;
 }
 
@@ -461,10 +450,10 @@ function useBraintreeDropIn() {
   getBasketID,
   getClientToken,
   getCookieValue,
-  handleInvalidBasketForDonation,
   hasBasketExpired,
   parseShopError,
   setBasketID,
+  setCookieValue,
   setTipDonation,
   useBraintreeDropIn,
   waitOnTransaction

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { createBasket, getBasketID, getCookieValue, handleInvalidBasketForDonation, hasBasketExpired, setBasketID } from './basket.js';
+export { createBasket, getBasketID, getCookieValue, hasBasketExpired, setBasketID, setCookieValue } from './basket.js';
 export { SetTipDonationOptions, setTipDonation } from './basketItems.js';
 export { OneTimeCheckoutOptions, WaitOnTransactionOptions, executeOneTimeCheckout, waitOnTransaction } from './oneTimeCheckout.js';
 export { ShopError, ShopErrorOptions, parseShopError } from './shopError.js';

package/dist/index.js

@@ -1,14 +1,14 @@
 import {
   setTipDonation
-} from "./chunk-7KE2LSWP.js";
+} from "./chunk-6TIZWV2J.js";
 import {
   createBasket,
   getBasketID,
   getCookieValue,
-  handleInvalidBasketForDonation,
   hasBasketExpired,
-  setBasketID
-} from "./chunk-V7MS7POQ.js";
+  setBasketID,
+  setCookieValue
+} from "./chunk-RZZTEPBR.js";
 import {
   executeOneTimeCheckout,
   waitOnTransaction
@@ -16,16 +16,16 @@ import {
 import {
   checkSubscriptionStatus,
   executeNewSubscriptionCheckout
-} from "./chunk-23ED7LBZ.js";
+} from "./chunk-O63WXJQ5.js";
 import {
   defaultPaymentTypes,
   getClientToken,
   useBraintreeDropIn
-} from "./chunk-VMLGWF7L.js";
+} from "./chunk-VHRGXVDB.js";
 import {
   ShopError,
   parseShopError
-} from "./chunk-BHFCSJBE.js";
+} from "./chunk-WXX4N673.js";
 export {
   ShopError,
   checkSubscriptionStatus,
@@ -36,10 +36,10 @@ export {
   getBasketID,
   getClientToken,
   getCookieValue,
-  handleInvalidBasketForDonation,
   hasBasketExpired,
   parseShopError,
   setBasketID,
+  setCookieValue,
   setTipDonation,
   useBraintreeDropIn,
   waitOnTransaction

package/dist/shopError.cjs

@@ -35,9 +35,8 @@ var ShopError = class extends Error {
   }
 };
 function parseShopError(error) {
-  const errorCode = error?.code ?? error?.name ?? "";
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   const errorMessage = typeof error === "string" ? error : error?.message ?? "";
-  const ctxErrorMsg = error?.ctxErrorMsg ?? null;
   if (errorCode === "invalidMethodParameter" && errorMessage.includes("paymentMethod.create")) {
     return new ShopError({
       code: "paymentMethod.create.invalidMethodParameter",
@@ -48,7 +47,7 @@ function parseShopError(error) {
     return new ShopError({
       code: errorCode,
       original: error
-    }, ctxErrorMsg ?? "Something went wrong. Please, refresh the page and try again.");
+    }, "There was a problem with your basket. Please, refresh the page and try again.");
   }
   return new ShopError({
     code: "shop.unknown",

package/dist/shopError.js

@@ -1,7 +1,7 @@
 import {
   ShopError,
   parseShopError
-} from "./chunk-BHFCSJBE.js";
+} from "./chunk-WXX4N673.js";
 export {
   ShopError,
   parseShopError

package/dist/subscriptionCheckout.cjs

@@ -38,9 +38,8 @@ var ShopError = class extends Error {
   }
 };
 function parseShopError(error) {
-  const errorCode = error?.code ?? error?.name ?? "";
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   const errorMessage = typeof error === "string" ? error : error?.message ?? "";
-  const ctxErrorMsg = error?.ctxErrorMsg ?? null;
   if (errorCode === "invalidMethodParameter" && errorMessage.includes("paymentMethod.create")) {
     return new ShopError({
       code: "paymentMethod.create.invalidMethodParameter",
@@ -51,7 +50,7 @@ function parseShopError(error) {
     return new ShopError({
       code: errorCode,
       original: error
-    }, ctxErrorMsg ?? "Something went wrong. Please, refresh the page and try again.");
+    }, "There was a problem with your basket. Please, refresh the page and try again.");
   }
   return new ShopError({
     code: "shop.unknown",

package/dist/subscriptionCheckout.js

@@ -1,8 +1,8 @@
 import {
   checkSubscriptionStatus,
   executeNewSubscriptionCheckout
-} from "./chunk-23ED7LBZ.js";
-import "./chunk-BHFCSJBE.js";
+} from "./chunk-O63WXJQ5.js";
+import "./chunk-WXX4N673.js";
 export {
   checkSubscriptionStatus,
   executeNewSubscriptionCheckout

package/dist/useBraintreeDropIn.cjs

@@ -51,9 +51,8 @@ var ShopError = class extends Error {
   }
 };
 function parseShopError(error) {
-  const errorCode = error?.code ?? error?.name ?? "";
+  const errorCode = error?.code ?? error?.extensions?.code ?? error?.name ?? "";
   const errorMessage = typeof error === "string" ? error : error?.message ?? "";
-  const ctxErrorMsg = error?.ctxErrorMsg ?? null;
   if (errorCode === "invalidMethodParameter" && errorMessage.includes("paymentMethod.create")) {
     return new ShopError({
       code: "paymentMethod.create.invalidMethodParameter",
@@ -64,7 +63,7 @@ function parseShopError(error) {
     return new ShopError({
       code: errorCode,
       original: error
-    }, ctxErrorMsg ?? "Something went wrong. Please, refresh the page and try again.");
+    }, "There was a problem with your basket. Please, refresh the page and try again.");
   }
   return new ShopError({
     code: "shop.unknown",

package/dist/useBraintreeDropIn.js

@@ -2,8 +2,8 @@ import {
   defaultPaymentTypes,
   getClientToken,
   useBraintreeDropIn
-} from "./chunk-VMLGWF7L.js";
-import "./chunk-BHFCSJBE.js";
+} from "./chunk-VHRGXVDB.js";
+import "./chunk-WXX4N673.js";
 export {
   useBraintreeDropIn as default,
   defaultPaymentTypes,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kiva/kv-shop",
-    "version": "1.2.21",
+    "version": "1.2.23",
     "type": "module",
     "publishConfig": {
         "access": "public"
@@ -38,7 +38,7 @@
     },
     "dependencies": {
         "@apollo/client": "^3.7.14",
-        "@kiva/kv-components": "^3.40.0",
+        "@kiva/kv-components": "^3.40.1",
         "@types/braintree-web-drop-in": "^1.34.2",
         "braintree-web-drop-in": "^1.37.0",
         "numeral": "^2.0.6",
@@ -53,5 +53,5 @@
             "optional": true
         }
     },
-    "gitHead": "8b34af3a17a7eea46565344414767c930f948bdd"
+    "gitHead": "4ce025324410f92a58a6e235886145d501290f79"
 }

package/dist/chunk-7KE2LSWP.js

@@ -1,72 +0,0 @@
-import {
-  getBasketID,
-  handleInvalidBasketForDonation,
-  hasBasketExpired
-} from "./chunk-V7MS7POQ.js";
-import {
-  parseShopError
-} from "./chunk-BHFCSJBE.js";
-
-// src/basketItems.ts
-import { gql } from "@apollo/client/core";
-import numeral from "numeral";
-async function setTipDonation({ amount, apollo }) {
-  let data;
-  let error;
-  let hasFailedAddToBasket = false;
-  const donationAmount = numeral(amount).format("0.00");
-  try {
-    const result = await apollo.mutate({
-      mutation: gql`mutation setTipDonation($price: Money!, $basketId: String) {
-				shop (basketId: $basketId) {
-					id
-					updateDonation (donation: {
-						price: $price,
-						isTip: true
-					})
-					{
-						id
-						price
-						isTip
-					}
-				}
-			}`,
-      variables: {
-        price: donationAmount,
-        basketId: getBasketID()
-      }
-    });
-    if (result?.errors?.length) {
-      error = result?.errors?.[0];
-      (result?.errors ?? []).forEach((err) => {
-        if (hasBasketExpired(err?.extensions?.code)) {
-          hasFailedAddToBasket = true;
-          error = {
-            ...err,
-            code: err?.extensions?.code,
-            ctxErrorMsg: "Something went wrong with your donation, refreshing the page to try again"
-          };
-        }
-      });
-      if (hasFailedAddToBasket) {
-        await handleInvalidBasketForDonation({
-          donationAmount,
-          navigateToCheckout: true,
-          apollo
-        });
-      }
-    } else {
-      data = result?.data;
-    }
-  } catch (e) {
-    error = e;
-  }
-  if (error) {
-    throw parseShopError(error);
-  }
-  return data?.shop?.updateDonation;
-}
-
-export {
-  setTipDonation
-};