diff --git a/client/src/assets/revolut.png b/client/src/assets/revolut.png
deleted file mode 100644
index c1ff962..0000000
Binary files a/client/src/assets/revolut.png and /dev/null differ
diff --git a/client/src/components/Button/index.tsx b/client/src/components/Button/index.tsx
index 2963f2d..a30e532 100644
--- a/client/src/components/Button/index.tsx
+++ b/client/src/components/Button/index.tsx
@@ -6,13 +6,16 @@ export const PrimaryButton = styled.button`
   align-items: center;
   justify-content: center;
   width: 100%;
-  padding: 16px;
+  padding: 19px 16px;
   background-color: ${({ theme }) => theme.accent1};
   border: 0;
   border-radius: 12px;
   font-weight: 500;
   text-decoration: none;
   cursor: pointer;
+  color: ${({ theme }) => theme.neutral1};
+  font-size: 16px;
+  font-weight: 485;
 
   &:disabled {
     background-color: ${({ theme }) => theme.surface};
diff --git a/client/src/components/Card/index.tsx b/client/src/components/Card/index.tsx
index 320ce34..e1895e7 100644
--- a/client/src/components/Card/index.tsx
+++ b/client/src/components/Card/index.tsx
@@ -5,7 +5,7 @@ import { Column } from '../Flex'
 // eslint-disable-next-line import/no-unused-modules
 export const Card = styled(Column)<{ bg?: string }>`
   width: 100%;
-  padding: ${({ theme }) => theme.grids.md};
+  padding: 12px;
   background-color: ${({ bg = 'bg2', theme }) => theme[bg]};
   border: 1px solid ${({ theme }) => theme.border};
   border-radius: 6px;
diff --git a/client/src/components/ConnectWalletModal/index.tsx b/client/src/components/ConnectWalletModal/index.tsx
index ebceaa7..7100ffd 100644
--- a/client/src/components/ConnectWalletModal/index.tsx
+++ b/client/src/components/ConnectWalletModal/index.tsx
@@ -47,7 +47,7 @@ export const ConnectWalletModal = (props: React.ComponentPropsWithoutRef<typeof
 
   return (
     <Container gap={16} {...props}>
-      <ThemedText.Title fontWeight={400}>Connect wallet</ThemedText.Title>
+      <ThemedText.HeadlineSmall fontWeight={400}>Connect wallet</ThemedText.HeadlineSmall>
 
       <ConnectorsList gap={4}>
         {connectors
@@ -56,7 +56,7 @@ export const ConnectWalletModal = (props: React.ComponentPropsWithoutRef<typeof
             <ConnectorCard as="button" key={connector.id} gap={16} onClick={() => connect({ connector })}>
               <img src={connector.icon.dark} alt={connector.name} width={32} height={32} />
 
-              <ThemedText.Title fontWeight={400}>{connector.name}</ThemedText.Title>
+              <ThemedText.BodyPrimary>{connector.name}</ThemedText.BodyPrimary>
             </ConnectorCard>
           ))}
       </ConnectorsList>
diff --git a/client/src/components/CurrencyButton/index.tsx b/client/src/components/CurrencyButton/index.tsx
index b6ff7d7..634aeda 100644
--- a/client/src/components/CurrencyButton/index.tsx
+++ b/client/src/components/CurrencyButton/index.tsx
@@ -1,6 +1,5 @@
 import { Currency } from 'src/constants/currencies'
 import { ThemedText } from 'src/theme/components'
-import { ChevronDown } from 'src/theme/components/icons'
 import styled from 'styled-components'
 
 import { Row } from '../Flex'
@@ -8,8 +7,7 @@ import { Row } from '../Flex'
 const CurrencyCard = styled(Row)`
   background-color: ${({ theme }) => theme.bg2};
   color: ${({ theme }) => theme.neutral1};
-  padding: ${({ theme }) => theme.grids.xs};
-  padding-right: ${({ theme }) => theme.grids.sm};
+  padding: 4px 8px 4px 4px;
   border: 1px solid ${({ theme }) => theme.border};
   border-radius: 99px;
 
@@ -17,36 +15,20 @@ const CurrencyCard = styled(Row)`
     width: 28px;
     height: 28px;
     border-radius: 28px;
+    object-fit: cover;
   }
 `
 
-type CurrencyButtonProps<
-  TSymbols extends string,
-  TCurrency extends Currency,
-  TAvailableCurrencies extends Record<TSymbols, TCurrency>
-> = {
-  selectedCurrency: keyof TAvailableCurrencies
-  availableCurrencies: TAvailableCurrencies
+interface CurrencyButtonProps {
+  selectedCurrency: Currency
 }
 
-export const CurrencyButton = <
-  TSymbols extends string,
-  TCurrency extends Currency,
-  TAvailableCurrencies extends Record<TSymbols, TCurrency>
->(
-  props: CurrencyButtonProps<TSymbols, TCurrency, TAvailableCurrencies>
-) => {
-  const { selectedCurrency, availableCurrencies } = props
-
-  const currency = availableCurrencies[selectedCurrency]
-
+export function CurrencyButton({ selectedCurrency }: CurrencyButtonProps) {
   return (
     <CurrencyCard as="button" gap={4}>
-      <img src={currency.img} alt={currency.name} />
-
-      <ThemedText.Title fontWeight={500}>{currency.name}</ThemedText.Title>
+      <img src={selectedCurrency.img} alt={selectedCurrency.name} />
 
-      <ChevronDown width={18} height={18} />
+      <ThemedText.BodyPrimary fontWeight={500}>{selectedCurrency.name}</ThemedText.BodyPrimary>
     </CurrencyCard>
   )
 }
diff --git a/client/src/components/GenerateProofModal/index.tsx b/client/src/components/GenerateProofModal/index.tsx
index c249c78..c3185dc 100644
--- a/client/src/components/GenerateProofModal/index.tsx
+++ b/client/src/components/GenerateProofModal/index.tsx
@@ -1,3 +1,4 @@
+import { useCloseModal, useProofGenerationModal } from 'src/hooks/useModal'
 import { ThemedText } from 'src/theme/components'
 import { Logo } from 'src/theme/components/icons'
 
@@ -6,28 +7,28 @@ import Content from '../Modal/Content'
 import Overlay from '../Modal/Overlay'
 import Portal from '../Portal'
 
-function GenerateProofModalContent() {
-  return (
-    <Content title="Proof generation">
-      <Column gap={42} alignItems="center">
-        <Column gap={16}>
-          <Logo width={42} height={42} />
-
-          <ThemedText.HeadlineSmall>Snarkification of the elliptic curve...</ThemedText.HeadlineSmall>
-        </Column>
+export default function GenerateProofModal() {
+  // modal
+  const [isOpen] = useProofGenerationModal()
+  const close = useCloseModal()
 
-        <ThemedText.BodySecondary fontSize={16}>This might take a while</ThemedText.BodySecondary>
-      </Column>
-    </Content>
-  )
-}
+  if (!isOpen) return null
 
-export default function GenerateProofModal() {
   return (
     <Portal>
-      <GenerateProofModalContent />
+      <Content title="Proof generation" close={close}>
+        <Column gap={42} alignItems="center">
+          <Column gap={16}>
+            <Logo width={42} height={42} />
+
+            <ThemedText.HeadlineSmall>Snarkification of the elliptic curve...</ThemedText.HeadlineSmall>
+          </Column>
+
+          <ThemedText.BodySecondary fontSize={16}>This might take a while</ThemedText.BodySecondary>
+        </Column>
+      </Content>
 
-      <Overlay />
+      <Overlay onClick={close} />
     </Portal>
   )
 }
diff --git a/client/src/components/Header/index.tsx b/client/src/components/Header/index.tsx
index da4986b..0be374a 100644
--- a/client/src/components/Header/index.tsx
+++ b/client/src/components/Header/index.tsx
@@ -17,8 +17,6 @@ const Container = styled(Row)`
 
 const Link = styled(ThemedText.BodyPrimary)`
   color: rgba(255, 255, 255, 0.7);
-  font-weight: 500;
-  font-size: 18px;
   text-decoration: none;
 
   &.active {
@@ -88,9 +86,9 @@ export default function Header() {
         <AccountChip as="button" gap={4} onClick={showWalletSidebar}>
           <AccountStatusIcon />
 
-          <ThemedText.Title fontWeight={400}>
+          <ThemedText.BodyPrimary>
             {address.slice(0, 6)}...{address.slice(-4)}
-          </ThemedText.Title>
+          </ThemedText.BodyPrimary>
         </AccountChip>
       ) : (
         <ConnectContainer>
diff --git a/client/src/components/WalletConnect/ConnectionOption.tsx b/client/src/components/WalletConnect/ConnectionOption.tsx
index ec999fa..2ed739e 100644
--- a/client/src/components/WalletConnect/ConnectionOption.tsx
+++ b/client/src/components/WalletConnect/ConnectionOption.tsx
@@ -1,4 +1,5 @@
 import { Connector, useConnect } from '@starknet-react/core'
+import { ThemedText } from 'src/theme/components'
 import { styled } from 'styled-components'
 
 import { Row } from '../Flex'
@@ -13,6 +14,7 @@ const OptionRow = styled(Row)`
   cursor: pointer;
   padding: 12px;
   border-radius: 10px;
+
   &:hover {
     background-color: ${({ theme }) => theme.white};
     color: ${({ theme }) => theme.black};
@@ -30,7 +32,7 @@ function Option({ connection, activate }: OptionProps) {
       ) : (
         <img width="32" height="32" src={connection.icon.dark} />
       )}
-      <p style={{ margin: '0' }}>{connection.name}</p>
+      <ThemedText.BodyPrimary>{connection.name}</ThemedText.BodyPrimary>
     </OptionRow>
   )
 }
diff --git a/client/src/components/WalletSidebar/index.tsx b/client/src/components/WalletSidebar/index.tsx
index 342d7a7..075beed 100644
--- a/client/src/components/WalletSidebar/index.tsx
+++ b/client/src/components/WalletSidebar/index.tsx
@@ -77,9 +77,9 @@ export default function WalletSidebar({ onClose }: WalletSidebarProps) {
         <WalletInfo>
           <Row gap={12}>
             <StarknetLogo width={40} height={40} />
-            <ThemedText.Title fontWeight={500}>
+            <ThemedText.BodyPrimary>
               {address.slice(0, 6)}...{address.slice(-4)}
-            </ThemedText.Title>
+            </ThemedText.BodyPrimary>
           </Row>
 
           <CloseButton onClick={onClose}>
diff --git a/client/src/constants/currencies.ts b/client/src/constants/currencies.ts
index b9403a5..ca4d04d 100644
--- a/client/src/constants/currencies.ts
+++ b/client/src/constants/currencies.ts
@@ -6,23 +6,15 @@ export type Currency = {
   name: string
 }
 
-export enum FIAT_CURRENCY {
-  EUR = 'EUR',
-}
-
-export enum TOKEN_CURRENCY {
-  USDC = 'USDC',
-}
-
 export const FIAT_CURRENCIES = {
-  [FIAT_CURRENCY.EUR]: {
+  EUR: {
     img: EURLogo,
     name: 'EUR',
   },
 }
 
 export const TOKEN_CURRENCIES = {
-  [TOKEN_CURRENCY.USDC]: {
+  USDC: {
     img: USDCLogo,
     name: 'USDC',
   },
diff --git a/client/src/hooks/useModal.ts b/client/src/hooks/useModal.ts
index 326a8a8..ef3eb37 100644
--- a/client/src/hooks/useModal.ts
+++ b/client/src/hooks/useModal.ts
@@ -25,3 +25,5 @@ function useModal(modal: ModalType): [boolean, () => void] {
 export const useWalletConnectModal = () => useModal(ModalType.WALLET_CONNECT)
 // eslint-disable-next-line import/no-unused-modules
 export const useWalletOverviewModal = () => useModal(ModalType.WALLET_OVERVIEW)
+
+export const useProofGenerationModal = () => useModal(ModalType.PROOF_GENERATION)
diff --git a/client/src/pages/Register.tsx b/client/src/pages/Register.tsx
index 31c2391..25eed87 100644
--- a/client/src/pages/Register.tsx
+++ b/client/src/pages/Register.tsx
@@ -1,27 +1,22 @@
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 import { PrimaryButton } from 'src/components/Button'
 import { Column, Row } from 'src/components/Flex'
 import GenerateProofModal from 'src/components/GenerateProofModal'
+import { useProofGenerationModal } from 'src/hooks/useModal'
 import { ThemedText } from 'src/theme/components'
 import { LockClosed, LockOpen } from 'src/theme/components/icons'
 import { styled, useTheme } from 'styled-components'
 
-const Layout = styled(Column)`
-  width: 100%;
-  margin: 0 auto;
-  justify-content: center;
-  flex: 1;
-`
-
 const Content = styled(Column)`
   max-width: 464px;
   width: 100%;
+  margin: 120px auto 0;
 `
 
 const Headline = styled(Row)`
   width: 100%;
   justify-content: space-between;
-  margin-bottom: ${({ theme }) => theme.grids.md};
+  margin-bottom: 12px;
 `
 
 const ContentCard = styled(Column)`
@@ -54,22 +49,17 @@ const ProofCard = styled(Row)`
 `
 
 export default function RegisterPage() {
+  // theme
   const theme = useTheme()
+
+  // modal
+  const [, toggleProofGenerationModal] = useProofGenerationModal()
+
   const [revtag, setRevtag] = useState('')
-  const [generatingProof, setGeneratingProof] = useState(false)
-  const [proven, setProven] = useState(false)
-
-  useEffect(() => {
-    if (generatingProof) {
-      setTimeout(() => {
-        setProven(true)
-        setGeneratingProof(false)
-      }, 5_000)
-    }
-  }, [generatingProof])
+  const [proven] = useState(false)
 
   return (
-    <Layout>
+    <>
       <Content gap={12}>
         <Headline>
           <ThemedText.HeadlineLarge>Register</ThemedText.HeadlineLarge>
@@ -79,13 +69,11 @@ export default function RegisterPage() {
           <>
             <ContentCard>
               <NoDataCard>
-                <ThemedText.Title fontWeight={500}>No data detected</ThemedText.Title>
+                <ThemedText.BodyPrimary fontWeight={500}>No data detected</ThemedText.BodyPrimary>
               </NoDataCard>
             </ContentCard>
 
-            <PrimaryButton onClick={() => setRevtag('chqrlesjuzw')}>
-              <ThemedText.Title>Open sidebar</ThemedText.Title>
-            </PrimaryButton>
+            <PrimaryButton onClick={() => setRevtag('chqrlesjuzw')}>Open sidebar</PrimaryButton>
           </>
         )}
 
@@ -107,19 +95,21 @@ export default function RegisterPage() {
                 {proven ? (
                   <ThemedText.BodyPrimary>Proved</ThemedText.BodyPrimary>
                 ) : (
-                  <ThemedText.BodySecondary fontWeight={500}>Unproved</ThemedText.BodySecondary>
+                  <ThemedText.BodySecondary>Unproved</ThemedText.BodySecondary>
                 )}
               </ProofCard>
             </ContentCard>
 
-            <PrimaryButton onClick={() => !proven && setGeneratingProof(true)}>
-              <ThemedText.Title>{proven ? 'Complete registration' : 'Generate proof'}</ThemedText.Title>
-            </PrimaryButton>
+            {proven ? (
+              <PrimaryButton>Complete registration</PrimaryButton>
+            ) : (
+              <PrimaryButton onClick={toggleProofGenerationModal}>Generate proof</PrimaryButton>
+            )}
           </>
         )}
       </Content>
 
-      {generatingProof && <GenerateProofModal />}
-    </Layout>
+      <GenerateProofModal />
+    </>
   )
 }
diff --git a/client/src/pages/Registration.tsx b/client/src/pages/Registration.tsx
index deaddf9..d532004 100644
--- a/client/src/pages/Registration.tsx
+++ b/client/src/pages/Registration.tsx
@@ -5,22 +5,16 @@ import { ThemedText } from 'src/theme/components'
 import { Empty, Plus } from 'src/theme/components/icons'
 import { styled } from 'styled-components'
 
-const Layout = styled(Column)`
-  width: 100%;
-  margin: 0 auto;
-  justify-content: center;
-  flex: 1;
-`
-
 const Content = styled(Column)`
   max-width: 850px;
   width: 100%;
+  margin: 120px auto 0;
 `
 
 const Headline = styled(Row)`
   width: 100%;
   justify-content: space-between;
-  margin-bottom: ${({ theme }) => theme.grids.md};
+  margin-bottom: 12px;
 `
 
 const RegisterButton = styled(PrimaryButton)`
@@ -48,27 +42,25 @@ const EmptyCard = styled(Column)`
 
 export default function RegistrationPage() {
   return (
-    <Layout>
-      <Content gap={12}>
-        <Headline>
-          <ThemedText.HeadlineLarge>Registration</ThemedText.HeadlineLarge>
+    <Content gap={12}>
+      <Headline>
+        <ThemedText.HeadlineLarge>Registration</ThemedText.HeadlineLarge>
 
-          <RegisterButton as={Link} to="/registration/register">
-            <Plus width={13} height={13} />
-            <ThemedText.Title fontWeight={500}>Register</ThemedText.Title>
-          </RegisterButton>
-        </Headline>
+        <RegisterButton as={Link} to="/registration/register">
+          <Plus width={13} height={13} />
+          Register
+        </RegisterButton>
+      </Headline>
 
-        <ContentCard>
-          <EmptyCard>
-            <Empty width={42} height={42} />
+      <ContentCard>
+        <EmptyCard>
+          <Empty width={42} height={42} />
 
-            <ThemedText.BodyPrimary textAlign="center" maxWidth={220}>
-              Your registered accounts will appear here.
-            </ThemedText.BodyPrimary>
-          </EmptyCard>
-        </ContentCard>
-      </Content>
-    </Layout>
+          <ThemedText.BodyPrimary textAlign="center" maxWidth={220}>
+            Your registered accounts will appear here.
+          </ThemedText.BodyPrimary>
+        </EmptyCard>
+      </ContentCard>
+    </Content>
   )
 }
diff --git a/client/src/pages/Swap.tsx b/client/src/pages/Swap.tsx
index 8db6410..240aa47 100644
--- a/client/src/pages/Swap.tsx
+++ b/client/src/pages/Swap.tsx
@@ -1,56 +1,27 @@
 import { ChangeEvent, useState } from 'react'
-import RevolutLogo from 'src/assets/revolut.png'
 import { PrimaryButton } from 'src/components/Button'
 import { CurrencyButton } from 'src/components/CurrencyButton'
 import { Column, Row } from 'src/components/Flex'
 import { CurrencyInput } from 'src/components/Input'
-import { FIAT_CURRENCIES, FIAT_CURRENCY, TOKEN_CURRENCIES, TOKEN_CURRENCY } from 'src/constants/currencies'
+import { FIAT_CURRENCIES, TOKEN_CURRENCIES } from 'src/constants/currencies'
 import { ThemedText } from 'src/theme/components'
 import { ArrowDown } from 'src/theme/components/icons'
 import { styled } from 'styled-components'
 
-const Layout = styled(Column)`
-  margin: 0 auto;
-  justify-content: center;
-  flex: 1;
-`
-
 const Content = styled(Column)`
   max-width: 460px;
   width: 100%;
-`
-
-const Headline = styled(Row)`
-  width: 100%;
-  justify-content: space-between;
-  margin-bottom: ${({ theme }) => theme.grids.md};
-`
-
-const PlatformCard = styled(Row)`
-  border: 1px solid ${({ theme }) => theme.border};
-  border-radius: 12px;
-
-  img {
-    width: 48px;
-    height: 48px;
-    border-radius: 12px;
-  }
-
-  > div {
-    padding: ${({ theme }) => theme.grids.sm} ${({ theme }) => theme.grids.md};
-  }
-`
-
-const SwapCards = styled(Column)`
-  position: relative;
-  width: 100%;
+  align-items: normal;
+  gap: 24px;
+  margin: 0 auto;
+  margin-top: 120px;
 `
 
 const SwapCard = styled(Row)`
   width: 100%;
   background-color: ${({ theme }) => theme.bg3};
   border-radius: 12px;
-  padding: ${({ theme }) => theme.grids.md} 16px;
+  padding: 12px 16px;
 `
 
 const SwapCardContent = styled(Column)`
@@ -59,8 +30,8 @@ const SwapCardContent = styled(Column)`
 
   input {
     width: 100%;
-    padding-top: ${({ theme }) => theme.grids.md};
-    padding-bottom: ${({ theme }) => theme.grids.lg};
+    padding-top: 12px;
+    padding-bottom: 24px;
     font-size: 42px;
     font-weight: 600;
     color: ${({ theme }) => theme.neutral1};
@@ -71,26 +42,25 @@ const SwapCardContent = styled(Column)`
   }
 `
 
-const ChangeButton = styled.button`
-  position: absolute;
-  top: 50%;
-  left: 50%;
+const SwitchButton = styled.button`
   display: flex;
   align-items: center;
   justify-content: center;
   color: ${({ theme }) => theme.neutral1};
-  transform: translateX(-50%) translateY(-50%);
   background-color: ${({ theme }) => theme.bg3};
-  border: 4px solid ${({ theme }) => theme.bg2};
+  border: 4px solid ${({ theme }) => theme.bg1};
   border-radius: 6px;
-  padding: 6px;
   cursor: pointer;
+  height: 32px;
+  width: 32px;
+  box-sizing: content-box;
+  margin: -18px 0;
+  z-index: 1;
+  padding: 0;
 `
 
 export default function SwapPage() {
-  const [swapType, setSwapType] = useState<'fiatToToken' | 'tokenToFiat'>('fiatToToken')
-  const [fiatCurrency, setFiatCurrency] = useState<FIAT_CURRENCY>(FIAT_CURRENCY.EUR)
-  const [tokenCurrency, setTokenCurrency] = useState<TOKEN_CURRENCY>(TOKEN_CURRENCY.USDC)
+  const [rampMode, setRampMode] = useState<'on' | 'off'>('on')
 
   const [inputSendValue, setInputSendValue] = useState('')
   const [inputReceiveValue, setInputReceiveValue] = useState('')
@@ -108,63 +78,42 @@ export default function SwapPage() {
   }
 
   const handleChangeClick = () => {
-    setSwapType(swapType === 'fiatToToken' ? 'tokenToFiat' : 'fiatToToken')
+    setRampMode((state) => (state == 'off' ? 'on' : 'off'))
     setInputSendValue(inputReceiveValue)
     setInputReceiveValue(inputSendValue)
   }
 
   return (
-    <Layout>
-      <Content gap={12}>
-        <Headline>
-          <ThemedText.HeadlineLarge>Swap</ThemedText.HeadlineLarge>
-
-          <PlatformCard>
-            <img src={RevolutLogo} alt="Revolut" />
-
-            <Column alignItems="flex-start">
-              <ThemedText.Title fontWeight={400}>Revolut</ThemedText.Title>
-              <ThemedText.BodyPrimary fontSize={12}>Platform</ThemedText.BodyPrimary>
-            </Column>
-          </PlatformCard>
-        </Headline>
-
-        <SwapCards gap={4}>
+    <Content>
+      <ThemedText.HeadlineLarge>Swap</ThemedText.HeadlineLarge>
+
+      <Column gap={12}>
+        <Column>
           <SwapCard as="label">
             <SwapCardContent>
-              <ThemedText.BodyPrimary fontSize={12}>Send</ThemedText.BodyPrimary>
+              <ThemedText.Subtitle fontSize={12}>Send</ThemedText.Subtitle>
               <CurrencyInput placeholder="0.0" value={inputSendValue} onChange={handleSendChange} />
             </SwapCardContent>
 
-            {swapType === 'fiatToToken' ? (
-              <CurrencyButton availableCurrencies={FIAT_CURRENCIES} selectedCurrency={fiatCurrency} />
-            ) : (
-              <CurrencyButton availableCurrencies={TOKEN_CURRENCIES} selectedCurrency={tokenCurrency} />
-            )}
+            <CurrencyButton selectedCurrency={rampMode === 'on' ? FIAT_CURRENCIES['EUR'] : TOKEN_CURRENCIES['USDC']} />
           </SwapCard>
 
+          <SwitchButton onClick={handleChangeClick}>
+            <ArrowDown width={18} height={18} />
+          </SwitchButton>
+
           <SwapCard as="label">
             <SwapCardContent>
-              <ThemedText.BodyPrimary fontSize={12}>Receive</ThemedText.BodyPrimary>
+              <ThemedText.Subtitle>Receive</ThemedText.Subtitle>
               <CurrencyInput placeholder="0.0" value={inputReceiveValue} onChange={handleReceiveChange} />
             </SwapCardContent>
 
-            {swapType === 'fiatToToken' ? (
-              <CurrencyButton availableCurrencies={TOKEN_CURRENCIES} selectedCurrency={tokenCurrency} />
-            ) : (
-              <CurrencyButton availableCurrencies={FIAT_CURRENCIES} selectedCurrency={fiatCurrency} />
-            )}
+            <CurrencyButton selectedCurrency={rampMode === 'off' ? FIAT_CURRENCIES['EUR'] : TOKEN_CURRENCIES['USDC']} />
           </SwapCard>
+        </Column>
 
-          <ChangeButton onClick={handleChangeClick}>
-            <ArrowDown width={18} height={18} />
-          </ChangeButton>
-        </SwapCards>
-
-        <PrimaryButton>
-          <ThemedText.Title>Swap</ThemedText.Title>
-        </PrimaryButton>
-      </Content>
-    </Layout>
+        <PrimaryButton>Swap</PrimaryButton>
+      </Column>
+    </Content>
   )
 }
diff --git a/client/src/state/application.ts b/client/src/state/application.ts
index 176f23d..73c8d98 100644
--- a/client/src/state/application.ts
+++ b/client/src/state/application.ts
@@ -5,6 +5,7 @@ import { StoreState } from './index'
 export enum ModalType {
   WALLET_CONNECT,
   WALLET_OVERVIEW,
+  PROOF_GENERATION,
 }
 
 export type ApplicationSlice = State & Actions
diff --git a/client/src/theme/components/text.tsx b/client/src/theme/components/text.tsx
index 8273ff7..0f7013d 100644
--- a/client/src/theme/components/text.tsx
+++ b/client/src/theme/components/text.tsx
@@ -28,11 +28,11 @@ export const ThemedText = {
   },
 
   HeadlineLarge(props: TextProps) {
-    return <TextWrapper fontWeight={500} fontSize={36} color="neutral1" fontFamily="Montserrat" {...props} />
+    return <TextWrapper fontWeight={485} fontSize={36} color="neutral1" fontFamily="Montserrat" {...props} />
   },
 
   HeadlineSmall(props: TextProps) {
-    return <TextWrapper fontWeight={500} fontSize={20} color="neutral1" fontFamily="Montserrat" {...props} />
+    return <TextWrapper fontWeight={485} fontSize={18} color="neutral1" fontFamily="Montserrat" {...props} />
   },
 
   BodyPrimary(props: TextProps) {
@@ -40,10 +40,10 @@ export const ThemedText = {
   },
 
   BodySecondary(props: TextProps) {
-    return <TextWrapper fontWeight={400} fontSize={14} color="neutral2" fontFamily="Montserrat" {...props} />
+    return <TextWrapper fontWeight={485} fontSize={16} color="neutral2" fontFamily="Montserrat" {...props} />
   },
 
-  Title(props: TextProps) {
-    return <TextWrapper fontWeight={600} fontSize={16} color="neutral1" fontFamily="Montserrat" {...props} />
+  Subtitle(props: TextProps) {
+    return <TextWrapper fontWeight={400} fontSize={12} color="neutral2" fontFamily="Montserrat" {...props} />
   },
 }
diff --git a/client/src/theme/index.tsx b/client/src/theme/index.tsx
index e985703..dccb45e 100644
--- a/client/src/theme/index.tsx
+++ b/client/src/theme/index.tsx
@@ -42,17 +42,8 @@ const fonts = {
   code: 'courier, courier new, serif',
 }
 
-const gapValues = {
-  xs: '4px',
-  sm: '8px',
-  md: '12px',
-  lg: '24px',
-  xl: '32px',
-}
-
 function getSettings() {
   return {
-    grids: gapValues,
     fonts,
 
     // shadows
diff --git a/client/yarn.lock b/client/yarn.lock
index ac87f58..1d8be40 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1769,6 +1769,18 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
+"@module-federation/runtime@^0.1.2":
+  version "0.1.21"
+  resolved "https://registry.yarnpkg.com/@module-federation/runtime/-/runtime-0.1.21.tgz#1d233b29dd136488f2ba682017b53f13e015788a"
+  integrity sha512-/p4BhZ0SnjJuiL0wwu+FebFgIUJ9vM+oCY7CyprUHImyi/Y23ulI61WNWMVrKQGgdMoXQDQCL8RH4EnrVP2ZFw==
+  dependencies:
+    "@module-federation/sdk" "0.1.21"
+
+"@module-federation/sdk@0.1.21":
+  version "0.1.21"
+  resolved "https://registry.yarnpkg.com/@module-federation/sdk/-/sdk-0.1.21.tgz#adb15c38ddfea65f45bd989a94c3a575c8df6991"
+  integrity sha512-r7xPiAm+O4e+8Zvw+8b4ToeD0D0VJD004nHmt+Y8r/l98J2eA6di72Vn1FeyjtQbCrFtiMw3ts/dlqtcmIBipw==
+
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
   resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
@@ -1776,6 +1788,18 @@
   dependencies:
     eslint-scope "5.1.1"
 
+"@noble/curves@~1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.3.0.tgz#01be46da4fd195822dab821e72f71bf4aeec635e"
+  integrity sha512-t01iSXPuN+Eqzb4eBX0S5oubSqXbK/xXa1Ne18Hj8f9pStxztHCE2gfboSp/dZRLSqfuLpRK2nDXDK+W9puocA==
+  dependencies:
+    "@noble/hashes" "1.3.3"
+
+"@noble/hashes@1.3.3", "@noble/hashes@~1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.3.tgz#39908da56a4adc270147bb07968bf3b16cfe1699"
+  integrity sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1859,11 +1883,54 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@rometools/cli-darwin-arm64@12.1.3":
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/@rometools/cli-darwin-arm64/-/cli-darwin-arm64-12.1.3.tgz#b00fe225e34047c4dac63588e237b11ebec47694"
+  integrity sha512-AmFTUDYjBuEGQp/Wwps+2cqUr+qhR7gyXAUnkL5psCuNCz3807TrUq/ecOoct5MIavGJTH6R4aaSL6+f+VlBEg==
+
+"@rometools/cli-darwin-x64@12.1.3":
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/@rometools/cli-darwin-x64/-/cli-darwin-x64-12.1.3.tgz#e5bbf02afb1aab7447e743092245dea992b4b29f"
+  integrity sha512-k8MbWna8q4LRlb005N2X+JS1UQ+s3ZLBBvwk4fP8TBxlAJXUz17jLLu/Fi+7DTTEmMhM84TWj4FDKW+rNar28g==
+
+"@rometools/cli-linux-arm64@12.1.3":
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/@rometools/cli-linux-arm64/-/cli-linux-arm64-12.1.3.tgz#e75b01b74c134edc811e21fa7e1e440602930d59"
+  integrity sha512-X/uLhJ2/FNA3nu5TiyeNPqiD3OZoFfNfRvw6a3ut0jEREPvEn72NI7WPijH/gxSz55znfQ7UQ6iM4DZumUknJg==
+
+"@rometools/cli-linux-x64@12.1.3":
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/@rometools/cli-linux-x64/-/cli-linux-x64-12.1.3.tgz#2b9f4a68079783f275d4d27df83e4fa2220ec6fc"
+  integrity sha512-csP17q1eWiUXx9z6Jr/JJPibkplyKIwiWPYNzvPCGE8pHlKhwZj3YHRuu7Dm/4EOqx0XFIuqqWZUYm9bkIC8xg==
+
+"@rometools/cli-win32-arm64@12.1.3":
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/@rometools/cli-win32-arm64/-/cli-win32-arm64-12.1.3.tgz#714acb67ac4ea4c15e2bc6aea4dd290c76c8efc6"
+  integrity sha512-RymHWeod57EBOJY4P636CgUwYA6BQdkQjh56XKk4pLEHO6X1bFyMet2XL7KlHw5qOTalzuzf5jJqUs+vf3jdXQ==
+
+"@rometools/cli-win32-x64@12.1.3":
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/@rometools/cli-win32-x64/-/cli-win32-x64-12.1.3.tgz#b4f53491d2ca8f1234b3613b7cc73418ad8d76bb"
+  integrity sha512-yHSKYidqJMV9nADqg78GYA+cZ0hS1twANAjiFibQdXj9aGzD+s/IzIFEIi/U/OBLvWYg/SCw0QVozi2vTlKFDQ==
+
 "@rushstack/eslint-patch@^1.1.0", "@rushstack/eslint-patch@^1.2.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.8.0.tgz#c5545e6a5d2bd5c26b4021c357177a28698c950e"
   integrity sha512-0HejFckBN2W+ucM6cUOlwsByTKt9/+0tWhqUffNIcHqCXkthY/mZ7AuYPK/2IIaGWhdl0h+tICDO0ssLMd6XMQ==
 
+"@scure/base@~1.1.3":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.7.tgz#fe973311a5c6267846aa131bc72e96c5d40d2b30"
+  integrity sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g==
+
+"@scure/starknet@~1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@scure/starknet/-/starknet-1.0.0.tgz#4419bc2fdf70f3dd6cb461d36c878c9ef4419f8c"
+  integrity sha512-o5J57zY0f+2IL/mq8+AYJJ4Xpc1fOtDhr+mFQKbHnYFmm3WQrC+8zj2HEgxak1a+x86mhmBC1Kq305KUpVf0wg==
+  dependencies:
+    "@noble/curves" "~1.3.0"
+    "@noble/hashes" "~1.3.3"
+
 "@sinclair/typebox@^0.24.1":
   version "0.24.51"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
@@ -1888,6 +1955,22 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@starknet-react/chains@^0.1.7":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@starknet-react/chains/-/chains-0.1.7.tgz#58503379e2ffabe33b4f6e0f2aef775e84745a4d"
+  integrity sha512-UNh97I1SvuJKaAhKOmpEk8JcWuZWMlPG/ba2HcvFYL9x/47BKndJ+Da9V+iJFtkHUjreVnajT1snsaz1XMG+UQ==
+
+"@starknet-react/core@^2.9.0":
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/@starknet-react/core/-/core-2.9.0.tgz#216ee363540bff10961e22a633a9420f0a42e105"
+  integrity sha512-UdRo454/g2lb0YsNAUJohJ2w21LlahcEXQlkWrddoKFubRY6Q0b39hec0eZOCqfU0Z1Sh7kF1XYvI5t9xL4yTQ==
+  dependencies:
+    "@starknet-react/chains" "^0.1.7"
+    "@tanstack/react-query" "^5.0.1"
+    eventemitter3 "^5.0.1"
+    immutable "^4.3.4"
+    zod "^3.22.2"
+
 "@styled-system/background@^5.1.2":
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/@styled-system/background/-/background-5.1.2.tgz#75c63d06b497ab372b70186c0bf608d62847a2ba"
@@ -2100,6 +2183,18 @@
     "@svgr/plugin-svgo" "^5.5.0"
     loader-utils "^2.0.0"
 
+"@tanstack/query-core@5.53.3":
+  version "5.53.3"
+  resolved "https://registry.yarnpkg.com/@tanstack/query-core/-/query-core-5.53.3.tgz#ada02058ee79fe4482c0aa6967408f22a6af2a0f"
+  integrity sha512-ZfjAgd7NpqDx0e4aYBt7EmS2enbulPrJwowTy+mayRE93WUUH+sIYHun1TdRjpGwDPMNNZ5D6goh7n3CwoO+HA==
+
+"@tanstack/react-query@^5.0.1":
+  version "5.53.3"
+  resolved "https://registry.yarnpkg.com/@tanstack/react-query/-/react-query-5.53.3.tgz#f4ee3effe6f2fe584da2f58dc7c0316876fa9028"
+  integrity sha512-286mN/91CeM7vC6CZFLKYDHSw+WyMX6ekIvzoTbpM4xyPb99VSyCKPLyPgaOatKqYm6ooMBquSq9NGRdKgsJfg==
+  dependencies:
+    "@tanstack/query-core" "5.53.3"
+
 "@tootallnate/once@1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
@@ -2749,6 +2844,38 @@ abab@^2.0.3, abab@^2.0.5:
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
+"abi-wan-kanabi-v1@npm:abi-wan-kanabi@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/abi-wan-kanabi/-/abi-wan-kanabi-1.0.3.tgz#0d8607f2a2ccb2151a69debea1c3bb68b76c5aa2"
+  integrity sha512-Xwva0AnhXx/IVlzo3/kwkI7Oa7ZX7codtcSn+Gmoa2PmjGPF/0jeVud9puasIPtB7V50+uBdUj4Mh3iATqtBvg==
+  dependencies:
+    abi-wan-kanabi "^1.0.1"
+    fs-extra "^10.0.0"
+    rome "^12.1.3"
+    typescript "^4.9.5"
+    yargs "^17.7.2"
+
+"abi-wan-kanabi-v2@npm:abi-wan-kanabi@^2.1.1":
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/abi-wan-kanabi/-/abi-wan-kanabi-2.2.3.tgz#d1c410325aac866f31f3d589279a87b341e5641f"
+  integrity sha512-JlqiAl9CPvTm5kKG0QXmVCWNWoC/XyRMOeT77cQlbxXWllgjf6SqUmaNqFon72C2o5OSZids+5FvLdsw6dvWaw==
+  dependencies:
+    ansicolors "^0.3.2"
+    cardinal "^2.1.1"
+    fs-extra "^10.0.0"
+    yargs "^17.7.2"
+
+abi-wan-kanabi@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/abi-wan-kanabi/-/abi-wan-kanabi-1.0.3.tgz#0d8607f2a2ccb2151a69debea1c3bb68b76c5aa2"
+  integrity sha512-Xwva0AnhXx/IVlzo3/kwkI7Oa7ZX7codtcSn+Gmoa2PmjGPF/0jeVud9puasIPtB7V50+uBdUj4Mh3iATqtBvg==
+  dependencies:
+    abi-wan-kanabi "^1.0.1"
+    fs-extra "^10.0.0"
+    rome "^12.1.3"
+    typescript "^4.9.5"
+    yargs "^17.7.2"
+
 abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
@@ -2907,6 +3034,11 @@ ansi-styles@^6.1.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
+ansicolors@^0.3.2, ansicolors@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz#665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"
+  integrity sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==
+
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -3600,6 +3732,14 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001591:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz#571cf4f3f1506df9bf41fcbb6d10d5d017817bce"
   integrity sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA==
 
+cardinal@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-2.1.1.tgz#7cc1055d822d212954d07b085dea251cc7bc5505"
+  integrity sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==
+  dependencies:
+    ansicolors "~0.3.2"
+    redeyed "~2.1.0"
+
 case-sensitive-paths-webpack-plugin@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4"
@@ -3691,6 +3831,15 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -5125,7 +5274,7 @@ esprima@1.2.2:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.2.2.tgz#76a0fd66fcfe154fd292667dc264019750b1657b"
   integrity sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -5179,6 +5328,11 @@ eventemitter3@^4.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
+eventemitter3@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
+  integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==
+
 events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
@@ -5562,6 +5716,13 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-starknet-core@^3.3.2:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/get-starknet-core/-/get-starknet-core-3.3.3.tgz#26a5203bc29d7906b8963684374eea8c356c7fad"
+  integrity sha512-IscL4lAigJpc/9Idkg07sdyUOXkB+/goTDQm8EhMGn/nIAW4rn04d+D47ils75drNQIfZZKDIIZrWrbIKvjoWA==
+  dependencies:
+    "@module-federation/runtime" "^0.1.2"
+
 get-stream@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -5988,6 +6149,11 @@ immer@^9.0.7:
   resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
   integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
 
+immutable@^4.3.4:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
+  integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==
+
 import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -6338,6 +6504,14 @@ isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isomorphic-fetch@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4"
+  integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==
+  dependencies:
+    node-fetch "^2.6.1"
+    whatwg-fetch "^3.4.1"
+
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
@@ -7213,6 +7387,11 @@ loose-envify@^1.1.0, loose-envify@^1.4.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+lossless-json@^2.0.8:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/lossless-json/-/lossless-json-2.0.11.tgz#3137684c93fd99481c6f99c985efc9c9c5cc76a5"
+  integrity sha512-BP0vn+NGYvzDielvBZaFain/wgeJ1hTvURCqtKvhr1SCPePdaaTanmmcplrHfEJSJOUql7hk4FHwToNJjWRY3g==
+
 lower-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
@@ -7482,6 +7661,13 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
+node-fetch@^2.6.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -7781,6 +7967,11 @@ p-try@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
+pako@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-2.1.0.tgz#266cc37f98c7d883545d11335c00fbd4062c9a86"
+  integrity sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==
+
 pako@~1.0.5:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -8924,6 +9115,13 @@ recursive-readdir@^2.2.2:
   dependencies:
     minimatch "^3.0.5"
 
+redeyed@~2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-2.1.1.tgz#8984b5815d99cb220469c99eeeffe38913e6cc0b"
+  integrity sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==
+  dependencies:
+    esprima "~4.0.0"
+
 reflect.getprototypeof@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859"
@@ -9140,6 +9338,18 @@ rollup@^2.43.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
+rome@^12.1.3:
+  version "12.1.3"
+  resolved "https://registry.yarnpkg.com/rome/-/rome-12.1.3.tgz#4d4d62cad16216843680bd3ca11a4c248134902a"
+  integrity sha512-e+ff72hxDpe/t5/Us7YRBVw3PBET7SeczTQNn6tvrWdrCaAw3qOukQQ+tDCkyFtS4yGsnhjrJbm43ctNbz27Yg==
+  optionalDependencies:
+    "@rometools/cli-darwin-arm64" "12.1.3"
+    "@rometools/cli-darwin-x64" "12.1.3"
+    "@rometools/cli-linux-arm64" "12.1.3"
+    "@rometools/cli-linux-x64" "12.1.3"
+    "@rometools/cli-win32-arm64" "12.1.3"
+    "@rometools/cli-win32-x64" "12.1.3"
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -9548,6 +9758,21 @@ stackframe@^1.3.4:
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
   integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
+starknet@^5.29.0:
+  version "5.29.0"
+  resolved "https://registry.yarnpkg.com/starknet/-/starknet-5.29.0.tgz#26d8074340f26a2da4bc373169a1a5ed6dc9bedf"
+  integrity sha512-eEcd6uiYIwGvl8MtHOsXGBhREqjJk84M/qUkvPLQ3n/JAMkbKBGnygDlh+HAsvXJsGlMQfwrcVlm6KpDoPha7w==
+  dependencies:
+    "@noble/curves" "~1.3.0"
+    "@scure/base" "~1.1.3"
+    "@scure/starknet" "~1.0.0"
+    abi-wan-kanabi-v1 "npm:abi-wan-kanabi@^1.0.3"
+    abi-wan-kanabi-v2 "npm:abi-wan-kanabi@^2.1.1"
+    isomorphic-fetch "^3.0.0"
+    lossless-json "^2.0.8"
+    pako "^2.0.4"
+    url-join "^4.0.1"
+
 static-eval@2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
@@ -9613,7 +9838,7 @@ string-natural-compare@^3.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10060,6 +10285,11 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 tryer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
@@ -10224,6 +10454,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typescript@^4.9.5:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+
 typescript@^5.0.4:
   version "5.4.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
@@ -10319,6 +10554,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+url-join@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
+  integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==
+
 url-parse@^1.5.3:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
@@ -10441,6 +10681,11 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webidl-conversions@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -10592,7 +10837,7 @@ whatwg-encoding@^1.0.5:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@^3.6.2:
+whatwg-fetch@^3.4.1, whatwg-fetch@^3.6.2:
   version "3.6.20"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70"
   integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==
@@ -10602,6 +10847,14 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 whatwg-url@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
@@ -10960,6 +11213,11 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
+
 yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
@@ -10973,6 +11231,19 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
@@ -10983,6 +11254,11 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+zod@^3.22.2:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
+
 zustand@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/zustand/-/zustand-4.5.4.tgz#63abdd81edfb190bc61e0bbae045cc4d52158a05"