Merge branch 'main' of https://github.com/reservoirprotocol/marketpla…

…ce-v2 into dev
reservoirprotocol · Oct 26, 2023 · e2e462b · e2e462b
2 parents f6040e6 + e93e757
commit e2e462b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/sync-env-branches.yml b/.github/workflows/sync-env-branches.yml
@@ -15,13 +15,19 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Github Actions"
+          git fetch --unshallow
       - name: Sync testnet with main
         run: |
-          git fetch --unshallow
           git checkout testnets
           git pull
           git merge --no-ff main -m "Auto-merge main into testnet"
           git push
+      - name: Sync default with main
+        run: |
+          git checkout default
+          git pull
+          git merge --no-ff main -m "Auto-merge main into default"
+          git push
       - name: Report Status
         uses: ravsamhq/notify-slack-action@v1
         if: always()

diff --git a/pages/[chain]/collection/[contract].tsx b/pages/[chain]/collection/[contract].tsx
@@ -131,13 +131,16 @@ const CollectionPage: NextPage<Props> = ({ id, ssr }) => {
     (stage) => stage.kind === 'public'
   )
 
-  const mintPrice = mintData?.price?.amount?.decimal
-    ? mintData?.price?.amount?.decimal === 0
-      ? 'Free'
-      : `${
-          mintData?.price?.amount?.decimal
-        } ${mintData?.price?.currency?.symbol?.toUpperCase()}`
-    : undefined
+  const mintPrice =
+    typeof mintData?.price?.amount?.decimal === 'number' &&
+    mintData?.price?.amount?.decimal !== null &&
+    mintData?.price?.amount?.decimal !== undefined
+      ? mintData?.price?.amount?.decimal === 0
+        ? 'Free'
+        : `${
+            mintData?.price?.amount?.decimal
+          } ${mintData?.price?.currency?.symbol?.toUpperCase()}`
+      : undefined
 
   let tokenQuery: Parameters<typeof useDynamicTokens>['0'] = {
     limit: 20,