Merge branch 'main' into production

pooltogether · Jun 6, 2023 · 62f1d7c · 62f1d7c
2 parents ca3e0d4 + 389464e
commit 62f1d7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/constants/config.ts b/src/constants/config.ts
@@ -35,15 +35,7 @@ export const RPC_URLS = {
 }
 
 // NOTE: Should be empty. Add a chain id to hide it in app.
-// NOTE: Remember to set the default chain ID back to Optimism after removing the temporary block for Bedrock upgrade.
 export const CHAIN_IDS_TO_BLOCK = []
-const currentTime = msToSeconds(Date.now())
-const OP_UPGRADE_START_TIME = 1686067200
-const OP_UPGRADE_END_TIME = 1686081600
-
-if (currentTime >= OP_UPGRADE_START_TIME && currentTime <= OP_UPGRADE_END_TIME) {
-  CHAIN_IDS_TO_BLOCK.push(CHAIN_ID.optimism)
-}
 
 // Pull prize pool addresses from the contract list
 export const V4_PRIZE_POOLS = Object.freeze({
@@ -152,9 +144,8 @@ export const SUPPORTED_CHAINS: { [key: string]: Chain[] } = Object.freeze({
   [APP_ENVIRONMENTS.testnets]: SUPPORTED_CHAIN_IDS[APP_ENVIRONMENTS.testnets].map(getChain)
 })
 
-// NOTE: Remember to change default chain ID back to Optimism after Bedrock upgrade
 export const DEFAULT_CHAIN_IDS = Object.freeze({
-  [APP_ENVIRONMENTS.mainnets]: CHAIN_ID.mainnet,
+  [APP_ENVIRONMENTS.mainnets]: CHAIN_ID.optimism,
   [APP_ENVIRONMENTS.testnets]: CHAIN_ID['optimism-goerli']
 })
 

diff --git a/src/views/Account/index.tsx b/src/views/Account/index.tsx
@@ -58,11 +58,11 @@ export const AccountUI = (props) => {
         <Card>
           <V4DepositList />
           <DelegationList />
-          {/* <Rewards /> */}
+          <Rewards />
           <hr className='sm:hidden' />
           <GovernanceSidebarCard usersAddress={usersAddress} className='sm:hidden' />
           <OddsOfWinningWithX className='sm:hidden' />
-          {/* <EarnRewardsCard className='sm:hidden' /> */}
+          <EarnRewardsCard className='sm:hidden' />
           <hr className='sm:hidden' />
           <V3StakingList />
           <V3DepositList />
@@ -74,7 +74,7 @@ export const AccountUI = (props) => {
         <PastPrizesSidebarCard usersAddress={usersAddress} />
         <OddsSidebarCard usersAddress={usersAddress} />
         <GovernanceSidebarCard usersAddress={usersAddress} />
-        {/* <EarnRewardsCard /> */}
+        <EarnRewardsCard />
         <SocialLinks />
       </SidebarContent>
     </PagePadding>