near-ndc · Megha-Dev-19 · Aug 1, 2023 · Aug 1, 2023
diff --git a/package.json b/package.json
@@ -4,54 +4,54 @@
   "private": true,
   "main": "src/index.js",
   "dependencies": {
-    "@headlessui/react": "^1.7.10",
-    "@heroicons/react": "^2.0.15",
-    "@near-wallet-selector/core": "^8.1.4",
-    "@near-wallet-selector/here-wallet": "^8.1.4",
-    "@near-wallet-selector/ledger": "^8.1.4",
-    "@near-wallet-selector/math-wallet": "^8.1.4",
-    "@near-wallet-selector/meteor-wallet": "^8.1.4",
-    "@near-wallet-selector/modal-ui": "^8.1.4",
-    "@near-wallet-selector/my-near-wallet": "^8.1.4",
-    "@near-wallet-selector/near-wallet": "^8.1.4",
-    "@near-wallet-selector/nightly": "^8.1.4",
-    "@near-wallet-selector/nightly-connect": "^8.1.4",
-    "@near-wallet-selector/sender": "^8.1.4",
-    "@near-wallet-selector/wallet-connect": "^8.1.4",
+    "@headlessui/react": "^1.7.16",
+    "@heroicons/react": "^2.0.18",
+    "@near-wallet-selector/core": "^8.2.1",
+    "@near-wallet-selector/here-wallet": "^8.2.1",
+    "@near-wallet-selector/ledger": "^8.2.1",
+    "@near-wallet-selector/math-wallet": "^8.2.1",
+    "@near-wallet-selector/meteor-wallet": "^8.2.1",
+    "@near-wallet-selector/modal-ui": "^8.2.1",
+    "@near-wallet-selector/my-near-wallet": "^8.2.1",
+    "@near-wallet-selector/near-wallet": "^8.2.1",
+    "@near-wallet-selector/nightly": "^8.2.1",
+    "@near-wallet-selector/nightly-connect": "^8.2.1",
+    "@near-wallet-selector/sender": "^8.2.1",
+    "@near-wallet-selector/wallet-connect": "^8.2.1",
     "@reduxjs/toolkit": "^1.9.5",
-    "@rollbar/react": "^0.11.1",
-    "@supabase/supabase-js": "^2.7.0",
-    "@testing-library/jest-dom": "^5.16.2",
+    "@rollbar/react": "^0.11.2",
+    "@supabase/supabase-js": "^2.31.0",
+    "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^13.5.0",
-    "@usedapp/core": "^1.2.2",
-    "@web3-onboard/coinbase": "^2.2.0",
-    "@web3-onboard/injected-wallets": "^2.6.2",
-    "@web3-onboard/react": "^2.6.1",
-    "@web3-onboard/walletconnect": "^2.2.2",
-    "axios": "^1.3.4",
-    "ethers": "^5.6.4",
+    "@testing-library/user-event": "^14.4.3",
+    "@usedapp/core": "^1.2.10",
+    "@web3-onboard/coinbase": "^2.2.5",
+    "@web3-onboard/injected-wallets": "^2.10.3",
+    "@web3-onboard/react": "^2.8.10",
+    "@web3-onboard/walletconnect": "^2.4.3",
+    "axios": "^1.4.0",
+    "ethers": "^6.6.7",
     "jsonp": "^0.2.1",
     "moment": "^2.29.4",
-    "near-api-js": "^2.0.4",
-    "react": "^18.1.0",
+    "near-api-js": "^2.1.4",
+    "react": "^18.2.0",
     "react-confetti": "^6.1.0",
-    "react-dom": "^18.1.0",
+    "react-dom": "^18.2.0",
     "react-ga": "^3.3.1",
     "react-google-recaptcha-v3": "^1.10.1",
-    "react-native": "^0.71.0",
-    "react-native-web": "^0.18.10",
-    "react-redux": "^8.0.7",
+    "react-native": "^0.72.3",
+    "react-native-web": "^0.19.7",
+    "react-redux": "^8.1.2",
     "react-router-dom": "^6.14.2",
-    "react-scripts": "5.0.0",
+    "react-scripts": "5.0.1",
     "react-spinners-kit": "^1.9.1",
-    "react-toastify": "^9.1.1",
-    "recharts": "^2.6.2",
-    "regenerator-runtime": "^0.13.9",
-    "rollbar": "^2.26.1",
-    "styled-components": "^5.3.9",
-    "web-vitals": "^2.1.4",
-    "yup": "^0.32.11"
+    "react-toastify": "^9.1.3",
+    "recharts": "^2.7.2",
+    "regenerator-runtime": "^0.13.11",
+    "rollbar": "^2.26.2",
+    "styled-components": "^6.0.5",
+    "web-vitals": "^3.4.0",
+    "yup": "^1.2.0"
   },
   "scripts": {
     "start": "react-app-rewired start",
@@ -80,29 +80,29 @@
     ]
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-react": "^7.22.5",
     "assert": "^2.0.0",
-    "babel-jest": "^29.5.0",
+    "babel-jest": "^29.6.2",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
-    "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^8.9.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "https-browserify": "^1.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.5.0",
-    "jest-environment-jsdom": "^29.5.0",
+    "jest": "^29.6.2",
+    "jest-environment-jsdom": "^29.6.2",
     "os-browserify": "^0.3.0",
-    "prettier": "^2.8.7",
+    "prettier": "^3.0.0",
     "process": "^0.11.10",
     "react-app-rewired": "^2.2.1",
     "react-test-renderer": "^18.2.0",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
-    "url": "^0.11.0"
+    "url": "^0.11.1"
   },
   "peerDependencies": {
     "ethers": "5.*"

diff --git a/src/App.js b/src/App.js
@@ -1,6 +1,6 @@
 import 'regenerator-runtime/runtime';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { ToastContainer } from 'react-toastify';
 import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
 import IndexPage from './pages/index';
 import ScoreboardPage from './pages/Scoreboard';
@@ -10,6 +10,9 @@
 import CustomHeader from './components/common/Header';
 import CustomFooter from './components/common/Footer';
 import ActivatePage from './pages/Activate';
+import { wallet } from '.';
+import { useDispatch } from 'react-redux';
+import { updateUserLogin } from './redux/reducer/commonReducer';
 
 const Wrapper = ({ children }) => {
   return (
@@ -23,6 +26,18 @@
 };
 
 export function App() {
+  const dispatch = useDispatch();
+  useEffect(() => {
+    wallet
+      .startUp()
+      .then((value) => {
+        dispatch(updateUserLogin(value));
+      })
+      .catch(() => {
+        dispatch(updateUserLogin(false));
+      });
+  });
+
   return (
     <>
       <Router>

diff --git a/src/components/common/Header.jsx b/src/components/common/Header.jsx
@@ -1,4 +1,4 @@
 import React, { useEffect } from 'react';
 import { Dialog } from '@headlessui/react';
 import { Bars3Icon, XMarkIcon } from '@heroicons/react/24/outline';
 import { CheckCircleIcon } from '@heroicons/react/24/solid';
@@ -25,32 +25,33 @@
  const { isUserLogin, isAdmin, activePageIndex } = useSelector(
    (state) => state[ReducerNames.COMMON]
   );
   const [admin] = useAdmin();
 
-  useEffect(() => {
-    wallet
-      .startUp()
-      .then((value) => {
-        dispatch(updateUserLogin(value));
-      })
-      .catch(() => {
-        dispatch(updateUserLogin(false));
-      });
-  });
-
   const signOut = () => {
     if (isUserLogin) {
       wallet.signOut();
       dispatch(removeAllTokens());
     } else {
-      wallet.signIn();
+      wallet
+        .signIn()
+        .then((value) => {
+          dispatch(updateUserLogin(value));
+        })
+        .catch(() => {
+          dispatch(updateUserLogin(false));
+        });
     }
   };
 
   const HomeMenu = ({ isDialog = false }) => {
     const isActive = (currentPage) =>
       window.location.href.indexOf(currentPage) !== -1 ? 'text-gradient' : '';
 
+    const commonFuction = () => {
+      window.scrollTo(0, 0);
+      setMobileMenuOpen(false);
+    };
+
     return (
       <div
         className={
@@ -64,7 +65,7 @@
           onClick={() => {
             dispatch(setActivePageIndex(null));
             navigate('/');
-            setMobileMenuOpen(false);
+            commonFuction();
           }}
           className={
             !isActive(URLs.SCOREBOARD) &&
@@ -80,7 +81,7 @@
         <div
           onClick={() => {
             navigate(URLs.SBTs);
-            setMobileMenuOpen(false);
+            commonFuction();
           }}
           className={isActive(URLs.SBTs)}
         >
@@ -89,7 +90,7 @@
         <div
           onClick={() => {
             navigate(URLs.ACTIVATE);
-            setMobileMenuOpen(false);
+            commonFuction();
           }}
           className={isActive(URLs.ACTIVATE)}
         >

diff --git a/src/components/common/ProgressTracker.jsx b/src/components/common/ProgressTracker.jsx
@@ -35,7 +35,7 @@

  const getRegisteredPercentage = useCallback(
    () => (humansRegistered / ProgressMeterMax) * 100,
    [humansRegistered]
  );

  // to make sure the the right corner is not clipped much with increasing width
@@ -81,7 +81,7 @@
               {ReadableNumber} Humans on NEAR
             </p>
             <button
-              className="bg-yellow-300 rounded-2xl py-1.5 px-2 text-sm"
+              className="bg-yellow-300 rounded-lg py-1.5 px-2 text-sm"
               onClick={() =>
                 window.open(
                   'https://pages.near.org/blog/ndc-v1-governance-elections-faq/',

diff --git a/src/images/CommunityFund.png b/src/images/CommunityFund.png
diff --git a/src/index.js b/src/index.js
@@ -26,8 +26,6 @@ const root = ReactDOM.createRoot(document.getElementById('root'));
 
 // Setup on page load
 window.onload = async () => {
-  const isSignedIn = await wallet.startUp();
-
   root.render(
     <RollbarProvider config={rollbarConfig}>
       <ErrorBoundary
@@ -36,11 +34,7 @@ window.onload = async () => {
         }
       >
         <ReduxProvider store={store}>
-          <App
-            isSignedIn={isSignedIn}
-            contractId={CONTRACT_ADDRESS}
-            wallet={wallet}
-          />
+          <App />
         </ReduxProvider>
       </ErrorBoundary>
     </RollbarProvider>

diff --git a/src/pages/Scoreboard.jsx b/src/pages/Scoreboard.jsx
@@ -61,7 +61,6 @@ const ScoreboardPage = () => {
   }, []);
 
   React.useEffect(() => {
-    window.scrollTo(0, 0);
     fetchCommunities();
   }, [fetchCommunities]);
 

diff --git a/src/pages/auth/Home.jsx b/src/pages/auth/Home.jsx
@@ -12,9 +12,7 @@ import TokensGrid from '../../components/common/TokensGrid';
 import { setActivePageIndex } from '../../redux/reducer/commonReducer';
 
 const Home = () => {
-  const { fvToken, kycToken, ogToken, regenToken, vibeToken } = useSelector(
-    (state) => state[ReducerNames.SBT]
-  );
+  const { isUserHuman } = useSelector((state) => state[ReducerNames.SBT]);
   const { activePageIndex } = useSelector(
     (state) => state[ReducerNames.COMMON]
   );
@@ -143,7 +141,7 @@ const Home = () => {
         My I-AM-HUMAN Soul Bound Tokens
       </h1>
       <div className="flex flex-col gap-32">
-        {!fvToken && !kycToken && !ogToken && !regenToken && !vibeToken ? (
+        {!isUserHuman ? (
           <div>
             <div
               style={{ backgroundImage: `url(${BgImage})` }}

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -37,7 +37,7 @@ import { updateTrackerStatus } from '../redux/reducer/tracker';
 const URL = window.location;
 
 const IndexPage = () => {
-  const { fvToken, kycToken, ogToken } = useSelector(
+  const { fvToken, ogToken, isUserHuman } = useSelector(
     (state) => state[ReducerNames.SBT]
   );
   const { isUserLogin, isAdmin, activePageIndex } = useSelector(
@@ -249,7 +249,7 @@ const IndexPage = () => {
             {typeof activePageIndex !== 'number' ? (
               <>
                 <div className="flex flex-col gap-y-16 md:gap-y-32">
-                  <div className="flex flex-wrap gap-10">
+                  <div className="flex flex-wrap">
                     <div className="flex-1 min-w-[300px]">
                       <h1 className="font-bold text-5xl">
                         Get your Proof of Personhood with
@@ -290,29 +290,37 @@ const IndexPage = () => {
                           })}
                         </div>
                       </div>
-                      <div className="flex md:justify-start flex-wrap gap-x-10 gap-y-5">
+                      <div className="flex md:justify-start flex-wrap gap-x-5 gap-y-5">
                         {/* show get started only if no tokens are minted by user */}
-                        {!kycToken && !fvToken && !ogToken && (
+                        {!isUserHuman && (
                           <button
                             onClick={() => getStarted()}
                             className="rounded-md border border-transparent bg-gradient-to-r from-purple-600 to-indigo-600 bg-origin-border px-5 md:px-10 py-3 text-base font-medium text-white shadow-sm hover:from-purple-700 hover:to-indigo-700"
                           >
                             Get Started
                           </button>
                         )}
-                        {(kycToken || fvToken || ogToken) && (
+                        {isUserHuman && (
                           <button
                             onClick={() =>
                               window.open(
                                 'https://t.me/+fcNhYGxK891lMjMx',
                                 '_blank'
                               )
                             }
-                            className="rounded-md border border-transparent bg-gradient-to-r from-purple-600 to-indigo-600 bg-origin-border px-5 md:px-10 py-3 text-base font-medium text-white shadow-sm hover:from-purple-700 hover:to-indigo-700"
+                            className="rounded-md border border-transparent bg-gradient-to-r from-purple-600 to-indigo-600 bg-origin-border px-4 py-3 text-base font-medium text-white shadow-sm hover:from-purple-700 hover:to-indigo-700"
                           >
                             Join the NDC Community
                           </button>
                         )}
+                        {isUserHuman && !fvToken && (
+                          <button
+                            onClick={() => dispatch(setActivePageIndex(1))}
+                            className="rounded-md border border-transparent bg-gradient-to-r from-purple-600 to-indigo-600 bg-origin-border px-4 py-3 text-base font-medium text-white shadow-sm hover:from-purple-700 hover:to-indigo-700"
+                          >
+                            Get Your FV Token
+                          </button>
+                        )}
                         <button
                           onClick={() =>
                             window.open(

diff --git a/src/redux/reducer/sbtsReducer.js b/src/redux/reducer/sbtsReducer.js
@@ -53,6 +53,7 @@ export const sbtReducer = createSlice({
     error: null,
     tokenRemoveSuccess: false,
     continueLoop: false, // for transfer and burn
+    isUserHuman: false, // true if user has any SBT Token
   },
   reducers: {
     updateTokens: (state, action) => {
@@ -76,6 +77,12 @@ export const sbtReducer = createSlice({
         default:
           break;
       }
+      state.isUserHuman =
+        state.fvToken ||
+        state.kycToken ||
+        state.ogToken ||
+        state.vibeToken ||
+        state.regenToken;
     },
     handleErrorMessage: (state, action) => {
       state.error = action.payload;