fix: display correct feed fee when no wallet is connected (#799)

Signed-off-by: Norman Meier <[email protected]>
TERITORI · Dec 5, 2023 · abb5d9f · abb5d9f
1 parent 9232574
commit abb5d9f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/packages/components/music/UploadMusicModal/UploadTrack.tsx b/packages/components/music/UploadMusicModal/UploadTrack.tsx
@@ -46,6 +46,7 @@ export const UploadTrack: React.FC<Props> = ({ onUploadDone }) => {
   const userId = selectedWallet?.userId;
   const [isNotEnoughFundModal, setNotEnoughFundModal] = useState(false);
   const { makePost, canPayForPost, isProcessing } = useFeedPosting(
+    selectedNetwork?.id,
     userId,
     PostCategory.MusicAudio,
     onUploadDone,
@@ -205,6 +206,7 @@ export const UploadTrack: React.FC<Props> = ({ onUploadDone }) => {
       <View style={divideLineStyle} />
 
       <FeedFeeText
+        networkId={selectedNetwork?.id}
         userId={selectedWallet?.userId}
         category={PostCategory.MusicAudio}
         style={{ marginTop: layout.spacing_x2 }}

diff --git a/packages/components/socialFeed/FeedFeeText.tsx b/packages/components/socialFeed/FeedFeeText.tsx
@@ -8,13 +8,14 @@ import { fontSemibold14 } from "../../utils/style/fonts";
 import { BrandText } from "../BrandText";
 
 export const FeedFeeText: React.FC<{
+  networkId: string | undefined;
   userId: string | undefined;
   category: PostCategory;
   style?: StyleProp<ViewStyle>;
-}> = ({ userId, category, style }) => {
+}> = ({ networkId, userId, category, style }) => {
   const theme = useTheme();
   const { canPayForPost, prettyPublishingFee, prettyFeeBalance } =
-    useFeedPosting(userId, category);
+    useFeedPosting(networkId, userId, category);
   const balanceColor = canPayForPost ? theme.textColor : errorColor;
   return (
     <View

diff --git a/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx b/packages/components/socialFeed/NewsFeed/NewsFeedInput.tsx
@@ -163,9 +163,14 @@ export const NewsFeedInput = React.forwardRef<
       isProcessing,
       prettyPublishingFee,
       freePostCount,
-    } = useFeedPosting(userId, getPostCategory(formValues), () => {
-      onPostCreationSuccess();
-    });
+    } = useFeedPosting(
+      selectedNetwork?.id,
+      userId,
+      getPostCategory(formValues),
+      () => {
+        onPostCreationSuccess();
+      },
+    );
     const userIPFSKey = useSelector(selectNFTStorageAPI);
 
     const processSubmit = async () => {

diff --git a/packages/components/video/UploadVideoModal.tsx b/packages/components/video/UploadVideoModal.tsx
@@ -63,6 +63,7 @@ export const UploadVideoModal: FC<{
   const [isNotEnoughFundModal, setNotEnoughFundModal] = useState(false);
 
   const { makePost, canPayForPost, isProcessing } = useFeedPosting(
+    selectedNetwork?.id,
     userId,
     PostCategory.Video,
   );
@@ -315,6 +316,7 @@ export const UploadVideoModal: FC<{
       <View style={divideLineStyle} />
 
       <FeedFeeText
+        networkId={selectedNetwork?.id}
         userId={selectedWallet?.userId}
         category={PostCategory.Video}
         style={{ marginTop: layout.spacing_x2 }}

diff --git a/packages/hooks/feed/useFeedPosting.ts b/packages/hooks/feed/useFeedPosting.ts
@@ -23,12 +23,15 @@ import { useDAOMakeProposal } from "../dao/useDAOMakeProposal";
 import { useBalances } from "../useBalances";
 
 export const useFeedPosting = (
+  networkId: string | undefined,
   userId: string | undefined,
   category: PostCategory,
   onSuccess?: () => void,
 ) => {
   const [network, userAddress] = parseUserId(userId);
-  const networkId = network?.id;
+  if (network) {
+    networkId = network.id;
+  }
 
   const balances = useBalances(networkId, userAddress);
   const { postFee } = useFeedPostFee(networkId, category);

diff --git a/packages/screens/FeedNewArticle/FeedNewArticleScreen.tsx b/packages/screens/FeedNewArticle/FeedNewArticleScreen.tsx
@@ -56,7 +56,7 @@ export const FeedNewArticleScreen: ScreenFC<"FeedNewArticle"> = () => {
   const [loading, setLoading] = useState(false);
   const userIPFSKey = useSelector(selectNFTStorageAPI);
   const { canPayForPost, freePostCount, publishingFee, prettyPublishingFee } =
-    useFeedPosting(userId, PostCategory.Article);
+    useFeedPosting(selectedNetworkId, userId, PostCategory.Article);
 
   const { setToastSuccess, setToastError } = useFeedbacks();
   const navigation = useAppNavigation();

diff --git a/packages/screens/FeedPostView/components/FeedPostVideoView.tsx b/packages/screens/FeedPostView/components/FeedPostVideoView.tsx
@@ -120,6 +120,7 @@ export const FeedPostVideoView: FC<{
   );
 
   const { makePost, canPayForPost, isProcessing } = useFeedPosting(
+    networkId,
     wallet?.userId,
     PostCategory.Comment,
     () => {