fixes after merge

ts/features/pn/components/LegacyMessageDetails.tsx

@@ -18,7 +18,6 @@ import { pnFrontendUrlSelector } from "../../../store/reducers/backendStatus";
 import { UIAttachment, UIMessageId } from "../../messages/types";
 import { clipboardSetStringWithFeedback } from "../../../utils/clipboard";
 import { LegacyMessageAttachments } from "../../messages/components/LegacyMessageAttachments";
-import NavigationService from "../../../navigation/NavigationService";
 import PN_ROUTES from "../navigation/routes";
 import { PNMessage } from "../store/types/types";
 import { NotificationPaymentInfo } from "../../../../definitions/pn/NotificationPaymentInfo";
@@ -33,6 +32,8 @@ import {
 import { LevelEnum } from "../../../../definitions/content/SectionStatus";
 import { ATTACHMENT_CATEGORY } from "../../messages/types/attachmentCategory";
 import { maxVisiblePaymentCountGenerator } from "../utils";
+import { MESSAGES_ROUTES } from "../../messages/navigation/routes";
+import { useIONavigation } from "../../../navigation/params/AppParamsList";
 import { LegacyMessageDetailsContent } from "./LegacyMessageDetailsContent";
 import { MessageDetailsHeader } from "./MessageDetailsHeader";
 import { MessageDetailsSection } from "./MessageDetailsSection";
@@ -59,6 +60,7 @@ export const LegacyMessageDetails = ({
   const viewRef = createRef<View>();
   const presentPaymentsBottomSheetRef = useRef<() => void>();
   const frontendUrl = useIOSelector(pnFrontendUrlSelector);
+  const navigation = useIONavigation();
 
   const partitionedAttachments = pipe(
     message.attachments,
@@ -78,13 +80,19 @@ export const LegacyMessageDetails = ({
   const openAttachment = useCallback(
     (attachment: UIAttachment) => {
       trackPNAttachmentOpening(attachment.category);
-      NavigationService.navigate(PN_ROUTES.MESSAGE_ATTACHMENT, {
-        messageId,
-        attachmentId: attachment.id,
-        category: attachment.category
+      navigation.navigate(MESSAGES_ROUTES.MESSAGES_NAVIGATOR, {
+        screen: PN_ROUTES.MAIN,
+        params: {
+          screen: PN_ROUTES.MESSAGE_ATTACHMENT,
+          params: {
+            messageId,
+            attachmentId: attachment.id,
+            category: attachment.category
+          }
+        }
       });
     },
-    [messageId]
+    [messageId, navigation]
   );
 
   const maxVisiblePaymentCount = maxVisiblePaymentCountGenerator();

ts/features/walletV3/payment/screens/WalletPaymentOutcomeScreen.tsx

@@ -75,7 +75,8 @@ const WalletPaymentOutcomeScreen = () => {
 
   const handleClose = () => {
     if (paymentStartRoute) {
-      navigation.navigate(paymentStartRoute.routeName, {
+      // TODO: this is a workaround to solve type errors need to investigate deeply
+      navigation.navigate(paymentStartRoute.routeName as any, {
         screen: paymentStartRoute.routeKey
       });
       return;

ts/features/walletV3/payment/store/reducers/index.ts

@@ -50,7 +50,7 @@ export type WalletPaymentState = {
   authorizationUrl: pot.Pot<string, NetworkError>;
   startRoute?: {
     routeName: keyof AppParamsList;
-    routeKey: keyof NavigatorScreenParams<AppParamsList>["screen"];
+    routeKey: NavigatorScreenParams<AppParamsList>["screen"];
   };
 };
 

ts/screens/profile/DeveloperModeSection.tsx

@@ -47,7 +47,6 @@ import {
 import { clipboardSetStringWithFeedback } from "../../utils/clipboard";
 import { getDeviceId } from "../../utils/device";
 import { isDevEnv } from "../../utils/environment";
-import { useIODispatch, useIOSelector } from "../../store/hooks";
 import { useIONavigation } from "../../navigation/params/AppParamsList";
 
 import DSEnableSwitch from "./components/DSEnableSwitch";