fix: gno ns + back return to feed

TERITORI · Aug 9, 2023 · 794f182 · 794f182
1 parent 750d97e
commit 794f182
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/components/socialFeed/SocialThread/SocialThreadCard.tsx b/packages/components/socialFeed/SocialThread/SocialThreadCard.tsx
@@ -77,9 +77,7 @@ export const SocialThreadCard: React.FC<{
   const userInfo = useNSUserInfo(wallet?.userId);
   const navigation = useAppNavigation();
   const metadata: SocialFeedMetadata = JSON.parse(localPost.metadata);
-  const username = authorNSInfo?.metadata?.tokenId
-    ? authorNSInfo?.metadata?.tokenId
-    : userAddress;
+  const username = authorNSInfo?.metadata?.tokenId || userAddress;
 
   //TODO: Handle this later
   // const communityHashtag = useMemo(() => {

diff --git a/packages/networks/index.ts b/packages/networks/index.ts
@@ -217,6 +217,8 @@ export const getUserId = (
   const network = getNetwork(networkId);
   if (network?.kind === NetworkKind.Gno && address.startsWith("gno.land/")) {
     address = address.substring("gno.land/".length).replaceAll("/", "-");
+  } else if (address.includes("-")) {
+    address = address.split("-")[1];
   }
   return `${network?.idPrefix}-${address}`;
 };

diff --git a/packages/screens/FeedPostView/FeedPostViewScreen.tsx b/packages/screens/FeedPostView/FeedPostViewScreen.tsx
@@ -73,6 +73,7 @@ export const FeedPostViewScreen: ScreenFC<"FeedPostView"> = ({
   const authorNSInfo = useNSUserInfo(
     getUserId(selectedNetworkId, postResult?.post_by)
   );
+
   const [, userAddress] = parseUserId(postResult?.post_by);
   const feedInputRef = useRef<NewsFeedInputHandle>(null);
   const [replyTo, setReplyTo] = useState<ReplyToType>();
@@ -172,7 +173,8 @@ export const FeedPostViewScreen: ScreenFC<"FeedPostView"> = ({
         <BrandText style={fontSemibold20}>{headerLabel}</BrandText>
       }
       onBackPress={() =>
-        postResult?.parent_post_identifier
+        postResult?.parent_post_identifier &&
+        postResult?.parent_post_identifier !== "0"
           ? navigation.navigate("FeedPostView", {
               id: postResult?.parent_post_identifier || "",
             })