Merge pull request #1775 from QuickSwap/dev2

Dev2

Author: sameepsi

src/components/Toggle/VersionToggle.tsx

@@ -26,18 +26,14 @@ const VersionToggle: React.FC = () => {
   const history = useHistory();
   const isAnalyticsPage = history.location.pathname.includes('/analytics');
   const isPoolPage = history.location.pathname.includes('/pools');
-  const analyticsVersion = useAnalyticsVersion(); // TODO: change default version in useAnalyticsVersion if it's needed to show total and v2
+  const analyticsVersion = useAnalyticsVersion();
   const version =
     params && params.version
       ? params.version
       : isAnalyticsPage
       ? analyticsVersion
       : 'v3';
 
-  // Hide v2 and total tab for now
-  const hideV2 = isAnalyticsPage; // TODO: false to show v2. Set to false if isAnalyticsPage is true
-  const hideTotal = true; // TODO: false to show total
-
   useEffect(() => {
     updateIsV2(version === 'v2');
     updateIsLpLock(version === 'lpLocker');
@@ -71,7 +67,7 @@ const VersionToggle: React.FC = () => {
 
   return (
     <Box className='version-toggle-container'>
-      {!hideV2 && v2Available && (
+      {v2Available && (
         <Box
           className={version === 'v2' ? 'version-toggle-active' : ''}
           onClick={() => {
@@ -147,16 +143,14 @@ const VersionToggle: React.FC = () => {
                 <small>{t('liquidityHub')}</small>
               </Box>
             )}
-          {!hideTotal && (
-            <Box
-              className={version === 'total' ? 'version-toggle-active' : ''}
-              onClick={() => {
-                redirectWithVersion('total');
-              }}
-            >
-              <small>{t('total')}</small>
-            </Box>
-          )}
+          <Box
+            className={version === 'total' ? 'version-toggle-active' : ''}
+            onClick={() => {
+              redirectWithVersion('total');
+            }}
+          >
+            <small>{t('total')}</small>
+          </Box>
         </>
       )}
     </Box>

src/hooks/index.ts

@@ -133,8 +133,7 @@ export const useAnalyticsVersion = () => {
   const config = getConfig(chainIdToUse);
   const v2 = config['v2'];
   const v3 = config['v3'];
-  // const defaultVersion = v2 && v3 ? 'total' : v2 ? 'v2' : 'v3';
-  const defaultVersion = v2 && v3 ? 'v3' : v2 ? 'v2' : 'v3'; // default to v3 for now
+  const defaultVersion = v2 && v3 ? 'total' : v2 ? 'v2' : 'v3';
   const params: any = useParams();
   const version = params && params.version ? params.version : defaultVersion;
   return version;