Merge branch 'main' into harsh/dashboard-stats

Author: fullstackninja864

.env

@@ -1,2 +1,3 @@
-NEXT_PUBLIC_RPC_URL_MAINNET="https://changi.ocean.jellyfishsdk.com"
-NEXT_PUBLIC_RPC_URL_TESTNET="https://changi.ocean.jellyfishsdk.com"
+NEXT_PUBLIC_RPC_URL_MAINNET="https://blockscout.changi.ocean.jellyfishsdk.com"
+NEXT_PUBLIC_RPC_URL_TESTNET="https://blockscout.changi.ocean.jellyfishsdk.com"
+NEXT_PUBLIC_RPC_URL_CHANGI="https://blockscout.changi.ocean.jellyfishsdk.com"

next.config.js

@@ -15,7 +15,7 @@ const securityHeaders = [
       };` +
       `style-src 'self' fonts.googleapis.com 'unsafe-inline';` +
       `font-src fonts.gstatic.com;` +
-      `connect-src 'self' changi.ocean.jellyfishsdk.com changi.dfi.team ${
+      `connect-src 'self' blockscout.changi.ocean.jellyfishsdk.com changi.dfi.team ${
         process.env.NODE_ENV === "development"
           ? `ws://localhost:3000/_next/webpack-hmr base-goerli.blockscout.com eth-goerli.blockscout.com`
           : ""

package.json

@@ -17,7 +17,7 @@
     "@floating-ui/react-dom": "^1.3.0",
     "@headlessui/react": "^1.7.15",
     "@reduxjs/toolkit": "^1.9.5",
-    "@waveshq/standard-defichain-jellyfishsdk": "^1.0.4",
+    "@waveshq/standard-defichain-jellyfishsdk": "^2.4.1",
     "@waveshq/standard-web": "^1.0.4",
     "bignumber.js": "^9.1.1",
     "clsx": "^1.2.1",
@@ -42,6 +42,7 @@
     "@types/node": "18.16.3",
     "@types/recharts": "^1.8.24",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "@waveshq/standard-web-linter": "^1.0.4",
     "autoprefixer": "^10.4.14",
     "babel-plugin-istanbul": "^6.1.1",

pnpm-lock.yaml

@@ -55,7 +55,6 @@ export default {
     const txnRows = Math.min(responseTxnData.length, MAX_ROW);
 
     return responseTxnData.slice(0, txnRows).map((data) => {
-      const toHash = data.to?.hash ?? BURN_ADDRESS_HASH;
       const isFromContract = data.from.is_contract;
       const isToContract = data.to?.is_contract ?? false;
       const tokenTransfers =
@@ -64,7 +63,6 @@ export default {
           : [];
 
       const transactionType = getTransactionType({
-        toHash,
         tokenTransfers,
         isFromContract,
         isToContract,

src/api/LatestDataApi.ts

@@ -22,10 +22,14 @@ export const V1_TRANSACTION_URL =
   "api?module=transaction&action=gettxinfo&txhash=";
 
 export const getBaseUrl = (network: NetworkConnection) => {
+  if (network === NetworkConnection.MainNet) {
+    return process.env.NEXT_PUBLIC_RPC_URL_MAINNET;
+  }
   if (network === NetworkConnection.TestNet) {
     return process.env.NEXT_PUBLIC_RPC_URL_TESTNET;
   }
-  return process.env.NEXT_PUBLIC_RPC_URL_TESTNET; // TODO: Replace with NEXT_PUBLIC_RPC_URL_MAINNET when MainNet is enabled
+
+  return process.env.NEXT_PUBLIC_RPC_URL_CHANGI;
 };
 
 export function filterParams(params: { key: string; value }[]): string {

src/api/index.ts

@@ -0,0 +1,18 @@
+export default function EmptyComponent({ icon: Icon, title, testId }) {
+  return (
+    <div
+      className="flex flex-col justify-between items-center py-32"
+      data-testid={testId}
+    >
+      <div className="mb-4">
+        <Icon size={72} className="text-white-50 stroke-white-50" />
+      </div>
+      <div className="font-bold mb-2 text-white-50 text-2xl md:text-[32px] md:leading-10 -tracking-[0.32px]">
+        {title}
+      </div>
+      <div className="text-base text-white-50 -tracking-[0.32px]">
+        Try checking this out on another time.
+      </div>
+    </div>
+  );
+}

src/components/commons/EmptyComponent.tsx

@@ -3,7 +3,7 @@ import { PropsWithChildren, useEffect, useState } from "react";
 import { ConnectKitProvider, getDefaultConfig } from "connectkit";
 import { createConfig, WagmiConfig } from "wagmi";
 import { MetaMaskConnector } from "wagmi/connectors/metaMask";
-import { metachain, metachainTestnet } from "shared/Chains";
+import { metachain, metachainChangi, metachainTestnet } from "shared/Chains";
 
 import { NetworkProvider } from "@contexts/NetworkContext";
 import { StoreProvider } from "@contexts/StoreProvider";
@@ -19,13 +19,13 @@ const description =
 const website = "https://meta.defiscan.live";
 
 const metamask = new MetaMaskConnector({
-  chains: [metachain, metachainTestnet],
+  chains: [metachain, metachainTestnet, metachainChangi],
 });
 
 const config = createConfig(
   getDefaultConfig({
     autoConnect: true,
-    chains: [metachain, metachainTestnet],
+    chains: [metachain, metachainTestnet, metachainChangi],
     appName,
     connectors: [metamask],
     walletConnectProjectId: "",

src/layouts/Default.tsx

@@ -5,6 +5,7 @@
 export enum NetworkConnection {
   MainNet = "MainNet",
   TestNet = "TestNet",
+  Changi = "Changi",
 }
 class Environment {
   constructor(
@@ -41,14 +42,16 @@ export function getEnvironment(): Environment {
   switch (type) {
     case "production":
       return new Environment("Production", false, [
-        // NetworkConnection.MainNet, // TODO: Enable MainNet
-        NetworkConnection.TestNet,
+        // NetworkConnection.MainNet,
+        // NetworkConnection.TestNet,
+        NetworkConnection.Changi,
       ]);
     case "development":
     default:
       return new Environment("Development", true, [
-        // NetworkConnection.MainNet, // TODO: Enable MainNet
-        NetworkConnection.TestNet,
+        // NetworkConnection.MainNet,
+        // NetworkConnection.TestNet,
+        NetworkConnection.Changi,
       ]);
   }
 }

src/layouts/contexts/Environment.ts

@@ -45,6 +45,8 @@ function mapNetworkObject(connection: NetworkConnection): NetworkContextObject {
       return { connection, ...getNetwork("mainnet") };
     case NetworkConnection.TestNet:
       return { connection, ...getNetwork("testnet") };
+    case NetworkConnection.Changi:
+      return { connection, ...getNetwork("changi") };
     default:
       throw new Error(`${connection as string} network not found`);
   }