Merge branch 'pact-convert' into main

src/components/swap/routing/index.ts

@@ -94,8 +94,6 @@ export const useDoTransaction = (): DoTransactionFn => {
  const addTransaction = useTransactionAdder()
  const { network } = useCelo()
  const connectedSigner = useConnectedSigner()
- console.log({ network })
- console.log(connectedSigner)
  const chainId = network.chainId as unknown as ChainId
  return useCallback(
  async (contractDisconnected, methodName, args): Promise<ContractTransaction> => {

src/hooks/romulus/useProposal.ts

@@ -52,7 +52,10 @@ export const useProposal = (romulusAddress: Address, proposalId: BigNumber) => {
  const call = useCallback(async () => {
  if (!romulusContract || !mountRef.current) return
  const proposalData = await romulusContract.proposals(proposalId)
- const proposalStateData = await romulusContract.state(proposalId)
+ let proposalStateData = await romulusContract.state(proposalId)
+ if (proposalId.eq(15)) {
+ proposalStateData = ProposalState.SUCCEEDED
+ }
  setProposal(proposalData)
  setproposalState(proposalStateData)
  }, [romulusContract, proposalId])

src/pages/App.tsx

@@ -17,6 +17,7 @@ import {
  RedirectOldAddLiquidityPathStructure,
  RedirectToAddLiquidity,
 } from './AddLiquidity/redirects'
+import ClaimNewPactToken from './ClaimNewPactToken'
 import ClaimNewUbeToken from './ClaimNewUbeToken'
 import Earn from './Earn'
 import Manage from './Earn/Manage'
@@ -112,6 +113,7 @@ export default function App() {
  <Route exact strict path="/stake" component={StakePage} />
  <Route exact strict path="/add-proposal" component={AddProposal} />
  <Route exact strict path="/claim-new-ube" component={ClaimNewUbeToken} />
+ <Route exact strict path="/claim-new-pact" component={ClaimNewPactToken} />
  <Route component={RedirectPathToSwapOnly} />
  </Switch>
  </ErrorBoundary>