shopflo-appbrew 0.1.1 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopflo-appbrew",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
   "exports": {

package/src/blocks/shopflo-web-view.tsx

@@ -24,7 +24,6 @@ import { useIsFocused } from '@react-navigation/native'
 import {
   isShopifyCartUrl,
   lastSegment,
-  toCartSignature,
   toShopfloCartUrl,
 } from '../utils/shopflo'
 import { toUpiAppUrl } from '../utils/payment-intents'
@@ -49,9 +48,6 @@ export function ShopfloWebview(props: ShopfloWebviewProps) {
     { checkoutUrl: string; tokenId: string; loadId: number } | undefined
   >()
   const isFocused = useIsFocused()
-  const cartSignature = useAppStore((s) => toCartSignature(s.cart.data.lineItems))
-  // Signature of the cart Shopflo currently shows; null until the first load
-  const loadedSignature = React.useRef<string | null>(null)
   // Id of the newest token request; an older one resolving later is dropped
   const latestRequest = React.useRef(0)
   const block = useBlock(props.screenId, props.componentId, props.instanceId)
@@ -123,15 +119,12 @@ export function ShopfloWebview(props: ShopfloWebviewProps) {
     }
 
     // Get the URL from the provider
-    loadedSignature.current = toCartSignature(
-      useAppStore.getState().cart.data.lineItems
-    )
     const request = ++latestRequest.current
     const result =
       page === 'checkout'
         ? await checkoutProvider.fetchCheckoutUrl()
         : await checkoutProvider.fetchCartUrl()
-    // The cart changed while this was in flight; the newer request decides
+    // A newer visit started another request while this was in flight
     if (request !== latestRequest.current) return
     if (!result?.checkoutUrl || !result?.tokenId) {
       console.error('Failed to get checkout URL')
@@ -160,16 +153,20 @@ export function ShopfloWebview(props: ShopfloWebviewProps) {
     capturedCheckout.current = false
   }, [page, settings, gotoLink, setOverrideBack, onUnavailable])
 
-  // On every visit, reload only if the app's cart changed since Shopflo got it.
+  // Kept in a ref so only a new visit, not a re-created callback, reloads
+  const initializeRef = React.useRef(initializeWebView)
+  initializeRef.current = initializeWebView
+
+  // Every visit mints a fresh token from the app's cart; edits made inside
+  // Shopflo while it is open are only synced to the app cart, never reloaded.
   // An empty cart (after purchase) keeps the thank-you page up
   React.useEffect(() => {
-    if (!isFocused || !cartSignature) return
-    if (cartSignature === loadedSignature.current) return
-    initializeWebView()
-  }, [isFocused, cartSignature, initializeWebView])
+    if (!isFocused) return
+    if (!useAppStore.getState().cart.data.lineItems.length) return
+    initializeRef.current()
+  }, [isFocused])
 
-  // Shopflo already shows edits made inside it; record them as loaded so they
-  // don't trigger a reload of the cart the user is looking at
+  // Shopflo already shows edits made inside it; only the app cart needs them
   const syncFromShopflo = React.useCallback(
     async (apply: () => Promise<unknown>) => {
       try {
@@ -177,9 +174,6 @@ export function ShopfloWebview(props: ShopfloWebviewProps) {
       } catch (error) {
         console.warn('Syncing Shopflo cart change failed:', error)
       }
-      loadedSignature.current = toCartSignature(
-        useAppStore.getState().cart.data.lineItems
-      )
     },
     []
   )
@@ -271,14 +265,6 @@ export function ShopfloWebview(props: ShopfloWebviewProps) {
           // The cart view's close (X) posts CLOSE_CART_IFRAME, not FLO_EXIT_CHECKOUT
           case 'CLOSE_CART_IFRAME':
           case 'FLO_EXIT_CHECKOUT':
-            // On the cart screen Shopflo moved to checkout inside this WebView
-            // (is_cart_redirect); put it back on the cart so the next visit
-            // to the cart screen opens there
-            if (type === 'FLO_EXIT_CHECKOUT' && page === 'cart') {
-              setCheckoutData(
-                (prev) => prev && { ...prev, loadId: prev.loadId + 1 }
-              )
-            }
             if (settings?.source?.closeModalId) {
               openModal(settings.source.closeModalId)
             } else {
@@ -292,7 +278,7 @@ export function ShopfloWebview(props: ShopfloWebviewProps) {
         console.error('Error parsing message from WebView:', error)
       }
     },
-    [page, settings, back, openModal, syncFromShopflo]
+    [settings, back, openModal, syncFromShopflo]
   )
 
   if (!checkoutData) return null

package/src/utils/shopflo.ts

@@ -27,12 +27,6 @@ export const isShopifyCartUrl = (url: string, domain: string) =>
     .replace(/^https?:\/\//, '')
     .replace(/\/$/, '') === `${domain}/cart`
 
-// What Shopflo was last given; a different value means the token call must
-// run again so Shopflo's cart matches the app's
-export const toCartSignature = (
-  lineItems: Array<{ variantId: string; quantity: number }>
-) => lineItems.map((li) => `${li.variantId}:${li.quantity}`).join(',')
-
 // The token's checkout_url already opens Shopflo's cart view (page=cart);
 // is_cart_redirect=true makes its Checkout button move to checkout inside the
 // same WebView. String-based: RN's URL lacks full searchParams