Fixed the Send Notification issue and updated Navigation file

push-protocol · Jul 31, 2024 · e13cd9e · e13cd9e
1 parent 59a670c
commit e13cd9e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/components/channel/NotificationSettings.tsx b/src/components/channel/NotificationSettings.tsx
@@ -28,6 +28,7 @@ import useModalBlur, { MODAL_POSITION } from 'hooks/useModalBlur';
 import { ChannelSetting } from 'helpers/channel/types';
 import { updateChannelSetting } from 'redux/slices/channelSlice';
 import { NotificationSetting } from '@pushprotocol/restapi/src/lib/pushNotification/PushNotificationTypes';
+import { useGetChannelDetails } from 'queries';
 
 // Constants
 const CORE_CHAIN_ID = appConfig.coreContractChain;
@@ -49,6 +50,8 @@ function NotificationSettings() {
   const [isLoadingSettings, setIsLoadingSettings] = useState(true);
   const { handleConnectWalletAndEnableProfile } = useContext(AppContext);
 
+  const { refetch: refetchChannelDetails } = useGetChannelDetails(account);
+
   const { userPushSDKInstance } = useSelector((state: any) => {
     return state.user;
   });
@@ -216,7 +219,7 @@ function NotificationSettings() {
           />
         ),
       });
-
+      refetchChannelDetails();
       // Go back to channel dashboard
       setTimeout(() => goBack(), 2000);
     } catch (err) {

diff --git a/src/modules/sendNotification/components/SendNotificationForm.tsx b/src/modules/sendNotification/components/SendNotificationForm.tsx
@@ -52,9 +52,9 @@ const SendNotificationForm: FC<SendNotificationFormProps> = ({ channelDetails })
       handleSendNotification(values);
     },
   });
-  const selectedChannel = delegatees?.find(
-    (delegatee: ChannelDetails) => delegatee.channel === formik.values.channelAddress
-  );
+  const selectedChannel =
+    delegatees?.find((delegatee: ChannelDetails) => delegatee.channel === formik.values.channelAddress) ||
+    channelDetails;
   const alaisChainOptions = getSelectChains(getChannelChainList(selectedChannel));
 
   const showPreview = formik.values.body || formik.values.title || formik.values.ctaLink || formik.values.mediaUrl;

diff --git a/src/structure/Navigation.tsx b/src/structure/Navigation.tsx
@@ -164,10 +164,11 @@ function Navigation() {
   }, [canSend, channelDetails, navigationSetup, processingState, account]);
 
   useEffect(() => {
+    console.debug(channelDetails, 'channelDetials');
     if (processingState !== 0) {
       dispatch(setCanSend(SEND_NOTIFICATION_STATES.LOADING));
     } else {
-      if (isAliasVerified || (delegatees && delegatees.length > 0)) {
+      if (isAliasVerified || (delegatees && delegatees.length > 0) || channelDetails) {
         dispatch(setCanSend(SEND_NOTIFICATION_STATES.SEND));
       } else {
         dispatch(setCanSend(SEND_NOTIFICATION_STATES.HIDE));