Merge pull request 'Skin onboarding app' (#33 ) from style/vaidator into main

Reviewed-on: cerc-io/testnet-onboarding-app#33
bump version
2024-08-11 21:05:04 +00:00 · 2024-08-11 17:02:20 -04:00 · 2024-08-11 12:34:35 -04:00 · 2024-08-11 12:32:55 -04:00 · 2024-08-11 15:53:43 +05:30 · 2024-08-11 15:30:40 +05:30
32 changed files with 3184 additions and 2128 deletions
--- a/.env.example
+++ b/.env.example
@ -3,7 +3,8 @@ REACT_APP_ETHEREUM_MAINNET_CHAIN_ID=1
 REACT_APP_LACONICD_CHAIN_ID=laconic_9000-1
 REACT_APP_REGISTRY_GQL_ENDPOINT=http://localhost:9473/api
 REACT_APP_LACONICD_RPC_ENDPOINT=http://localhost:26657
-REACT_APP_LACONICD_DENOM=alnt
 REACT_APP_FAUCET_ENDPOINT=http://localhost:4000
 REACT_APP_WALLET_META_URL=http://localhost:3000
 REACT_APP_SUMSUB_API_ENDPOINT=
+REACT_APP_STAKING_AMOUNT=1000000000000000
+REACT_APP_LACONICD_DENOM=alnt
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -12,6 +12,7 @@
    }
  },
  "rules": {
-    "indent": ["error", 2, { "SwitchCase": 1 }]
+    "indent": ["error", 2, { "SwitchCase": 1 }],
+    "semi": ["error", "always"]
  }
 }
--- a/package.json
+++ b/package.json
@ -1,9 +1,11 @@
 {
  "name": "testnet-onboarding-app",
-  "version": "0.1.0",
+  "version": "0.1.2",
  "private": true,
  "dependencies": {
    "@cerc-io/registry-sdk": "^0.2.5",
+    "@cosmjs/encoding": "^0.32.4",
+    "@cosmjs/proto-signing": "^0.32.4",
    "@cosmjs/stargate": "^0.32.4",
    "@emotion/react": "^11.11.4",
    "@emotion/styled": "^11.11.0",
@ -23,9 +25,11 @@
    "crypto-browserify": "^3.12.0",
    "ethers": "5.7.2",
    "https-browserify": "^1.0.0",
+    "jwt-decode": "^4.0.0",
    "notistack": "^3.0.1",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
+    "react-pdf": "^9.1.0",
    "react-refresh": "^0.11.0",
    "react-router-dom": "^6.22.3",
    "resolve": "^1.20.0",
--- a/public/TermsAndConditions.pdf
+++ b/public/TermsAndConditions.pdf
--- a/public/index.html
+++ b/public/index.html
@ -1,21 +1,24 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Testnet Onboarding App"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
+
+<head>
+  <meta charset="utf-8" />
+  <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="theme-color" content="#000000" />
+  <meta name="description" content="Testnet Onboarding App" />
+  <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+  <!--
      manifest.json provides metadata used when your web app is installed on a
      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
+  <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+  <link rel="preconnect" href="https://fonts.googleapis.com" />
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+  <link
+    href="https://fonts.googleapis.com/css2?family=DM+Mono:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap"
+    rel="stylesheet" />
+  <!--
      Notice the use of %PUBLIC_URL% in the tags above.
      It will be replaced with the URL of the `public` folder during the build.
      Only files inside the `public` folder can be referenced from the HTML.
@ -24,12 +27,53 @@
      work correctly both with client-side routing and a non-root public URL.
      Learn how to configure a non-root public URL by running `npm run build`.
    -->
-    <title>Testnet Onboarding App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
+  <title>Testnet Onboarding App</title>
+  <style>
+    body {
+      margin: 0;
+      padding: 0;
+      height: 100%;
+    }
+
+    .loader-wrapper {
+      width: 100%;
+      height: 100%;
+      position: fixed;
+      top: 0;
+      left: 0;
+      display: grid;
+      place-items: center;
+    }
+
+    .loader {
+      border: 16px solid #e3e3e3;
+      border-top: 16px solid #1976d2;
+      border-radius: 50%;
+      width: 140px;
+      height: 140px;
+      animation: spin 1s linear infinite;
+    }
+
+    @keyframes spin {
+      0% {
+        transform: rotate(0deg);
+      }
+
+      100% {
+        transform: rotate(360deg);
+      }
+    }
+  </style>
+</head>
+
+<body>
+  <noscript>You need to enable JavaScript to run this app.</noscript>
+  <div id="root">
+    <div class="loader-wrapper">
+      <div class="loader"></div>
+    </div>
+  </div>
+  <!--
      This HTML file is a template.
      If you open it directly in the browser, you will see an empty page.

@ -39,5 +83,6 @@
      To begin the development, run `npm start` or `yarn start`.
      To create a production bundle, use `npm run build` or `yarn build`.
    -->
-  </body>
+</body>
+
 </html>
--- a/public/pdf.worker.min.mjs
+++ b/public/pdf.worker.min.mjs
--- a/src/App.tsx
+++ b/src/App.tsx
@ -8,36 +8,125 @@ import PageNotFound from "./pages/PageNotFound";
 import OnboardingSuccess from "./pages/OnboardingSuccess";
 import SignPageLayout from "./layout/SignPageLayout";
 import UserVerification from "./pages/UserVerification";
-import TermsAndConditions from "./pages/TermsAndConditions";
+import LandingPage from "./pages/LandingPage";
 import Header from "./components/Header";
 import { WalletConnectProvider } from "./context/WalletConnectContext";
+import VerifyEmail from "./pages/VerifyEmail";
+import Email from "./pages/Email";
+import Thanks from "./pages/Thanks";
+import Validator from "./pages/Validator";
+import ValidatorSuccess from "./pages/ValidatorSuccess";
+import { createTheme, Box, ThemeProvider, CssBaseline } from "@mui/material";
+
+const darkTheme = createTheme({
+  components: {
+    MuiAccordion: {
+      defaultProps: {
+        sx: {
+          border: "1px solid #48474F",
+          borderBottomRightRadius: 3,
+          borderBottomLeftRadius: 3,
+        },
+      },
+    },
+    MuiButton: {
+      defaultProps: {
+        color: "primary",
+        sx: {
+          fontFamily: `DM Mono, monospace`,
+          fontWeight: 400,
+        },
+      },
+    },
+    MuiLink: {
+      defaultProps: {
+        color: "text.primary",
+        fontSize: "14px",
+      },
+    },
+    MuiTypography: {
+      defaultProps: {
+        color: "text.primary",
+        fontWeight: 400,
+      },
+    },
+    MuiPaper: {
+      defaultProps: {
+        sx: {
+          backgroundImage: "none",
+        },
+      },
+    },
+  },
+  palette: {
+    mode: "dark",
+    primary: {
+      main: "#0000F4",
+    },
+    secondary: {
+      main: "#A2A2FF",
+    },
+    error: {
+      main: "#B20710",
+    },
+    background: {
+      default: "#0F0F0F",
+      paper: "#18181A",
+    },
+    text: {
+      primary: "#FBFBFB",
+    },
+    info: {
+      main: "#FBFBFB",
+    },
+  },
+});

 function App() {
  return (
    <Router>
-      <Header />
-      <WalletConnectProvider>
-        <Routes>
-          <Route path="/" element={<TermsAndConditions />} />
-          <Route path="/connect-wallet" element={<ConnectWallet />} />
-          <Route element={<SignPageLayout />}>
-            <Route path="/sign-with-nitro-key" element={<SignWithNitroKey />} />
-            <Route
-              path="/user-verification"
-              element={<UserVerification />}
-            />
-            <Route
-              path="/sign-with-cosmos"
-              element={<SignWithCosmos />}
-            />
-            <Route
-              path="/onboarding-success"
-              element={<OnboardingSuccess />}
-            ></Route>
-          </Route>
-          <Route path="*" element={<PageNotFound />} />
-        </Routes>
-      </WalletConnectProvider>
+      <ThemeProvider theme={darkTheme}>
+        <Box
+          sx={{
+            height: "100vh",
+            width: "100vw",
+            backgroundColor: "background.default",
+          }}
+        >
+          <Header />
+          <CssBaseline />
+          <WalletConnectProvider>
+            <Routes>
+              <Route path="/" element={<LandingPage />} />
+              <Route path="/verify-email" element={<VerifyEmail />} />
+              <Route path="/email" element={<Email />} />
+              <Route path="/connect-wallet" element={<ConnectWallet />} />
+              <Route path="/thanks" element={<Thanks />} />
+              <Route element={<SignPageLayout />}>
+                <Route
+                  path="/sign-with-nitro-key"
+                  element={<SignWithNitroKey />}
+                />
+                <Route
+                  path="/user-verification"
+                  element={<UserVerification />}
+                />
+                <Route path="/sign-with-cosmos" element={<SignWithCosmos />} />
+                <Route
+                  path="/onboarding-success"
+                  element={<OnboardingSuccess />}
+                />
+                <Route path="/validator" element={<Validator />} />
+                <Route
+                  path="/validator-success"
+                  element={<ValidatorSuccess />}
+                />
+              </Route>
+              <Route path="*" element={<PageNotFound />} />
+            </Routes>
+          </WalletConnectProvider>
+        </Box>
+      </ThemeProvider>
    </Router>
  );
 }
--- a/src/components/CodeBlock.tsx
+++ b/src/components/CodeBlock.tsx
@ -0,0 +1,25 @@
+import { Box } from "@mui/material";
+import React, { PropsWithChildren } from "react";
+
+export const CodeBlock: React.FC<PropsWithChildren> = ({ children }) => (
+  <Box
+    sx={{
+      backgroundColor: "#48474F",
+      padding: 3,
+      wordWrap: "break-word",
+      mt: 1,
+      borderRadius: 1,
+    }}
+  >
+    <pre
+      style={{
+        whiteSpace: "pre-wrap",
+        margin: 0,
+        backgroundColor: "#48474F",
+        color: "#FBFBFB",
+      }}
+    >
+      {children}
+    </pre>
+  </Box>
+);
--- a/src/components/Container.tsx
+++ b/src/components/Container.tsx
@ -0,0 +1,21 @@
+import { Box, BoxProps } from "@mui/material";
+import React, { PropsWithChildren } from "react";
+
+export const Container: React.FC<
+  PropsWithChildren<{ boxProps?: BoxProps }>
+> = ({ children, boxProps = {} }) => (
+  <Box
+    {...boxProps}
+    sx={{
+      width: "100%",
+      maxWidth: "752px",
+      mx: "auto",
+      backgroundColor: "background.paper",
+      padding: 3,
+      borderRadius: 2,
+      ...boxProps.sx,
+    }}
+  >
+    {children}
+  </Box>
+);
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@ -1,31 +1,90 @@
-import React from 'react';
-import { Link, useLocation } from 'react-router-dom';
+import React from "react";
+import { Link, useLocation } from "react-router-dom";

-import { AppBar, Toolbar, Avatar, Box, IconButton } from '@mui/material';
+import { AppBar, SvgIcon, Stack, Divider, Typography } from "@mui/material";

 const Header: React.FC = () => {
-  const location = useLocation()
+  const location = useLocation();

  return (
-    <AppBar position="static" color="inherit">
-      <Toolbar>
-        <Link to={location.pathname === "/" ? "/" : "/connect-wallet"} style={{ color: "inherit", textDecoration: "none" }}>
-          <Box sx={{ display: "flex", alignItems: "center" }}>
-            <Avatar
-              alt="Laconic logo"
-              src="https://avatars.githubusercontent.com/u/92608123"
-            />
-            <IconButton
-              edge="start"
-              color="inherit"
-              aria-label="menu"
-              sx={{ ml: 2, mr: 2 }}
+    <AppBar
+      position="static"
+      color="inherit"
+      sx={{ boxShadow: "none", mb: 4, height: 48 }}
+    >
+      <Stack
+        direction="row"
+        sx={{
+          backgroundColor: "background.paper",
+          pl: 2,
+          alignItems: "center",
+          py: 1,
+        }}
+        spacing={1}
+      >
+        <Link
+          to={location.pathname === "/" ? "/" : "/connect-wallet"}
+          style={{
+            color: "inherit",
+            textDecoration: "none",
+            display: "flex",
+            alignItems: "center",
+            marginRight: 4,
+          }}
+        >
+          <SvgIcon sx={{ height: 20, width: 100 }}>
+            <svg
+              width="115"
+              height="20"
+              viewBox="0 0 115 20"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
            >
-              Testnet Onboarding
-            </IconButton>
-          </Box>
+              <path
+                fillRule="evenodd"
+                clipRule="evenodd"
+                d="M3.37388 10.5194C5.70149 8.19185 7.14225 4.97748 7.1416 1.42853C7.14246 0.94681 7.11586 0.470456 7.063 0L-0.000488281 0.000643078L-0.000273922 13.5723C-0.000917354 15.2174 0.62632 16.863 1.88091 18.1175C3.1356 19.3721 4.78235 20.0001 6.42772 19.9993L6.42729 19.9997L19.9995 20L19.999 12.9355C19.5296 12.8838 19.0532 12.857 18.5704 12.8569C15.0224 12.8574 11.8079 14.298 9.48026 16.6255C7.78654 18.2768 5.07093 18.2771 3.39812 16.6043C1.72638 14.9325 1.72562 12.2161 3.37388 10.5194ZM18.5344 1.46863C16.5837 -0.481929 13.4146 -0.48268 11.4633 1.46863C9.512 3.41984 9.51276 6.58895 11.4633 8.53941C13.415 10.491 16.5831 10.4907 18.5344 8.53941C20.4857 6.5882 20.4861 3.42016 18.5344 1.46863Z"
+                fill="#FBFBFB"
+              />
+              <path
+                d="M31.4741 18.5838H39.2552V16.3302H34.075V1.41351H31.4741V18.5838Z"
+                fill="#FBFBFB"
+              />
+              <path
+                d="M49.8108 1.41351H45.4976L40.9893 18.5838H43.6769L44.8039 14.2913H50.3744L51.5014 18.5838H54.3191L49.8108 1.41351ZM45.3458 12.145L47.6 3.2593H47.6866L49.8541 12.145H45.3458Z"
+                fill="#FBFBFB"
+              />
+              <path
+                d="M62.9292 8.06885H65.9636C65.9636 3.17534 64.3813 1.07196 60.6967 1.07196C56.8169 1.07196 55.1479 3.73341 55.1479 9.97909C55.1479 16.2462 56.8169 18.9291 60.6967 18.9291C64.3813 18.9291 65.9636 16.8901 65.9853 12.1468H62.9508C62.9292 15.8599 62.474 16.7828 60.6967 16.7828C58.6593 16.7828 58.1607 15.4307 58.1824 9.97909C58.1824 4.54896 58.6809 3.19678 60.6967 3.21823C62.474 3.21823 62.9292 4.18413 62.9292 8.06885Z"
+                fill="#FBFBFB"
+              />
+              <path
+                d="M73.7781 1.07209C77.7229 1.09364 79.4135 3.77643 79.4135 10.0007C79.4135 16.2249 77.7229 18.9078 73.7781 18.9292C69.8117 18.9507 68.1211 16.2678 68.1211 10.0007C68.1211 3.73354 69.8117 1.05064 73.7781 1.07209ZM71.1555 10.0007C71.1555 15.4308 71.6757 16.783 73.7781 16.783C75.8589 16.783 76.3791 15.4308 76.3791 10.0007C76.3791 4.54909 75.8589 3.19691 73.7781 3.21847C71.6757 3.23992 71.1555 4.59209 71.1555 10.0007Z"
+                fill="#FBFBFB"
+              />
+              <path
+                d="M85.0819 18.5624L82.481 18.5838V1.41351H87.0544L91.3243 15.4073H91.3676V1.41351H93.968V18.5838H89.677L85.1254 3.51689H85.0819V18.5624Z"
+                fill="#FBFBFB"
+              />
+              <path
+                d="M100.468 1.41351H97.8677V18.5838H100.468V1.41351Z"
+                fill="#FBFBFB"
+              />
+              <path
+                d="M111.139 8.06885H114.174C114.174 3.17534 112.591 1.07196 108.906 1.07196C105.028 1.07196 103.358 3.73341 103.358 9.97909C103.358 16.2462 105.028 18.9291 108.906 18.9291C112.591 18.9291 114.174 16.8901 114.195 12.1468H111.161C111.139 15.8599 110.684 16.7828 108.906 16.7828C106.869 16.7828 106.371 15.4307 106.393 9.97909C106.393 4.54896 106.891 3.19678 108.906 3.21823C110.684 3.21823 111.139 4.18413 111.139 8.06885Z"
+                fill="#FBFBFB"
+              />
+            </svg>
+          </SvgIcon>
        </Link>
-      </Toolbar>
+        <Divider
+          flexItem
+          orientation="vertical"
+          color="#FBFBFB"
+          sx={{ height: "1.2rem", alignSelf: "center", width: "1px" }}
+        />
+        <Typography fontSize="1.25rem">Testnet Onboarding</Typography>
+      </Stack>
    </AppBar>
  );
 };
--- a/src/components/TermsAndConditionsCard.tsx
+++ b/src/components/TermsAndConditionsCard.tsx
@ -9,21 +9,21 @@ export enum Role {
  Participant = 'participant'
 }

-const TermsAndConditionsCard = ({ handleAccept, handleRoleChange }: { handleAccept: () => void, handleRoleChange: (role: Role) => void }) => {
+const SelectRoleCard = ({ handleAccept, handleRoleChange }: { handleAccept: () => void, handleRoleChange: (role: Role) => void }) => {
  const [selectedRole, setSelectedRole] = useState<Role>(Role.Participant);
  const [checked, setChecked] = useState(false);
  const [isHidden, setIsHidden] = useState(false);

-  const [isDialogOpen, setisDialogOpen] = useState(false)
+  const [isDialogOpen, setisDialogOpen] = useState(false);

  const handleCheckboxChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    setChecked(event.target.checked);
  };

  const handleContinue = () => {
-    handleAccept()
-    setIsHidden(true)
-  }
+    handleAccept();
+    setIsHidden(true);
+  };

  const handleRadioChange = (event: React.ChangeEvent<HTMLInputElement>) => {
    setSelectedRole(event.target.value as Role);
@ -44,12 +44,12 @@ const TermsAndConditionsCard = ({ handleAccept, handleRoleChange }: { handleAcce
          <FormControlLabel
            value={Role.Validator}
            control={<Radio />}
-            label="Validator"
+            label="Validator / Service Provider"
          />
          <FormControlLabel
            value={Role.Participant}
            control={<Radio />}
-            label="Participant"
+            label="App Publisher"
          />
        </RadioGroup>
      </FormControl>
@ -75,9 +75,9 @@ const TermsAndConditionsCard = ({ handleAccept, handleRoleChange }: { handleAcce
          Continue
        </Button>
      </Box>
-      <TermsAndConditionsDialog isValidator = { selectedRole === Role.Validator } open={isDialogOpen} onClose={() => setisDialogOpen(false)}/>
+      <TermsAndConditionsDialog open={isDialogOpen} onClose={() => setisDialogOpen(false)}/>
    </Paper>
  );
 };

-export default TermsAndConditionsCard;
+export default SelectRoleCard;
--- a/src/components/TermsAndConditionsBox.tsx
+++ b/src/components/TermsAndConditionsBox.tsx
@ -0,0 +1,65 @@
+import React, { useState } from "react";
+import { Document, Page, pdfjs } from "react-pdf";
+
+import { Typography } from "@mui/material";
+
+// https://github.com/wojtekmaj/react-pdf?tab=readme-ov-file#copy-worker-to-public-directory
+pdfjs.GlobalWorkerOptions.workerSrc =
+  process.env.PUBLIC_URL + "/pdf.worker.min.mjs";
+
+interface TermsAndConditionsBoxProps {
+  height: string;
+  onLoad?: () => void;
+}
+
+const TermsAndConditionsBox = ({
+  height,
+  onLoad,
+}: TermsAndConditionsBoxProps) => {
+  const [numPages, setNumPages] = useState<number>();
+
+  function onDocumentLoadSuccess({ numPages }: { numPages: number }): void {
+    setNumPages(numPages);
+
+    if (onLoad) {
+      onLoad();
+    }
+  }
+
+  return (
+    <>
+      <Typography variant="h4" textAlign="center" gutterBottom>
+        Terms and Conditions
+      </Typography>
+      <div
+        style={{
+          height: height,
+          overflowY: "auto",
+          display: "flex",
+          flexDirection: "column",
+          alignItems: "center",
+        }}
+      >
+        <Document
+          file={process.env.PUBLIC_URL + "/TermsAndConditions.pdf"}
+          onLoadSuccess={onDocumentLoadSuccess}
+        >
+          {Array.apply(null, Array(numPages))
+            .map((x, i) => i + 1)
+            .map((page) => {
+              return (
+                <Page
+                  key={page}
+                  pageNumber={page}
+                  renderTextLayer={false}
+                  renderAnnotationLayer={false}
+                />
+              );
+            })}
+        </Document>
+      </div>
+    </>
+  );
+};
+
+export default TermsAndConditionsBox;
--- a/src/components/TermsAndConditionsDialog.tsx
+++ b/src/components/TermsAndConditionsDialog.tsx
@ -1,29 +1,27 @@
 import React from 'react';

-import { Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Button, Typography } from '@mui/material';
+import { Button, Dialog, DialogActions, DialogContent } from '@mui/material';

-import { TNC_PARTICIPANT_CONTENT, TNC_VALIDATOR_CONTENT } from '../constants';
+import TermsAndConditionsBox from './TermsAndConditionsBox';

 interface TermsDialogProps {
-  isValidator: boolean;
  open: boolean;
  onClose: () => void;
 }

-const TermsAndConditionsDialog: React.FC<TermsDialogProps> = ({ isValidator, open, onClose }) => {
+const TermsAndConditionsDialog: React.FC<TermsDialogProps> = ({ open, onClose }) => {
  return (
-    <Dialog open={open} onClose={onClose}>
-      <DialogTitle>Terms and Conditions</DialogTitle>
+    <Dialog open={open} onClose={onClose} maxWidth="lg">
      <DialogContent>
-        <Typography variant="h6" gutterBottom>
-          Onboard as a {isValidator ? "validator" : "participant"}
-        </Typography>
-        <DialogContentText>
-          <div dangerouslySetInnerHTML={{__html: isValidator ? TNC_VALIDATOR_CONTENT : TNC_PARTICIPANT_CONTENT }} />
-        </DialogContentText>
+        <TermsAndConditionsBox height='65vh' />
      </DialogContent>
      <DialogActions>
-        <Button onClick={onClose} color="primary">
+        <Button>
+          <a href="/TermsAndConditions.pdf" download style={{textDecoration: "none", color: "inherit"}}>
+            Download PDF
+          </a>
+        </Button>
+        <Button onClick={onClose}>
          Close
        </Button>
      </DialogActions>
@ -31,4 +29,4 @@ const TermsAndConditionsDialog: React.FC<TermsDialogProps> = ({ isValidator, ope
  );
 };

-export default TermsAndConditionsDialog;
+export default TermsAndConditionsDialog;
--- a/src/constants.ts
+++ b/src/constants.ts
@ -1,33 +1,7 @@
-export const TNC_GENERIC_CONTENT = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.`;
+export const WALLET_DISCLAIMER_MSG = 'You are connecting to an experimental wallet! It is not secure. Do not use it elsewhere and/or for managing real assets.';

-export const TNC_VALIDATOR_CONTENT = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.`;
-
-export const TNC_PARTICIPANT_CONTENT = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. <br/>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.`;
-
-export const WALLET_DISCLAIMER_MSG = 'You are connecting to an experimental wallet! It is not secure. Do not use it elsewhere and/or for managing real assets.'
+export const REDIRECT_EMAIL_MSG = 'Close this tab and the confirmation link in your email will bring you back to the onboarding app.';

 export const ENABLE_KYC = false;
+
+export const HASHED_SUBSCRIBER_ID_KEY = 'subscriberIdHash';
--- a/src/context/WalletConnectContext.tsx
+++ b/src/context/WalletConnectContext.tsx
@ -22,6 +22,7 @@ assert(PROJECT_ID, "Wallet connect project id not provided");
 interface ContextValue {
  connect: () => Promise<void>;
  session: SessionTypes.Struct | null;
+  isSessionLoading: boolean;
  signClient: SignClient | undefined;
  checkPersistedState: (client: SignClient) => Promise<void>;
  disconnect: () => Promise<void>;
@ -30,6 +31,7 @@ interface ContextValue {
 const walletConnectContext = createContext<ContextValue>({
  connect: () => Promise.resolve(),
  session: null,
+  isSessionLoading: true,
  signClient: undefined,
  checkPersistedState: () => Promise.resolve(),
  disconnect: () => Promise.resolve(),
@ -47,6 +49,7 @@ export const WalletConnectProvider = ({
 }) => {
  const [signClient, setSignClient] = useState<SignClient>();
  const [session, setSession] = useState<SessionTypes.Struct | null>(null);
+  const [isSessionLoading, setIsSessionLoading] = useState(true);
  const isSignClientInitializing = useRef<boolean>(false);
  const navigate = useNavigate();

@ -59,6 +62,7 @@ export const WalletConnectProvider = ({
    }

    setSession(null);
+    setIsSessionLoading(false);
  }, [signClient, session]);

  const checkPersistedState = useCallback(async (client: SignClient) => {
@ -67,6 +71,8 @@ export const WalletConnectProvider = ({
      const session = client.session.get(client.session.keys[lastKeyIndex]);
      setSession(session);
    }
+
+    setIsSessionLoading(false);
  }, []);

  const subscribeToEvents = useCallback(
@ -76,10 +82,12 @@ export const WalletConnectProvider = ({
        const currentSession = client.session.get(topic);
        const updatedSession = { ...currentSession, namespaces };
        setSession(updatedSession);
+        setIsSessionLoading(false);
      });

      client.on("session_delete", () => {
        setSession(null);
+        setIsSessionLoading(false);
        navigate("/");
      });
    },
@ -133,12 +141,14 @@ export const WalletConnectProvider = ({
      try {
        const session = await approval();
        setSession(session);
+        setIsSessionLoading(false);
      } catch (error) {
        enqueueSnackbar("User rejected pairing request", { variant: "error" });
        console.log(error);
      }
      web3Modal.closeModal();
    }
+
  };

  useEffect(() => {
@ -152,6 +162,7 @@ export const WalletConnectProvider = ({
      value={{
        connect,
        session,
+        isSessionLoading,
        signClient,
        checkPersistedState,
        disconnect,
@ -163,12 +174,13 @@ export const WalletConnectProvider = ({
 };

 export const useWalletConnectContext = () => {
-  const { connect, session, signClient, checkPersistedState, disconnect } =
+  const { connect, session, signClient, isSessionLoading, checkPersistedState, disconnect } =
    useContext(walletConnectContext);

  return {
    connect,
    session,
+    isSessionLoading,
    signClient,
    checkPersistedState,
    disconnect,
--- a/src/layout/Layout.tsx
+++ b/src/layout/Layout.tsx
@ -0,0 +1,34 @@
+import { Button, Typography } from "@mui/material";
+import React, { PropsWithChildren } from "react";
+import { Container } from "../components/Container";
+import { ArrowBack } from "@mui/icons-material";
+import { useNavigate } from "react-router-dom";
+
+export const Layout: React.FC<
+  PropsWithChildren<{
+    title: string;
+    backLinkTitle?: string;
+    noBackButton?: boolean;
+  }>
+> = ({ children, title, backLinkTitle = "Home", noBackButton = false }) => {
+  const navigate = useNavigate();
+
+  return (
+    <Container boxProps={{ sx: { backgroundColor: "inherit", padding: 0 } }}>
+      {noBackButton ? null : (
+        <Button
+          startIcon={<ArrowBack />}
+          color="info"
+          sx={{ mb: 4 }}
+          onClick={() => navigate("/")}
+        >
+          {backLinkTitle}
+        </Button>
+      )}
+      <Typography variant="h4" sx={{ mb: 4 }}>
+        {title}
+      </Typography>
+      <Container>{children}</Container>
+    </Container>
+  );
+};
--- a/src/layout/SignPageLayout.tsx
+++ b/src/layout/SignPageLayout.tsx
@ -1,44 +1,38 @@
 import React from "react";
-import { Outlet, useNavigate } from "react-router-dom";
+import { Outlet, useLocation, useNavigate } from "react-router-dom";

-import {
-  Toolbar,
-  Avatar,
-  Button,
-  Typography,
-  Container
-} from "@mui/material";
+import { Avatar, Button, Stack, Typography } from "@mui/material";

 import { useWalletConnectContext } from "../context/WalletConnectContext";
+import { Container } from "../components/Container";

 const SignPageLayout = () => {
  const { disconnect, session } = useWalletConnectContext();
  const navigate = useNavigate();
+  const location = useLocation();

  const disconnectHandler = async () => {
+    const { pathname } = location;
+    const redirectTo = pathname ? pathname.substring(1) : "";
+
    await disconnect();
-    navigate("/");
+    navigate(`/connect-wallet?redirectTo=${redirectTo}`);
  };

  return (
-    <>
-      <Toolbar variant="dense">
-
-        <Button
-          variant="outlined"
-          style={{
-            marginLeft: "auto",
-          }}
-          color="error"
-          onClick={disconnectHandler}
-        >
-          Disconnect
-        </Button>
-      </Toolbar>
-
-      <Container maxWidth="md">
+    <Stack justifyContent="center" alignItems="center">
+      <Container
+        boxProps={{
+          sx: {
+            display: "flex",
+            flexDirection: "row",
+            justifyContent: "space-between",
+            mb: 4,
+          },
+        }}
+      >
        {session && (
-          <div style={{ display: "flex", flexDirection: "column" }}>
+          <Stack spacing={0.5}>
            <div
              style={{
                display: "flex",
@ -47,7 +41,7 @@ const SignPageLayout = () => {
              }}
            >
              <Typography variant="body2">
-                Connected to: <b> {session.peer.metadata.name}</b>{" "}
+                <b>Connected to:</b> {session.peer.metadata.name}
              </Typography>
              <Avatar
                variant="square"
@ -62,13 +56,21 @@ const SignPageLayout = () => {
              />
            </div>
            <Typography variant="body2">
-              Session ID: <b>{session.topic} </b>
+              <b>Session ID:</b> {session.topic}
            </Typography>
-          </div>
+          </Stack>
        )}
-        <Outlet />
+        <Button
+          variant="outlined"
+          color="error"
+          onClick={disconnectHandler}
+          sx={{ color: "text.primary" }}
+        >
+          Disconnect
+        </Button>
      </Container>
-    </>
+      <Outlet />
+    </Stack>
  );
 };

--- a/src/pages/ConnectWallet.tsx
+++ b/src/pages/ConnectWallet.tsx
@ -1,60 +1,57 @@
 import React, { useEffect } from "react";
-import {useNavigate } from "react-router-dom";
+import { useLocation, useNavigate, useSearchParams } from "react-router-dom";

-import { Button, Box, Container, Typography, colors } from "@mui/material";
+import { Button, Box, Container } from "@mui/material";

 import { useWalletConnectContext } from "../context/WalletConnectContext";
-import { WALLET_DISCLAIMER_MSG } from "../constants";

 const ConnectWallet = () => {
-  const { connect, session } = useWalletConnectContext();
+  const { connect, session, signClient, checkPersistedState } =
+    useWalletConnectContext();

  const navigate = useNavigate();
+  const location = useLocation();
+  const [searchParams] = useSearchParams();

+  const redirectTo = searchParams.get("redirectTo");

  useEffect(() => {
-
-    if (session) {
-      navigate("/sign-with-nitro-key");
+    if (signClient && !session) {
+      checkPersistedState(signClient);
    }
-  }, [session, navigate,]);
+  }, [checkPersistedState, signClient, session]);
+
+  useEffect(() => {
+    if (!session) {
+      return;
+    }
+
+    if (redirectTo) {
+      navigate(`/${redirectTo}`, {
+        state: location.state,
+      });
+    } else {
+      navigate("/sign-with-nitro-key", {
+        state: location.state,
+      });
+    }
+  }, [session, navigate, redirectTo, location.state]);

  const handler = async () => {
    await connect();
  };

  return (
-    <Container maxWidth="lg">
-      <Box
-        display="flex"
-        flexDirection="column"
-        alignItems="center"
-        justifyContent="center"
-        marginTop={10}
-        sx={{
-          border: 1,
-          borderColor: 'grey.500',
-        }}
-        padding={5}
-      >
-        <Typography variant="h5" component="h1" gutterBottom color={colors.red[400]}>
-          Disclaimer
-        </Typography>
-        <Typography variant="body1">
-          {WALLET_DISCLAIMER_MSG}
-        </Typography>
-      </Box>
+    <Container maxWidth="lg" sx={{ height: "75%" }}>
      <Box
        display="flex"
        flexDirection="column"
        alignItems="center"
        padding={5}
        justifyContent="center"
+        height="100%"
      >
-        <Button
-          variant="contained"
-          onClick={handler}
-        >
+        <Button variant="contained" onClick={handler}>
          Connect Wallet
        </Button>
      </Box>
--- a/src/pages/Email.tsx
+++ b/src/pages/Email.tsx
@ -0,0 +1,33 @@
+import React from 'react';
+
+import { Box, Typography } from '@mui/material';
+
+import { REDIRECT_EMAIL_MSG } from '../constants';
+
+const Email = () => {
+  return (
+    <Box
+      display="flex"
+      flexDirection="column"
+      alignItems="center"
+      justifyContent="center"
+      marginY={20}
+      marginX={50}
+      sx={{
+        border: 1,
+        borderColor: 'grey.500',
+      }}
+      padding={5}
+
+    >
+      <Typography variant="h4" component="h1" gutterBottom>
+        Thank you for registering!
+      </Typography>
+      <Typography variant="body1">
+        {REDIRECT_EMAIL_MSG}
+      </Typography>
+    </Box>
+  );
+};
+
+export default Email;
--- a/src/pages/LandingPage.tsx
+++ b/src/pages/LandingPage.tsx
@ -0,0 +1,86 @@
+import React, { useState } from "react";
+import { useNavigate } from "react-router-dom";
+
+import { Button, Box, Typography } from "@mui/material";
+
+import TermsAndConditionsBox from "../components/TermsAndConditionsBox";
+import { Container } from "../components/Container";
+
+const LandingPage = () => {
+  const navigate = useNavigate();
+
+  const [isDisabled, setIsDisabled] = useState(true);
+
+  const handleAccept = () => {
+    navigate("/verify-email");
+  };
+
+  return (
+    <Container>
+      <Box
+        display="flex"
+        flexDirection="column"
+        alignItems="center"
+        justifyContent="center"
+        margin={10}
+        sx={{
+          border: 1,
+          borderColor: "grey.500",
+          borderRadius: 1,
+        }}
+        padding={5}
+      >
+        <Typography variant="h6">
+          Welcome to the LORO Testnet Onboarding App. The detailed instructions
+          for completing this first step are found in the{" "}
+          <a
+            href="https://github.com/hyphacoop/loro-testnet/"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            LORO testnet repo
+          </a>
+          . Once your onboarding transaction has been submitted, await the
+          completion of stage0. The genesis.json file and peer nodes will then
+          be published in the aforementioned repository for validators to begin
+          stage1. Once enough validators are online and the Laconic chain is
+          running, those same validators can complete their service provider
+          setup. Once service providers are live, app publishers can start
+          deploying webapps to individual service providers.
+        </Typography>
+      </Box>
+      <TermsAndConditionsBox
+        height="43vh"
+        onLoad={() => {
+          setIsDisabled(false);
+        }}
+      />
+      <Box m={2} display="flex" justifyContent="center" gap={2}>
+        <Button
+          variant="outlined"
+          color="primary"
+          sx={{ color: "text.primary" }}
+          disabled={isDisabled}
+        >
+          <a
+            href="/TermsAndConditions.pdf"
+            download
+            style={{textDecoration: "none", color: "inherit"}}
+          >
+            Download PDF
+          </a>
+        </Button>
+        <Button
+          variant="contained"
+          color="primary"
+          onClick={handleAccept}
+          disabled={isDisabled}
+        >
+          Accept
+        </Button>
+      </Box>
+    </Container>
+  );
+};
+
+export default LandingPage;
--- a/src/pages/OnboardingSuccess.tsx
+++ b/src/pages/OnboardingSuccess.tsx
@ -7,47 +7,50 @@ import { Registry } from "@cerc-io/registry-sdk";
 import SumsubWebSdk from "@sumsub/websdk-react";
 import { MessageHandler } from "@sumsub/websdk";

-import { config, fetchAccessToken, getAccessTokenExpirationHandler, options } from "../utils/sumsub";
-import { ENABLE_KYC } from "../constants";
+import {
+  config,
+  fetchAccessToken,
+  getAccessTokenExpirationHandler,
+  options,
+} from "../utils/sumsub";
+import { ENABLE_KYC, HASHED_SUBSCRIBER_ID_KEY } from "../constants";
+import { Participant } from "../types";
+import { CodeBlock } from "../components/CodeBlock";

-interface Participant {
-  cosmosAddress: string;
-  nitroAddress: string;
-  role: string;
-  kycId: string;
-}
-
-const registry = new Registry(
-  process.env.REACT_APP_REGISTRY_GQL_ENDPOINT!
-);
+const registry = new Registry(process.env.REACT_APP_REGISTRY_GQL_ENDPOINT!);

 const OnboardingSuccess = () => {
  const location = useLocation();
  const { cosmosAddress } = location.state as {
-    cosmosAddress?: string
-  }
+    cosmosAddress?: string;
+  };

  const [participant, setParticipant] = useState<Participant>();
-  const [token, setToken] = useState<string>('');
+  const [token, setToken] = useState<string>("");
  const [loading, setLoading] = useState<boolean>(true);

  const messageHandler: MessageHandler = (event, payload) => {
-    console.log('sumsubEvent:', event, payload);
+    console.log("sumsubEvent:", event, payload);
  };

  useEffect(() => {
    const fetchParticipants = async () => {
      try {
        if (!cosmosAddress) {
-          enqueueSnackbar("Cosmos address is not provided", { variant: "error" });
+          enqueueSnackbar("Laconic address is not provided", {
+            variant: "error",
+          });
          return;
        }
-        const participant: Participant = await registry.getParticipantByAddress(cosmosAddress);
+        const participant: Participant =
+          await registry.getParticipantByAddress(cosmosAddress);
        if (!participant) {
          enqueueSnackbar("Participant not found", { variant: "error" });
          return;
        }

+        localStorage.removeItem(HASHED_SUBSCRIBER_ID_KEY);
+
        setParticipant(participant);
      } catch (error) {
        console.error("Error fetching participants", error);
@ -65,7 +68,7 @@ const OnboardingSuccess = () => {
    };

    if (cosmosAddress && ENABLE_KYC) {
-      getToken(cosmosAddress).catch(error => {
+      getToken(cosmosAddress).catch((error) => {
        console.error(error);
        alert("Failed to fetch token");
      });
@ -73,54 +76,90 @@ const OnboardingSuccess = () => {
  }, [cosmosAddress]);

  return (
-    <Box
-      sx={{
-        display: "flex",
-        flexDirection: "column",
-        marginTop: 6,
-        gap: 1,
-      }}
-    >
-      <Typography variant="h5">Transaction Successful</Typography>
-      <Typography variant="body1">
-        Participant onboarded: <br />
-      </Typography>
+    <>
      <Box
        sx={{
-          backgroundColor: "lightgray",
-          padding: 3,
-          wordWrap: "break-word",
-          marginBottom: 6,
+          display: "flex",
+          flexDirection: "column",
+          marginTop: 6,
+          gap: 1,
        }}
      >
-        <pre style={{ whiteSpace: "pre-wrap", margin: 0 }}>
+        <Typography variant="h5">Transaction Successful</Typography>
+        <Typography variant="body1">
+          Participant onboarded: <br />
+        </Typography>
+        <CodeBlock>
          {participant && (
            <div>
-              Cosmos Address: {participant.cosmosAddress} <br />
+              Laconic Address: {participant.cosmosAddress} <br />
              Nitro Address: {participant.nitroAddress} <br />
              Role: {participant.role} <br />
              KYC ID: {participant.kycId} <br />
              <br />
            </div>
          )}
-        </pre>
+        </CodeBlock>
+        {ENABLE_KYC ? (
+          <Box>
+            <Typography variant="h5">KYC Status</Typography>
+            {!loading && token && cosmosAddress && (
+              <SumsubWebSdk
+                accessToken={token}
+                expirationHandler={getAccessTokenExpirationHandler(
+                  cosmosAddress,
+                )}
+                config={config}
+                options={options}
+                onMessage={messageHandler}
+              />
+            )}
+          </Box>
+        ) : (
+          ""
+        )}
      </Box>
-      {ENABLE_KYC ? (
-        <Box>
-          <Typography variant="h5">KYC Status</Typography>
-          {!loading && token && cosmosAddress && (
-            <SumsubWebSdk
-              accessToken={token}
-              expirationHandler={getAccessTokenExpirationHandler(cosmosAddress)}
-              config={config}
-              options={options}
-              onMessage={messageHandler}
-            />
-          )}
-        </Box>
-      ) : ''
-      }
-    </Box>
+      <Typography variant="h5">Next Steps</Typography>
+      <Box
+        display="flex"
+        flexDirection="column"
+        alignItems="center"
+        justifyContent="center"
+        marginTop={3}
+        sx={{
+          border: 1,
+          borderColor: "grey.500",
+        }}
+        padding={5}
+      >
+        <Typography variant="body1" gutterBottom sx={{ p: 2 }}>
+          For app publishers, await the start of the stage 1 chain, which will
+          be announced in various social media channels. In the meantime,
+          familiarize yourself with the{" "}
+          <a
+            href="https://github.com/hyphacoop/loro-testnet/blob/main/docs/publishing-webapps.md"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            webapp publishing workflow
+          </a>{" "}
+          as this is the main task you will be participating in.
+          <br />
+          <br />
+          For validators, ensure your service provider is running and ready to
+          deploy webapps. Await publication of the laconicd version, genesis
+          file, and peer info to the LORO testnet repo, then follow{" "}
+          <a
+            href="https://git.vdb.to/cerc-io/testnet-laconicd-stack/src/branch/main/testnet-onboarding-validator.md#join-as-a-validator-on-stage1"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            these instructions
+          </a>{" "}
+          for joining stage 1 as a validator/service provider.
+        </Typography>
+      </Box>
+    </>
  );
 };

--- a/src/pages/SignWithCosmos.tsx
+++ b/src/pages/SignWithCosmos.tsx
@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import { enqueueSnackbar } from "notistack";

-import { Box, Card, CardContent, Grid, Typography } from "@mui/material";
+import { Box, Divider, Typography } from "@mui/material";
 import LoadingButton from "@mui/lab/LoadingButton/LoadingButton";
 import {
  MsgOnboardParticipantEncodeObject,
@ -11,31 +11,38 @@ import {
 import { StargateClient } from "@cosmjs/stargate";

 import { useWalletConnectContext } from "../context/WalletConnectContext";
-import TermsAndConditionsCard, {Role} from "../components/TermsAndConditionsCard";
+import SelectRoleCard, { Role } from "../components/SelectRoleCard";
+import { HASHED_SUBSCRIBER_ID_KEY } from "../constants";
+import { Layout } from "../layout/Layout";
+import { CodeBlock } from "../components/CodeBlock";

 const SignWithCosmos = () => {
  const { session, signClient } = useWalletConnectContext();

  const location = useLocation();
  const [isLoading, setIsLoading] = useState(false);
-  const [balance, setBalance] = useState('');
+  const [balance, setBalance] = useState("");
  const [isRequesting, setIsRequesting] = useState(false);
  const [isTncAccepted, setIsTncAccepted] = useState(false);
  const [role, setRole] = useState(Role.Participant);

  const navigate = useNavigate();

-  const {message: innerMessage, cosmosAddress, receivedEthSig: ethSignature, kycIdHash} = location.state as {
+  const {
+    message: innerMessage,
+    cosmosAddress,
+    receivedEthSig: ethSignature,
+  } = location.state as {
    message?: {
      msg: string;
      address: string;
    };
    cosmosAddress?: string;
    receivedEthSig?: string;
-    kycIdHash?: string;
  };

  const ethAddress = innerMessage!.address;
+  const subscriberIdHash = localStorage.getItem(HASHED_SUBSCRIBER_ID_KEY);

  const createCosmosClient = useCallback(async (endpoint: string) => {
    return await StargateClient.connect(endpoint);
@ -49,31 +56,36 @@ const SignWithCosmos = () => {
          participant: cosmosAddress!,
          ethPayload: innerMessage,
          ethSignature: ethSignature!,
-          kycId: kycIdHash!,
-          role
+          kycId: subscriberIdHash!,
+          role,
        },
      };
-    }, [cosmosAddress, innerMessage, ethSignature, kycIdHash, role]);
+    }, [cosmosAddress, innerMessage, ethSignature, subscriberIdHash, role]);

  const handleTokenRequest = async () => {
    try {
      setIsRequesting(true);
-      const response = await fetch(`${process.env.REACT_APP_FAUCET_ENDPOINT!}/faucet`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
+      const response = await fetch(
+        `${process.env.REACT_APP_FAUCET_ENDPOINT!}/faucet`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            address: cosmosAddress,
+          }),
        },
-        body: JSON.stringify({
-          address: cosmosAddress,
-        }),
-      });
+      );

      if (response.ok) {
-        enqueueSnackbar('Tokens sent successfully',  { variant: "success" });
+        enqueueSnackbar("Tokens sent successfully", { variant: "success" });
      } else {
        const errorResponse = await response.json();
        if (response.status === 429) {
-          enqueueSnackbar(`${response.statusText} : ${errorResponse.error}`, { variant: "error" });
+          enqueueSnackbar(`${response.statusText} : ${errorResponse.error}`, {
+            variant: "error",
+          });
        } else {
          throw new Error(errorResponse.error);
        }
@ -89,7 +101,7 @@ const SignWithCosmos = () => {
  };

  const sendTransaction = async (
-    transactionMessage: MsgOnboardParticipantEncodeObject
+    transactionMessage: MsgOnboardParticipantEncodeObject,
  ) => {
    if (!ethAddress) {
      enqueueSnackbar("Set nitro address");
@ -99,6 +111,10 @@ const SignWithCosmos = () => {
    try {
      setIsLoading(true);

+      enqueueSnackbar("View and sign the message from your Laconic Wallet", {
+        variant: "info",
+      });
+
      const params = { transactionMessage, signer: cosmosAddress };
      const responseFromWallet = await signClient!.request<{
        code: number;
@ -115,8 +131,8 @@ const SignWithCosmos = () => {
      } else {
        navigate("/onboarding-success", {
          state: {
-            cosmosAddress
-          }
+            cosmosAddress,
+          },
        });
      }
    } catch (error) {
@ -129,11 +145,16 @@ const SignWithCosmos = () => {

  const getBalances = useCallback(async () => {
    try {
-      const cosmosClient = await createCosmosClient(process.env.REACT_APP_LACONICD_RPC_ENDPOINT!);
-      const balance = await cosmosClient.getBalance(cosmosAddress!, process.env.REACT_APP_LACONICD_DENOM!);
+      const cosmosClient = await createCosmosClient(
+        process.env.REACT_APP_LACONICD_RPC_ENDPOINT!,
+      );
+      const balance = await cosmosClient.getBalance(
+        cosmosAddress!,
+        process.env.REACT_APP_LACONICD_DENOM!,
+      );
      setBalance(balance.amount);
    } catch (error) {
-      console.error('Error fetching balance:', error);
+      console.error("Error fetching balance:", error);
      throw error;
    }
  }, [cosmosAddress, createCosmosClient]);
@ -143,69 +164,58 @@ const SignWithCosmos = () => {
  }, [getBalances]);

  return (
-    <Box
-      sx={{
-        display: "flex",
-        flexDirection: "column",
-        marginTop: 6,
-        gap: 1,
-      }}
-    >
-      <Typography variant="h5" display={`${isTncAccepted ? "none" : "block"}`}>Please accept terms and conditions to continue</Typography>
-      <TermsAndConditionsCard handleAccept={() => setIsTncAccepted(true)} handleRoleChange={setRole}/>
-      <Typography variant="h5">Send transaction to chain</Typography>
-      <Typography>Cosmos Account:</Typography>
-      <Card className='mt-1 mb-1'>
-        <CardContent>
-          <Grid container spacing={2}>
-            <Grid item xs={9}>
-              <Typography variant="body1">Address: {cosmosAddress}</Typography>
-              <Typography variant="body1">Balance: {balance} {process.env.REACT_APP_LACONICD_DENOM}</Typography>
-            </Grid>
-            <Grid item xs={3} container justifyContent="flex-end">
-              <LoadingButton
-                variant="contained"
-                onClick={handleTokenRequest}
-                disabled={isTncAccepted ? isRequesting : !isTncAccepted}
-                loading={isRequesting}
-              >
-                Request tokens from Faucet
-              </LoadingButton>
-            </Grid>
-          </Grid>
-        </CardContent>
-      </Card>
-      <Typography variant="body1">
-        Onboarding message: <br />
-      </Typography>
-      <Box
-        sx={{
-          backgroundColor: "lightgray",
-          padding: 3,
-          wordWrap: "break-word",
-        }}
-      >
-        <pre style={{ whiteSpace: "pre-wrap", margin: 0 }}>
-          {JSON.stringify(onboardParticipantMsg, null, 2)}{" "}
-        </pre>
-      </Box>
-
-      <Box
-        sx={{
-          paddingBottom: 2,
-        }}>
+    <>
+      {!isTncAccepted && (
+        <Layout
+          title="Please accept the terms and conditions to continue"
+          noBackButton
+        >
+          <SelectRoleCard
+            handleAccept={() => setIsTncAccepted(true)}
+            handleRoleChange={setRole}
+          />
+        </Layout>
+      )}
+      <Layout title="Send transaction to chain" noBackButton>
+        <Typography>Laconic Account:</Typography>
+        <Box sx={{ backgroundColor: "#29292E", p: 2, borderRadius: 1, mb: 2 }}>
+          <Typography variant="body1">Address: {cosmosAddress}</Typography>
+          <Typography variant="body1">
+            Balance: {balance} {process.env.REACT_APP_LACONICD_DENOM}
+          </Typography>
+        </Box>
        <LoadingButton
          variant="contained"
-          onClick={async () => {
-            await sendTransaction(onboardParticipantMsg);
-          }}
-          loading={isLoading}
-          disabled={isTncAccepted ? (balance === '0') : !isTncAccepted}
+          onClick={handleTokenRequest}
+          disabled={isTncAccepted ? isRequesting : !isTncAccepted}
+          loading={isRequesting}
        >
-          Send transaction
+          Request tokens from Faucet
        </LoadingButton>
-      </Box>
-    </Box>
+        <Divider flexItem sx={{ my: 2 }} />
+        <Typography variant="body1">Onboarding message:</Typography>
+
+        <CodeBlock>{JSON.stringify(onboardParticipantMsg, null, 2)} </CodeBlock>
+
+        <Box
+          sx={{
+            paddingBottom: 2,
+            mt: 2,
+          }}
+        >
+          <LoadingButton
+            variant="contained"
+            onClick={async () => {
+              await sendTransaction(onboardParticipantMsg);
+            }}
+            loading={isLoading}
+            disabled={isTncAccepted ? balance === "0" : !isTncAccepted}
+          >
+            Send transaction
+          </LoadingButton>
+        </Box>
+      </Layout>
+    </>
  );
 };

--- a/src/pages/SignWithNitroKey.tsx
+++ b/src/pages/SignWithNitroKey.tsx
@ -1,33 +1,35 @@
 import React, { useState, useMemo, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import { enqueueSnackbar } from "notistack";
 import canonicalStringify from "canonical-json";
-import { ethers } from "ethers";

-import {
-  Select,
-  MenuItem,
-  Box,
-  Typography,
-} from "@mui/material";
-import LoadingButton from '@mui/lab/LoadingButton';
+import { Select, MenuItem, Box, Typography, Stack } from "@mui/material";
+import LoadingButton from "@mui/lab/LoadingButton";
 import { utf8ToHex } from "@walletconnect/encoding";

 import { useWalletConnectContext } from "../context/WalletConnectContext";
-import { ENABLE_KYC } from "../constants";
+import { ENABLE_KYC, HASHED_SUBSCRIBER_ID_KEY } from "../constants";
+import { Layout } from "../layout/Layout";
+import { CodeBlock } from "../components/CodeBlock";

 const SignWithNitroKey = () => {
-
-  const { session, signClient, checkPersistedState } =
-    useWalletConnectContext();
-
-  useEffect(() => {
-    if (signClient && !session) {
-      checkPersistedState(signClient);
-    }
-  }, [session, signClient, checkPersistedState]);
+  const { session, signClient, isSessionLoading } = useWalletConnectContext();

  const navigate = useNavigate();
+  const location = useLocation();
+
+  useEffect(() => {
+    if (isSessionLoading) {
+      return;
+    }
+
+    if (!session) {
+      navigate("/connect-wallet?redirectTo=sign-with-nitro-key", {
+        state: location.state,
+      });
+    }
+  }, [session, isSessionLoading, navigate, location.state]);
+
  const [ethAddress, setEthAddress] = useState("");
  const [ethSignature, setEthSignature] = useState("");

@ -35,6 +37,20 @@ const SignWithNitroKey = () => {

  const [isLoading, setIsLoading] = useState(false);

+  const subscriberIdHash = useMemo(() => {
+    return localStorage.getItem(HASHED_SUBSCRIBER_ID_KEY);
+  }, []);
+
+  useEffect(() => {
+    if (!subscriberIdHash) {
+      setIsLoading(false);
+      enqueueSnackbar(
+        "Subscriber ID not found. Please verify your email and try again",
+        { variant: "error" },
+      );
+    }
+  }, [subscriberIdHash]);
+
  const message = useMemo(() => {
    return {
      msg: "Register my account as a participant on the Laconic network",
@ -45,7 +61,12 @@ const SignWithNitroKey = () => {
  const signEth = async () => {
    if (session && signClient) {
      try {
-        setIsLoading(true)
+        setIsLoading(true);
+
+        enqueueSnackbar("View and sign the message from your Laconic Wallet", {
+          variant: "info",
+        });
+
        const jsonMessage = canonicalStringify(message);
        const hexMsg = utf8ToHex(jsonMessage, true);
        const receivedEthSig: string = await signClient!.request({
@ -56,7 +77,7 @@ const SignWithNitroKey = () => {
            params: [hexMsg, ethAddress],
          },
        });
-        setIsLoading(false)
+        setIsLoading(false);
        setEthSignature(ethSignature);

        if (ENABLE_KYC) {
@ -68,37 +89,26 @@ const SignWithNitroKey = () => {
            },
          });
        } else {
-          const kycIdHash = ethers.utils.sha256(ethers.utils.toUtf8Bytes(cosmosAddress));
-
          navigate("/sign-with-cosmos", {
            state: {
              message,
              cosmosAddress,
              receivedEthSig,
-              kycIdHash,
            },
          });
        }
      } catch (error) {
        console.log("err in signing ", error);
-        setIsLoading(false)
+        setIsLoading(false);
        enqueueSnackbar("Error signing message", { variant: "error" });
      }
    }
  };

  return (
-    <div>
+    <Layout title="New Session" noBackButton>
      {session ? (
-        <Box
-          sx={{
-            display: "flex",
-            flexDirection: "column",
-            marginTop: 6,
-            gap: 1,
-          }}
-        >
-          <Typography variant="h5">Sign with Nitro key</Typography>
+        <Stack spacing={2}>
          <Typography variant="body1">Select Laconic account:</Typography>
          <Select
            labelId="demo-simple-select-label"
@ -132,31 +142,25 @@ const SignWithNitroKey = () => {
            ))}
          </Select>

-          {(Boolean(ethAddress) && Boolean(cosmosAddress)) && (<Box
-            sx={{
-              backgroundColor: "lightgray",
-              padding: 3,
-              wordWrap: "break-word",
-            }}
-          >
-            <pre style={{ whiteSpace: "pre-wrap", margin: 0 }}>{canonicalStringify(message, null, 2)} </pre>
-          </Box>)}
+          {Boolean(ethAddress) && Boolean(cosmosAddress) && (
+            <CodeBlock>{canonicalStringify(message, null, 2)} </CodeBlock>
+          )}
          <Box>
            <LoadingButton
              variant="contained"
              onClick={signEth}
-              disabled={!Boolean(ethAddress)}
+              disabled={!Boolean(ethAddress) || !subscriberIdHash}
              sx={{ marginTop: 2 }}
              loading={isLoading}
            >
              Sign using Nitro key
            </LoadingButton>
          </Box>
-        </Box>
+        </Stack>
      ) : (
        <>Loading...</>
      )}
-    </div>
+    </Layout>
  );
 };

--- a/src/pages/TermsAndConditions.tsx
+++ b/src/pages/TermsAndConditions.tsx
@ -1,48 +0,0 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-
-import { Container, Typography, Button, Box, Paper } from '@mui/material';
-
-import { TNC_GENERIC_CONTENT } from '../constants';
-
-const TermsAndConditions = () => {
-  const navigate = useNavigate();
-
-  const handleAccept = () => {
-    navigate('/connect-wallet');
-  };
-
-  return (
-    <Container maxWidth="md">
-      <Paper elevation={3} style={{ padding: '2rem', marginTop: '2rem', height: '80vh', display: 'flex', flexDirection: 'column' }}>
-        <Typography variant="h4" gutterBottom>
-          Terms and Conditions
-        </Typography>
-        <Box
-          style={{
-            overflowY: 'auto',
-            flexGrow: 1,
-            paddingRight: '1rem',
-            marginBottom: '1rem',
-          }}
-        >
-          <Typography
-            variant="body1"
-            gutterBottom
-            component="div"
-          >
-            <div dangerouslySetInnerHTML={{__html: TNC_GENERIC_CONTENT}} />
-          </Typography>
-
-        </Box>
-        <Box mt={2} display="flex" justifyContent="center">
-          <Button variant="contained" color="primary" onClick={handleAccept}>
-            Accept
-          </Button>
-        </Box>
-      </Paper>
-    </Container>
-  );
-};
-
-export default TermsAndConditions;
--- a/src/pages/Thanks.tsx
+++ b/src/pages/Thanks.tsx
@ -0,0 +1,72 @@
+import React, { useEffect, useState } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { jwtDecode } from 'jwt-decode';
+import { ethers } from 'ethers';
+
+import { Box, colors, Typography } from '@mui/material';
+
+import { HASHED_SUBSCRIBER_ID_KEY } from '../constants';
+
+interface JwtPayload {
+  subscriber_id: string;
+  exp: number;
+  iss: string;
+  iat: number;
+}
+
+const Thanks: React.FC = () => {
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  const [err, setErr] = useState<string>();
+
+  useEffect(() => {
+    const queryParams = new URLSearchParams(location.search);
+    const token = queryParams.get('jwt_token');
+
+    try {
+      if (!token) {
+        throw new Error("Invalid JWT Token");
+      }
+
+      const decoded = jwtDecode(token) as JwtPayload;
+      const currentTime = Math.floor(Date.now() / 1000);
+
+      if (!decoded.subscriber_id) {
+        throw new Error("Subscriber ID not found");
+      }
+
+      if (decoded.exp < currentTime) {
+        throw new Error("Token has expired");
+      }
+
+      const subscriberIdBytes = ethers.utils.toUtf8Bytes(decoded.subscriber_id);
+      const subscriberIdHash = ethers.utils.sha256(subscriberIdBytes);
+
+      localStorage.setItem(HASHED_SUBSCRIBER_ID_KEY, subscriberIdHash);
+
+      navigate('/sign-with-nitro-key');
+    } catch (error) {
+      setErr(String(error));
+    }
+
+  }, [location.search, navigate]);
+
+  return (
+    <Box
+      display="flex"
+      flexDirection="column"
+      alignItems="center"
+      justifyContent="center"
+      marginY={20}
+      marginX={50}
+      padding={5}
+    >
+      <Typography variant="h4" component="h1" gutterBottom color={colors.red[400]}>
+        {err ? err : "Loading..."}
+      </Typography>
+    </Box>
+  );
+};
+
+export default Thanks;
--- a/src/pages/UserVerification.tsx
+++ b/src/pages/UserVerification.tsx
@ -45,13 +45,14 @@ const UserVerification = () => {
  useEffect(() => {
    if (applicationSubmitted && kycId !== '') {
      const kycIdHash = ethers.utils.sha256(ethers.utils.toUtf8Bytes(kycId));
+
      navigate("/sign-with-cosmos", {
        state: {
          message,
          cosmosAddress,
          receivedEthSig,
-          kycIdHash,
-        }})
+          kycIdHash
+        }});
    }
  }, [applicationSubmitted, kycId, navigate, cosmosAddress, message, receivedEthSig]);

--- a/src/pages/Validator.tsx
+++ b/src/pages/Validator.tsx
@ -0,0 +1,279 @@
+import React, { useEffect, useMemo, useState } from "react";
+import { enqueueSnackbar } from "notistack";
+import { useNavigate } from "react-router-dom";
+import { MsgCreateValidator } from "cosmjs-types/cosmos/staking/v1beta1/tx";
+
+import {
+  Box,
+  Link,
+  MenuItem,
+  Select,
+  TextField,
+  Typography,
+} from "@mui/material";
+import { fromBech32, toBech32 } from "@cosmjs/encoding";
+import { LoadingButton } from "@mui/lab";
+import { EncodeObject, encodePubkey } from "@cosmjs/proto-signing";
+import { Registry } from "@cerc-io/registry-sdk";
+
+import { useWalletConnectContext } from "../context/WalletConnectContext";
+import { Participant } from "../types";
+import { Layout } from "../layout/Layout";
+import { CodeBlock } from "../components/CodeBlock";
+
+const Validator = () => {
+  const { session, signClient, isSessionLoading } = useWalletConnectContext();
+  const navigate = useNavigate();
+
+  const [cosmosAddress, setCosmosAddress] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  const [moniker, setMoniker] = useState("");
+  const [pubKey, setPubKey] = useState("");
+  const [participant, setParticipant] = useState<Participant | null>(null);
+  const [isError, setIsError] = useState(false);
+
+  useEffect(() => {
+    if (isSessionLoading) {
+      return;
+    }
+
+    if (!session) {
+      navigate("/connect-wallet?redirectTo=validator");
+    }
+  }, [session, navigate, isSessionLoading]);
+
+  useEffect(() => {
+    if (!cosmosAddress) {
+      setParticipant(null);
+      return;
+    }
+
+    const fetchParticipant = async () => {
+      const registry = new Registry(
+        process.env.REACT_APP_REGISTRY_GQL_ENDPOINT!,
+      );
+
+      try {
+        const fetchedParticipant =
+          await registry.getParticipantByAddress(cosmosAddress);
+        if (fetchedParticipant) {
+          setParticipant(fetchedParticipant);
+        } else {
+          throw new Error("Participant not found");
+        }
+      } catch (error) {
+        console.error("Error fetching participant", error);
+        enqueueSnackbar("Error in fetching participant", { variant: "error" });
+        setParticipant(null);
+      }
+    };
+
+    fetchParticipant();
+  }, [cosmosAddress]);
+
+  const isMonikerValid = useMemo(() => moniker.trim().length > 0, [moniker]);
+  const isPubKeyValid = useMemo(() => pubKey.length === 44, [pubKey]);
+
+  const msgCreateValidator: MsgCreateValidator = useMemo(() => {
+    const encodedPubKey = encodePubkey({
+      type: "tendermint/PubKeyEd25519",
+      value: pubKey.length === 44 ? pubKey : "",
+    });
+
+    return {
+      description: {
+        moniker,
+        identity: "",
+        website: "",
+        securityContact: "",
+        details: "",
+      },
+      commission: {
+        maxChangeRate: "10000000000000000", // 0.01
+        maxRate: "200000000000000000", // 0.2
+        rate: "100000000000000000", // 0.1
+      },
+      minSelfDelegation: "1",
+      delegatorAddress: "",
+      validatorAddress:
+        cosmosAddress &&
+        toBech32("laconicvaloper", fromBech32(cosmosAddress).data),
+      pubkey: encodedPubKey,
+      value: {
+        amount: process.env.REACT_APP_STAKING_AMOUNT!,
+        denom: process.env.REACT_APP_LACONICD_DENOM!,
+      },
+    };
+  }, [cosmosAddress, pubKey, moniker]);
+
+  const msgCreateValidatorEncodeObject: EncodeObject = {
+    typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator",
+    value: MsgCreateValidator.toJSON(msgCreateValidator),
+  };
+
+  const sendTransaction = async () => {
+    if (
+      !isMonikerValid ||
+      !isPubKeyValid ||
+      !msgCreateValidator.validatorAddress
+    ) {
+      setIsError(true);
+      return;
+    }
+
+    setIsLoading(true);
+    enqueueSnackbar("View and sign the message from your Laconic Wallet", {
+      variant: "info",
+    });
+
+    try {
+      const params = {
+        transactionMessage: msgCreateValidatorEncodeObject,
+        signer: cosmosAddress,
+      };
+      const response = await signClient!.request<{ code: number }>({
+        topic: session!.topic,
+        chainId: `cosmos:${process.env.REACT_APP_LACONICD_CHAIN_ID}`,
+        request: {
+          method: "cosmos_sendTransaction",
+          params,
+        },
+      });
+
+      if (response.code !== 0) {
+        throw new Error("Transaction not sent");
+      } else {
+        navigate("/validator-success", {
+          state: { validatorAddress: msgCreateValidator.validatorAddress },
+        });
+      }
+    } catch (error) {
+      console.error("Error sending transaction", error);
+      enqueueSnackbar("Error in sending transaction", { variant: "error" });
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const replacer = (_key: string, value: any): any => {
+    if (value instanceof Uint8Array) {
+      return Buffer.from(value).toString("hex");
+    }
+    return value;
+  };
+
+  return (
+    <Layout title="Create a validator">
+      <Typography variant="body1">Select Laconic account:</Typography>
+      <Select
+        sx={{ marginBottom: 2 }}
+        id="cosmos-address-select"
+        value={cosmosAddress}
+        onChange={(e) => setCosmosAddress(e.target.value)}
+        style={{ maxWidth: "600px", display: "block" }}
+      >
+        {session?.namespaces.cosmos.accounts.map((address, index) => (
+          <MenuItem value={address.split(":")[2]} key={index}>
+            {address.split(":")[2]}
+          </MenuItem>
+        ))}
+      </Select>
+
+      {Boolean(cosmosAddress) && (
+        <>
+          {participant ? (
+            <Typography>Onboarded participant</Typography>
+          ) : (
+            <Typography>No participant found</Typography>
+          )}
+
+          {participant && (
+            <CodeBlock>
+              Laconic Address: {participant.cosmosAddress} <br />
+              Nitro Address: {participant.nitroAddress} <br />
+              Role: {participant.role} <br />
+              KYC ID: {participant.kycId} <br />
+            </CodeBlock>
+          )}
+
+          {participant?.role === "validator" && (
+            <>
+              <Box style={{ maxWidth: "600px" }}>
+                <TextField
+                  id="moniker"
+                  label="Enter your node moniker (example: AliceNode)"
+                  variant="outlined"
+                  fullWidth
+                  margin="normal"
+                  value={moniker}
+                  onChange={(e) => {
+                    setIsError(false);
+                    setMoniker(e.target.value);
+                  }}
+                  error={!isMonikerValid && isError}
+                  helperText={
+                    !isMonikerValid && isError ? "Moniker is required" : ""
+                  }
+                />
+              </Box>
+
+              <Typography sx={{ marginTop: 3 }}>
+                Fetch your validator public key using the following command
+                (refer&nbsp;
+                <Link
+                  href="https://git.vdb.to/cerc-io/testnet-laconicd-stack/src/branch/main/testnet-onboarding-validator.md#join-as-testnet-validator"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  this guide
+                </Link>
+                )
+              </Typography>
+
+              <CodeBlock>
+                {`laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd cometbft show-validator" | jq -r .key`}
+              </CodeBlock>
+
+              <Box sx={{ maxWidth: "600px" }}>
+                <TextField
+                  id="pub-key"
+                  label="Enter your validator public key"
+                  variant="outlined"
+                  fullWidth
+                  margin="normal"
+                  value={pubKey}
+                  onChange={(e) => {
+                    setIsError(false);
+                    setPubKey(e.target.value);
+                  }}
+                  error={!isPubKeyValid && isError}
+                  helperText={
+                    !isPubKeyValid && isError
+                      ? "Public key must be 44 characters"
+                      : ""
+                  }
+                />
+              </Box>
+              <Typography>Send transaction to chain</Typography>
+              <CodeBlock>
+                {JSON.stringify(msgCreateValidator, replacer, 2)}
+              </CodeBlock>
+              <Box marginTop={1} marginBottom={1}>
+                <LoadingButton
+                  variant="contained"
+                  onClick={sendTransaction}
+                  loading={isLoading}
+                  disabled={isError}
+                >
+                  Send transaction
+                </LoadingButton>
+              </Box>
+            </>
+          )}
+        </>
+      )}
+    </Layout>
+  );
+};
+
+export default Validator;
--- a/src/pages/ValidatorSuccess.tsx
+++ b/src/pages/ValidatorSuccess.tsx
@ -0,0 +1,35 @@
+import React from "react";
+import { useLocation } from "react-router-dom";
+
+import { Link, Typography } from "@mui/material";
+import { Layout } from "../layout/Layout";
+import { CodeBlock } from "../components/CodeBlock";
+
+const ValidatorSuccess = () => {
+  const location = useLocation();
+  const { validatorAddress } = location.state as {
+    validatorAddress?: string;
+  };
+
+  return (
+    <Layout title="Validator created successfully">
+      <Typography sx={{ marginTop: 3 }}>
+        You can view your validator details using the following command
+        (Refer&nbsp;
+        <Link
+          href="https://git.vdb.to/cerc-io/testnet-laconicd-stack/src/branch/main/testnet-onboarding-validator.md#join-as-testnet-validator"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          this guide
+        </Link>
+        )
+      </Typography>
+      <CodeBlock>
+        {`laconic-so deployment --dir testnet-laconicd-deployment exec laconicd "laconicd query staking validators --output json" | jq '.validators[] | select(.operator_address == "${validatorAddress}")'`}
+      </CodeBlock>
+    </Layout>
+  );
+};
+
+export default ValidatorSuccess;
--- a/src/pages/VerifyEmail.tsx
+++ b/src/pages/VerifyEmail.tsx
@ -0,0 +1,24 @@
+import React from 'react';
+
+const VerifyEmail = () => {
+  return (
+    <div style={{ display: 'flex', justifyContent: 'center', margin: '20vh' }}>
+      <iframe
+        title="verify-email"
+        src="https://embeds.beehiiv.com/18aaa245-3652-4b0a-94a9-a87054df4914"
+        data-test-id="beehiiv-embed"
+        width="480"
+        height="320"
+        frameBorder="0"
+        scrolling="no"
+        style={{
+          borderRadius: '4px',
+          border: '2px solid #e5e7eb',
+          backgroundColor: 'transparent',
+        }}
+      ></iframe>
+    </div>
+  );
+};
+
+export default VerifyEmail;
--- a/src/types.ts
+++ b/src/types.ts
@ -0,0 +1,6 @@
+export interface Participant {
+    cosmosAddress: string;
+    nitroAddress: string;
+    role: string;
+    kycId: string;
+  }
--- a/src/utils/sumsub.ts
+++ b/src/utils/sumsub.ts
@ -29,5 +29,5 @@ export const getAccessTokenExpirationHandler = (userId: string) => {
  return async () => {
    const newToken = await fetchAccessToken(userId);
    return newToken;
-  }
+  };
 };
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
zramsay	eba6cd5d68	Merge pull request 'Skin onboarding app' (#33 ) from style/vaidator into main Reviewed-on: cerc-io/testnet-onboarding-app#33	2024-08-11 21:05:04 +00:00
zramsay	5baccf3a84	bump version	2024-08-11 17:02:20 -04:00
Cody Bender	b39afe386f	style: validator success page	2024-08-11 12:34:35 -04:00
Cody Bender	565d1887e0	style: add codeblock and style validator page	2024-08-11 12:32:55 -04:00
zramsay	e6fa6aabd7	copy: fix role names	2024-08-11 15:53:43 +05:30
Cody Bender	3fe0576f34	style: add back t&c text and style pre block	2024-08-11 15:30:40 +05:30
Monkey	31e3b75dfa	remove width setting for terms and conditions	2024-08-11 15:29:59 +05:30
Cody Bender	bee7379e86	style: sign with cosmos	2024-08-11 15:29:58 +05:30
Cody Bender	bff5ab9f31	style: sign with nitro	2024-08-11 15:28:14 +05:30
Cody Bender	051de43480	chore: add dm mono	2024-08-11 15:28:14 +05:30
Cody Bender	ad614aff2f	style: remove disclaimer and center button	2024-08-11 15:28:14 +05:30
Cody Bender	c038085b87	style: first pass with dark mui theme	2024-08-11 15:28:09 +05:30
nabarun	09104b50bf	Add download button for terms and conditions PDF (#31 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) - Replace Cosmos address with Laconic address Co-authored-by: Shreerang Kale <shreerangkale@gmail.com> Reviewed-on: cerc-io/testnet-onboarding-app#31	2024-08-11 09:47:18 +00:00
nabarun	663eb42a74	Wait for session to load before redirecting (#29 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) Co-authored-by: Shreerang Kale <shreerangkale@gmail.com> Reviewed-on: cerc-io/testnet-onboarding-app#29	2024-08-09 13:00:30 +00:00
nabarun	8ba837b2f4	Add functionality to create a validator (#28 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) Co-authored-by: Adw8 <adwaitgharpure@gmail.com> Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com> Co-authored-by: IshaVenikar <ishavenikar7@gmail.com> Co-authored-by: Shreerang Kale <shreerangkale@gmail.com> Reviewed-on: cerc-io/testnet-onboarding-app#28	2024-08-09 10:18:13 +00:00
nabarun	fc1c8df06b	Persist subscriber ID in local storage (#26 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) - Disable nitro key sign button if subscribe ID does not exist Co-authored-by: Shreerang Kale <shreerangkale@gmail.com> Reviewed-on: cerc-io/testnet-onboarding-app#26	2024-08-09 06:24:29 +00:00
nabarun	aa9aed89f2	Modify app UI content (#25 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) and issues: - cerc-io/testnet-onboarding-app#19 - cerc-io/testnet-onboarding-app#20 - cerc-io/testnet-onboarding-app#23 Co-authored-by: IshaVenikar <ishavenikar7@gmail.com> Reviewed-on: cerc-io/testnet-onboarding-app#25	2024-08-09 06:02:08 +00:00
Nabarun	74542a56a5	Fix react-pdf for prod build (#15 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) Reviewed-on: cerc-io/testnet-onboarding-app#15 Co-authored-by: Nabarun <nabarun@deepstacksoft.com> Co-committed-by: Nabarun <nabarun@deepstacksoft.com>	2024-08-08 12:58:57 +00:00
Nabarun	989251dc58	Add loader at app start (#14 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) Reviewed-on: cerc-io/testnet-onboarding-app#14 Co-authored-by: Nabarun <nabarun@deepstacksoft.com> Co-committed-by: Nabarun <nabarun@deepstacksoft.com>	2024-08-08 10:38:53 +00:00
nabarun	c041f031dc	Integrate Beehiiv email verification in onboarding flow (#13 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) - Add beehiiv widget for email verification - Extract subscriber ID from the JWT - Hash subscriber ID to be used as KYC ID Co-authored-by: Shreerang Kale <shreerangkale@gmail.com> Reviewed-on: cerc-io/testnet-onboarding-app#13	2024-08-08 10:06:34 +00:00
nabarun	11f872032e	Use PDF for showing terms and conditions (#12 ) Part of [laconicd testnet validator enrollment](https://www.notion.so/laconicd-testnet-validator-enrollment-6fc1d3cafcc64fef8c5ed3affa27c675) - Use `react-pdf` to display terms and conditions pdf Co-authored-by: IshaVenikar <ishavenikar7@gmail.com> Reviewed-on: cerc-io/testnet-onboarding-app#12	2024-08-08 09:39:26 +00:00