pr feedback

Author: Thomas Wang

packages/classic-shared/src/shared.ts

@@ -173,14 +173,7 @@ export type BlocksToWebviewMessage =
       payload: FeedbackResponse;
     }
   | {
-      type: 'PURCHASE_PRODUCT_SUCCESS_RESPONSE';
-      payload: {
-        access: HardcoreAccessStatus;
-      };
-    }
-  | {
-      // relayed broadcast message from PURCHASE_REALTIME_CHANNEL channel
-      type: 'PURCHASE_PRODUCT_SUCCESS_BROADCAST';
+      type: 'HARDCORE_ACCESS_UPDATE';
       payload: {
         access: HardcoreAccessStatus;
       };

packages/classic-webview/src/hooks/useHardcoreAccess.tsx

@@ -12,8 +12,7 @@ const hardcoreAccessContext = createContext<HardcoreAccessContext | null>(null);
 export const HardcoreAccessContextProvider = (props: { children: React.ReactNode }) => {
   const [access, setAccess] = useState<HardcoreAccessStatus>({ status: 'inactive' });
   const hardcoreAccessInitResponse = useDevvitListener('HARDCORE_ACCESS_INIT_RESPONSE');
-  const productPurchaseResponse = useDevvitListener('PURCHASE_PRODUCT_SUCCESS_RESPONSE');
-  const productPurchaseBroadcast = useDevvitListener('PURCHASE_PRODUCT_SUCCESS_BROADCAST');
+  const hardcoreAccessUpdate = useDevvitListener('HARDCORE_ACCESS_UPDATE');
 
   useEffect(() => {
     if (hardcoreAccessInitResponse?.hardcoreAccessStatus != null) {
@@ -24,16 +23,10 @@ export const HardcoreAccessContextProvider = (props: { children: React.ReactNode
   // When a purchase is successful, update 'access' state
   // `unlock hardcore` page and modal should react to this and act accordingly
   useEffect(() => {
-    if (productPurchaseResponse != null) {
-      setAccess(productPurchaseResponse.access);
+    if (hardcoreAccessUpdate != null) {
+      setAccess(hardcoreAccessUpdate.access);
     }
-  }, [productPurchaseResponse, setAccess]);
-
-  useEffect(() => {
-    if (productPurchaseBroadcast != null) {
-      setAccess(productPurchaseBroadcast.access);
-    }
-  }, [productPurchaseBroadcast, setAccess]);
+  }, [hardcoreAccessUpdate, setAccess]);
 
   return (
     <hardcoreAccessContext.Provider value={{ access, setAccess }}>

packages/classic/src/main.tsx

@@ -78,7 +78,7 @@ Devvit.addCustomPostType({
       onMessage(msg: JSONValue) {
         const msgCasted = msg as PurchasedProductBroadcastMessage;
         sendMessageToWebview(context, {
-          type: 'PURCHASE_PRODUCT_SUCCESS_BROADCAST',
+          type: 'HARDCORE_ACCESS_UPDATE',
           payload: msgCasted.payload,
         });
       },
@@ -95,12 +95,12 @@ Devvit.addCustomPostType({
           context.ui.showToast(`Purchase successful!`);
           const access = await paymentsRepo.getHardcoreAccessStatus(context.userId!);
           sendMessageToWebview(context, {
-            type: 'PURCHASE_PRODUCT_SUCCESS_RESPONSE',
+            type: 'HARDCORE_ACCESS_UPDATE',
             payload: {
               access,
             },
           });
-          await purchaseRealtimeChannel.send({
+          void purchaseRealtimeChannel.send({
             payload: {
               access,
             },