Merge pull request #220 from plebbit/master

Development

.github/workflows/release.yml

@@ -91,6 +91,9 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v2
+        with:
+          # needed to use 'git tag' and get all tags
+          fetch-depth: 0
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
@@ -106,6 +109,10 @@ jobs:
       # build react app
       - run: yarn install --frozen-lockfile
       - run: CI='' yarn build
+      # set android versionCode and versionName
+      - run: sed -i "s/versionCode 1/versionCode $(git tag | wc -l)/" ./android/app/build.gradle
+      - run: sed -i "s/versionName \"1.0\"/versionName \"$(node -e "console.log(require('./package.json').version)")\"/" ./android/app/build.gradle
+      - run: cat ./android/app/build.gradle
       # build apk
       - run: npx cap update
       - run: npx cap copy

src/hooks/useFeedStateString.js

@@ -39,7 +39,7 @@ const useFeedStateString = (subplebbits) => {
     }
 
     if (!subplebbits) {
-      return undefined;
+      return
     }
 
     const states = {}

src/hooks/useStateString.js

@@ -1,6 +1,11 @@
 import { useMemo } from 'react'
 
 const useStateString = (commentOrSubplebbit) => {
+  // dont show state string if the data is already fetched
+  if (commentOrSubplebbit?.updatedAt || commentOrSubplebbit?.state === 'succeeded') {
+    return
+  }
+
   return useMemo(() => {
     if (!commentOrSubplebbit?.clients) {
       return