Fix delivery method glitch-reset

dgopsq · Sep 8, 2023 · 2233dce · 2233dce
1 parent 0b094de
commit 2233dce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/checkout/CheckoutDeliveryMethods.tsx b/src/components/checkout/CheckoutDeliveryMethods.tsx
@@ -22,7 +22,7 @@ export const CheckoutDeliveryMethod: React.FC<Props> = ({
   const deliveryMethodsRender = useMemo(
     () =>
       deliveryMethods.map((deliveryMethod) => {
-        const isSameAddr = deliveryMethod.id === value?.id;
+        const isSameMethod = deliveryMethod.id === value?.id;
 
         const handleClick = () => {
           if (!isLoading) onChange?.(deliveryMethod);
@@ -35,7 +35,7 @@ export const CheckoutDeliveryMethod: React.FC<Props> = ({
               type="button"
               className="w-full h-full"
             >
-              <RadioIsland isSelected={isSameAddr}>
+              <RadioIsland isSelected={isSameMethod}>
                 <SingleDeliveryMethod deliveryMethod={deliveryMethod} />
               </RadioIsland>
             </button>

diff --git a/src/misc/hooks/useCheckoutInfo.ts b/src/misc/hooks/useCheckoutInfo.ts
@@ -78,6 +78,7 @@ export function useCheckoutInfo(): UseCheckoutInfoReturn {
   // FIXME: This could be buggy or prone to create errors.
   useEffect(() => {
     if (!complete) return;
+    if (data.deliveryMethod) return;
 
     const parsedMethods = data.shippingMethods.map((method) => {
       return getFragmentData(GenericShippingMethodFragmentDoc, method);