fixed review comment

push-protocol · Aug 22, 2024 · c0b898d · c0b898d
1 parent c5f3b0d
commit c0b898d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/modules/sendNotification/SendNotification.utils.tsx b/src/modules/sendNotification/SendNotification.utils.tsx
@@ -16,9 +16,13 @@ export const getChannelChainList = (channelDetails: ChannelDetails, account: str
  return [...aliases, appConfig.coreContractChain];
 };
 
-export const getChannelDelegatesOptions = (delegatees: [ChannelDetails]) => {
- if (delegatees && delegatees.length) {
- return delegatees?.map((channel) => ({
+export const getChannelDelegatesOptions = (
+ delegatees: [ChannelDetails],
+ channelDetails: ChannelDetails | undefined
+) => {
+ const delegateesArray = [...(delegatees || []), ...(channelDetails ? [channelDetails] : [])];
+ if (delegateesArray && delegateesArray.length) {
+ return delegateesArray?.map((channel) => ({
  icon: (
  <Box
  width="24px"
@@ -66,7 +70,6 @@ export const getRecipients = (type: NotificationType, recipient: string) => {
 };
 
 export const getChannelAddress = (channelOption: ChannelDetails, chainId: string, onCoreNetwork: boolean) => {
- console.debug(channelOption);
  if (onCoreNetwork) return convertAddressToAddrCaip(channelOption.channel, parseInt(chainId));
  else {
  const aliasAddress =

diff --git a/src/modules/sendNotification/components/SendNotificationForm.tsx b/src/modules/sendNotification/components/SendNotificationForm.tsx
@@ -41,13 +41,13 @@ const SendNotificationForm: FC<SendNotificationFormProps> = ({ channelDetails })
  /** replace the delegatees with high level sdk function once it is available */
  const { delegatees } = useSelector((state: any) => state.admin);
  const onCoreNetwork = CORE_CHAIN_ID === chainId;
- const delegateesOptions = getChannelDelegatesOptions(
- delegatees?.length ? delegatees : channelDetails ? [channelDetails] : []
- );
+
+ const delegateesOptions = getChannelDelegatesOptions(delegatees, channelDetails);
 
  const selectedChannel =
- delegatees?.find((delegatee: ChannelDetails) => delegatee.channel === formik.values.channelAddress) ||
+ delegatees?.find((delegatee: ChannelDetails) => delegatee.channel === delegateesOptions[0]?.value) ||
  channelDetails;
+
  const aliasChainOptions = getSelectChains(getChannelChainList(selectedChannel, account));
 
  const formik = useFormik<NotficationValue>({