Merge pull request #697 from dOrgTech/staging

Merged Staging into Develop - Multiple UI changes

package.json

@@ -18,14 +18,15 @@
     "@airgap/beacon-sdk": "^4.0.10",
     "@craco/craco": "^7.1.0",
     "@date-io/dayjs": "1.x",
-    "@emotion/react": "^11.10.4",
-    "@emotion/styled": "^11.10.4",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
     "@hookform/resolvers": "^2.8.1",
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.57",
     "@microsoft/signalr": "^5.0.9",
-    "@mui/material": "^5.10.6",
+    "@mui/icons-material": "^5.14.14",
+    "@mui/material": "^5.14.14",
     "@mui/x-date-pickers": "^5.0.2",
     "@taquito/beacon-wallet": "^17.3.1",
     "@taquito/signer": "^17.3.1",
@@ -50,11 +51,13 @@
     "graphql": "^15.5.1",
     "graphql-request": "^3.4.0",
     "hex-to-rgba": "^2.0.1",
+    "html-react-parser": "^5.0.6",
     "https-browserify": "^1.0.0",
     "jsonschema": "^1.4.0",
     "launchdarkly-react-client-sdk": "2.27.0",
     "mixpanel-browser": "^2.42.0",
     "notistack": "^1.0.3",
+    "numbro": "^2.4.0",
     "os-browserify": "^0.3.0",
     "prism-themes": "^1.9.0",
     "prismjs": "^1.28.0",

public/manifest.json

@@ -3,7 +3,7 @@
   "name": "Tezos dApp for creating and interacting with DAOs using BaseDAO framework",
   "icons": [
     {
-      "src": "favicon.svg",
+      "src": "favicon.png",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/svg+xml"
     }

src/App.tsx

@@ -18,7 +18,7 @@ import { Landing } from "modules/home/Landing"
 import { WarningFooter } from "modules/common/WarningFooter"
 import { ActionSheetProvider } from "modules/explorer/context/ActionSheets"
 import { legacyTheme } from "theme/legacy"
-import { Footer } from "modules/common/Footer"
+import { ExplorerFooter } from "modules/common/Footer"
 import { FAQ } from "modules/home/FAQ"
 import { EnvKey, HUMANITEZ_DAO, getEnv } from "services/config"
 import { DAOCreatorRouter } from "modules/creator/router"
@@ -134,15 +134,12 @@ const App: React.FC = () => {
                           />
                         </>
                       ) : null}
-                      <Footer></Footer>
+                      <ExplorerFooter></ExplorerFooter>
                     </Route>
                     <Route path="/faq">
                       <FAQ />
                     </Route>
-                    <Route path="/">
-                      <Landing />
-                    </Route>
-                    <Redirect to="/" />
+                    <Redirect to="/explorer" />
                   </Switch>
                 </Router>
               </Box>