small data fetching

apps/backend-serverless/src/services/business-logic/process-transaction.service.ts

@@ -42,7 +42,7 @@ export const processTransaction = async (
 
     // TODO: If we're gonna time out, we should requeue this
     while (rpcTransaction == null) {
-        await delay(1000);
+        await delay(500);
         rpcTransaction = await fetchTransaction(signature);
     }
 

apps/backend-serverless/src/utilities/clients/create-customer-response.ts

@@ -6,7 +6,6 @@ import { MerchantService } from '../../services/database/merchant-service.databa
 import { fetchBalance } from '../../services/helius.service.js';
 import { getConnection } from '../connection.utility.js';
 import { ProductDetail, createProductsNftResponse } from './create-products-response.utility.js';
-
 export interface CustomerResponse {
     amountSpent: number;
     tier: Tier | null;
@@ -125,10 +124,14 @@ export const createCustomerResponse = async (
     let customerOwns =
         currentTier && currentTier.mint ? await customerOwnsTier(customerWallet, currentTier.mint) : false;
 
-    // console.log('tier status', currentTier, nextPossibleTier, isFirstTier, customerOwns);
-    let customerNfts = (await createProductsNftResponse(merchant)).customerView[customerWallet];
+    let customerNfts: ProductDetail[] = [];
+
+    try {
+        customerNfts = (await createProductsNftResponse(merchant)).customerView[customerWallet];
+    } catch (err) {
+        console.log('error getting customer nfts', err);
+    }
 
-    // console.log('customer nfts', customerNfts);
     return {
         amountSpent: customer.amountSpent,
         tier: currentTier,

apps/backend-serverless/src/utilities/clients/token-authenticate.utility.ts

@@ -45,7 +45,7 @@ export const withAuth = (cookies: string[] | undefined): MerchantAuthToken => {
             throw new UnauthorizedRequestError('Token has expired');
         }
     } else {
-        if (useAuthMock !== null && useAuthMock !== undefined) {
+        if (useAuthMock) {
             const payload = {
                 id: useAuthMock,
                 iat: Math.floor(Date.now() / 1000),

apps/payment-ui/src/components/PayToLabel/index.tsx

@@ -27,25 +27,24 @@ export const PayToLabel = () => {
     const [cart, setCart] = useState<number>(0);
     const [isLoading, setIsLoading] = useState(true);
 
-    const calculateDiscount = (cart: number, discountRate: number) => (discountRate * cart) / 100;
-
     useEffect(() => {
-        if (paymentDetails !== null) {
-            let cart = Number(paymentDetails.usdcSize);
-            setCart(cart);
-            setIsLoading(false);
-        }
-    }, [paymentDetails]);
+        if (paymentDetails) {
+            let cartValue = Number(paymentDetails.usdcSize);
 
-    useEffect(() => {
-        if (customerTier !== null && cart > 0) {
-            setDiscount(calculateDiscount(cart, customerTier.discount));
+            setCart(cartValue);
+            if (customerTier && cartValue > 0) {
+                setDiscount((cartValue * customerTier.discount) / 100);
+            }
+            setIsLoading(false);
         }
-    }, [customerTier, cart]);
+    }, [paymentDetails, customerTier]);
 
     function calculateFinalAmount(): number {
-        if (!loyaltyDetails || !customer || !paymentDetails || !customerTier) {
-            return 0;
+        if (!paymentDetails) {
+            return -1;
+        }
+        if (!loyaltyDetails || !customer || !customerTier) {
+            return paymentDetails.usdcSize;
         }
 
         if (loyaltyDetails?.loyaltyProgram === 'tiers' && customer.customerOwns) {
@@ -73,7 +72,7 @@ export const PayToLabel = () => {
                     <div className="divider" />
                 </div>
                 <CartAmountLoading />
-                <DiscountAmountLoading />
+                {showTierDiscount && <DiscountAmountLoading />}
                 <FeePriceDisplayLoading />
             </div>
         );