Merge branch 'DeFiCh:main' into main

Author: Teo

cypress/fixture/homepage.config.ts

@@ -76,7 +76,7 @@ export const communityLinks = [
   },
   {
     headerId: "discord",
-    href: "https://discord.com/invite/py55egyaGy",
+    href: "https://discord.gg/5ncBGuj7",
   },
   {
     headerId: "coinmarketcap",

src/layouts/components/Community.tsx

@@ -56,7 +56,7 @@ export function Community() {
             testID: "community-youtube",
           },
           {
-            href: "https://discord.com/invite/py55egyaGy",
+            href: "https://discord.gg/5ncBGuj7",
             title: entries[1].labels[4].title,
             testID: "community-discord",
           },

src/layouts/components/SocialsRow.tsx

@@ -5,7 +5,7 @@ import {
   AiFillYoutube,
   AiOutlineTwitter,
 } from "react-icons/ai";
-import { FaTelegramPlane } from "react-icons/fa";
+import { FaDiscord, FaTelegramPlane } from "react-icons/fa";
 
 interface SocialsRowProps {
   language: string;
@@ -16,6 +16,24 @@ export default function SocialsRow(props: SocialsRowProps): JSX.Element {
   const { language, customStyle } = props;
   return (
     <div className={classNames(customStyle)}>
+      <a
+        href={`https://t.me/defiblockchain${language}`}
+        target="_blank"
+        rel="noreferrer"
+        data-testid="socials-row-telegram"
+        id="Telegram"
+      >
+        <FaTelegramPlane className="hover-icons" size={24} />
+      </a>
+      <a
+        href="https://discord.gg/5ncBGuj7"
+        target="_blank"
+        rel="noreferrer"
+        data-testid="socials-row-discord"
+        id="Discord"
+      >
+        <FaDiscord className="hover-icons" size={24} />
+      </a>
       <a
         href="https://github.com/DeFiCh/ain"
         target="_blank"
@@ -43,15 +61,6 @@ export default function SocialsRow(props: SocialsRowProps): JSX.Element {
       >
         <AiFillYoutube className="hover-icons" size={24} />
       </a>
-      <a
-        href={`https://t.me/defiblockchain${language}`}
-        target="_blank"
-        rel="noreferrer"
-        data-testid="socials-row-telegram"
-        id="Telegram"
-      >
-        <FaTelegramPlane className="hover-icons" size={24} />
-      </a>
       <a
         href="https://x.com/defichain"
         target="_blank"

src/pages/explore/wallets/_components/ForDailyUseSection.tsx

@@ -54,9 +54,7 @@ export function ForDailyUseSection() {
               text={IconType.APPSTORE}
             />
             <CardLink
-              // Temporarily link until the app is available on Google Play
-              // url="https://play.google.com/store/apps/details?id=com.defichain.app"
-              url="https://www.reddit.com/r/defiblockchain/comments/1n1figg/update_on_the_missing_light_wallet_in_the_google/"
+              url="https://play.google.com/store/apps/details?id=com.defichaincommunity.app"
               descText="Get It On"
               text={IconType.GOOGLE_PLAY}
             />

src/pages/index.page.tsx

@@ -36,23 +36,12 @@ export default function HomePage({
 }
 
 export async function getStaticProps() {
-  try {
-    const posts = await getBlogspotPosts();
-    const props = { blogPosts: posts.slice(0, 8) };
+  const posts = await getBlogspotPosts().catch(() => []);
+  const props = { blogPosts: posts.slice(0, 8) };
 
-    // On Netlify we serve fully static to avoid ISR function crashes
-    if (process.env.NETLIFY) {
-      return { props };
-    }
-
-    return { props, revalidate: 3600 };
-  } catch {
-    const props = { blogPosts: [] };
-
-    if (process.env.NETLIFY) {
-      return { props };
-    }
-
-    return { props, revalidate: 600 };
-  }
+  const isDeployPreview = process.env.CONTEXT === "deploy-preview";
+  if (isDeployPreview) {
+    return { props };
+  } // fully static for previews
+  return { props, revalidate: 3600 }; // ISR for prod
 }