diff --git a/pages/test1.tsx b/pages/test1.tsx
index a1acf0acd6..d28bf80409 100644
--- a/pages/test1.tsx
+++ b/pages/test1.tsx
@@ -9,7 +9,7 @@ import { useRouter } from 'next/router';
 import { Container } from '@giveth/ui-design-system';
 import { gToast, ToastType } from '@/components/toasts';
 import { useAppDispatch } from '@/features/hooks';
-import { fetchXDaiInfoAsync } from '@/features/subgraph/subgraph.thunks';
+import { fetchGnosisInfoAsync } from '@/features/subgraph/subgraph.thunks';
 import { FlowRateTooltip } from '@/components/GIVeconomyPages/GIVstream.sc';
 import { IconWithTooltip } from '@/components/IconWithToolTip';
 import { removeQueryParamAndRedirect } from '@/helpers/url';
@@ -35,8 +35,8 @@ const TestRoute = () => {
 //This comment is for testing1
 
 const TestIndex = () => {
-	// const xDaiValues = useSelector(
-	// 	(state: RootState) => state.subgraph.xDaiValues,
+	// const gnosisValues = useSelector(
+	// 	(state: RootState) => state.subgraph.gnosisValues,
 	// );
 	const [showModal, setShowModal] = useState(false);
 	const { account } = useWeb3React();
@@ -80,7 +80,7 @@ const TestIndex = () => {
 		console.log('res1', res);
 	};
 
-	// console.log('xDaiValues', xDaiValues);
+	// console.log('gnosisValues', gnosisValues);
 	// useEffect(() => {
 	// 	if (!library) return;
 	// 	library.on('block', (evt: any) => {
@@ -114,7 +114,7 @@ const TestIndex = () => {
 				<button
 					onClick={() => {
 						if (account) {
-							dispatch(fetchXDaiInfoAsync(account));
+							dispatch(fetchGnosisInfoAsync(account));
 						}
 					}}
 				>
diff --git a/src/components/GIVeconomyPages/GIVbacks.tsx b/src/components/GIVeconomyPages/GIVbacks.tsx
index 4f0881a8b5..823708a182 100644
--- a/src/components/GIVeconomyPages/GIVbacks.tsx
+++ b/src/components/GIVeconomyPages/GIVbacks.tsx
@@ -51,15 +51,19 @@ export const TabGIVbacksTop = () => {
 	const [showGivBackExplain, setShowGivBackExplain] = useState(false);
 	const [givBackStream, setGivBackStream] = useState<BigNumber.Value>(0);
 	const { givTokenDistroHelper } = useGIVTokenDistroHelper(showHarvestModal);
-	const xDaiValues = useAppSelector(
-		state => state.subgraph.xDaiValues,
+	const { chainId } = useWeb3React();
+	const values = useAppSelector(
+		state =>
+			chainId === config.OPTIMISM_NETWORK_NUMBER
+				? state.subgraph.optimismValues
+				: state.subgraph.gnosisValues,
 		() => (showHarvestModal ? true : false),
 	);
+
 	const givTokenDistroBalance = useMemo(() => {
-		const sdh = new SubgraphDataHelper(xDaiValues);
+		const sdh = new SubgraphDataHelper(values);
 		return sdh.getGIVTokenDistroBalance();
-	}, [xDaiValues]);
-	const { chainId } = useWeb3React();
+	}, [values]);
 
 	useEffect(() => {
 		const _givback = BN(givTokenDistroBalance.givback);
diff --git a/src/components/GIVeconomyPages/GIVpower.tsx b/src/components/GIVeconomyPages/GIVpower.tsx
index e2d31c5969..e7ebca92d2 100644
--- a/src/components/GIVeconomyPages/GIVpower.tsx
+++ b/src/components/GIVeconomyPages/GIVpower.tsx
@@ -68,7 +68,7 @@ export function TabPowerTop() {
 	const { formatMessage } = useIntl();
 	const { account } = useWeb3React();
 	const sdh = new SubgraphDataHelper(
-		useAppSelector(state => state.subgraph.xDaiValues),
+		useAppSelector(state => state.subgraph.gnosisValues),
 	);
 	const givPower = sdh.getUserGIVPowerBalance();
 	const givPowerFormatted = formatWeiHelper(givPower.balance);
diff --git a/src/components/cards/StakingCards/BaseStakingCard/BaseStakingCard.tsx b/src/components/cards/StakingCards/BaseStakingCard/BaseStakingCard.tsx
index 8e64256469..4532a6fcdf 100644
--- a/src/components/cards/StakingCards/BaseStakingCard/BaseStakingCard.tsx
+++ b/src/components/cards/StakingCards/BaseStakingCard/BaseStakingCard.tsx
@@ -60,7 +60,9 @@ const BaseStakingCard: FC<IBaseStakingCardProps> = ({
 
 	const isGIVStaking = type === StakingType.GIV_LM;
 	const isGIVpower =
-		isGIVStaking && poolNetwork === config.XDAI_NETWORK_NUMBER;
+		isGIVStaking &&
+		(poolNetwork === config.XDAI_NETWORK_NUMBER ||
+			poolNetwork === config.OPTIMISM_NETWORK_NUMBER);
 
 	const isDiscontinued = farmEndTimeMS
 		? getNowUnixMS() > farmEndTimeMS
diff --git a/src/components/controller/subgraph.ctrl.tsx b/src/components/controller/subgraph.ctrl.tsx
index 208c6869f8..9976527549 100644
--- a/src/components/controller/subgraph.ctrl.tsx
+++ b/src/components/controller/subgraph.ctrl.tsx
@@ -3,9 +3,10 @@ import { useEffect } from 'react';
 import { useAppDispatch } from '@/features/hooks';
 import config from '@/configuration';
 import {
-	fetchXDaiInfoAsync,
+	fetchGnosisInfoAsync,
 	fetchMainnetInfoAsync,
 	fetchCurrentInfoAsync,
+	fetchOptimismInfoAsync,
 } from '@/features/subgraph/subgraph.thunks';
 
 const SubgraphController = () => {
@@ -16,9 +17,11 @@ const SubgraphController = () => {
 		const _account = account ? account : undefined;
 		const _chainID = chainId || config.MAINNET_NETWORK_NUMBER;
 		if (chainId !== config.XDAI_NETWORK_NUMBER)
-			dispatch(fetchXDaiInfoAsync(_account));
+			dispatch(fetchGnosisInfoAsync(_account));
 		if (chainId !== config.MAINNET_NETWORK_NUMBER)
 			dispatch(fetchMainnetInfoAsync(_account));
+		if (chainId !== config.OPTIMISM_NETWORK_NUMBER)
+			dispatch(fetchOptimismInfoAsync(_account));
 		dispatch(
 			fetchCurrentInfoAsync({
 				userAddress: _account,
diff --git a/src/components/givfarm/RegenStreamCard.tsx b/src/components/givfarm/RegenStreamCard.tsx
index 0fa4dd15da..65d42375d4 100644
--- a/src/components/givfarm/RegenStreamCard.tsx
+++ b/src/components/givfarm/RegenStreamCard.tsx
@@ -78,7 +78,7 @@ export const RegenStreamCard: FC<RegenStreamProps> = ({ streamConfig }) => {
 	const currentValues = useAppSelector(
 		state =>
 			streamNetwork === config.XDAI_NETWORK_NUMBER
-				? state.subgraph.xDaiValues
+				? state.subgraph.gnosisValues
 				: state.subgraph.mainnetValues,
 		() => (showModal ? true : false),
 	);
diff --git a/src/components/modals/Boost/BoostModal.test.tsx b/src/components/modals/Boost/BoostModal.test.tsx
index 57dbd0d8c1..3c8f569f4f 100644
--- a/src/components/modals/Boost/BoostModal.test.tsx
+++ b/src/components/modals/Boost/BoostModal.test.tsx
@@ -26,8 +26,8 @@ test('showing the ZeroGivpowerModal if the user GIVpower balance is zero', async
 	const setStateMock = jest.fn();
 	const useStateMock: any = (state: any) => [state, setStateMock];
 	jest.spyOn(React, 'useState').mockImplementation(useStateMock);
-	const xDaiValues: ISubgraphState = {};
-	xDaiValues[
+	const gnosisValues: ISubgraphState = {};
+	gnosisValues[
 		`unipoolBalance_${config.XDAI_CONFIG.GIV.LM_ADDRESS.toLowerCase()}`
 	] = {
 		balance: '0',
@@ -39,7 +39,7 @@ test('showing the ZeroGivpowerModal if the user GIVpower balance is zero', async
 		{
 			preloadedState: {
 				subgraph: {
-					xDaiValues: xDaiValues,
+					gnosisValues: gnosisValues,
 					mainnetValues: {},
 					currentValues: {},
 				},
@@ -53,8 +53,8 @@ test('showing the BoostModal if the user GIVpower balance is not zero', async ()
 	const setStateMock = jest.fn();
 	const useStateMock: any = (state: any) => [state, setStateMock];
 	jest.spyOn(React, 'useState').mockImplementation(useStateMock);
-	const xDaiValues: ISubgraphState = {};
-	xDaiValues[
+	const gnosisValues: ISubgraphState = {};
+	gnosisValues[
 		`unipoolBalance_${config.XDAI_CONFIG.GIV.LM_ADDRESS.toLowerCase()}`
 	] = {
 		balance: '1',
@@ -66,7 +66,7 @@ test('showing the BoostModal if the user GIVpower balance is not zero', async ()
 		{
 			preloadedState: {
 				subgraph: {
-					xDaiValues: xDaiValues,
+					gnosisValues: gnosisValues,
 					mainnetValues: {},
 					currentValues: {},
 				},
diff --git a/src/components/modals/Boost/BoostModal.tsx b/src/components/modals/Boost/BoostModal.tsx
index 9fd4dc8e9c..26ea1e51c0 100644
--- a/src/components/modals/Boost/BoostModal.tsx
+++ b/src/components/modals/Boost/BoostModal.tsx
@@ -30,7 +30,7 @@ const BoostModal: FC<IBoostModalProps> = ({ setShowModal, projectId }) => {
 	const [percentage, setPercentage] = useState(0);
 	const [state, setState] = useState(EBoostModalState.BOOSTING);
 	const sdh = new SubgraphDataHelper(
-		useAppSelector(state => state.subgraph.xDaiValues),
+		useAppSelector(state => state.subgraph.gnosisValues),
 	);
 	const givPower = sdh.getUserGIVPowerBalance();
 
diff --git a/src/components/modals/StakeLock/LockSlider.tsx b/src/components/modals/StakeLock/LockSlider.tsx
index c38c9835ae..405cfc9db3 100644
--- a/src/components/modals/StakeLock/LockSlider.tsx
+++ b/src/components/modals/StakeLock/LockSlider.tsx
@@ -27,7 +27,7 @@ const LockSlider: FC<ILockSlider> = ({ round, setRound }) => {
 	const { formatMessage, locale } = useIntl();
 	const [isChanged, setIsChanged] = useState(false);
 	const givpowerInfo = useAppSelector(
-		state => state.subgraph.xDaiValues.givpowerInfo,
+		state => state.subgraph.gnosisValues.givpowerInfo,
 	) as IGIVpower;
 	const unlockDate = new Date(getUnlockDate(givpowerInfo, round));
 	return (
diff --git a/src/components/modals/StakeLock/LockingBrief.tsx b/src/components/modals/StakeLock/LockingBrief.tsx
index b489632042..fcd4790320 100644
--- a/src/components/modals/StakeLock/LockingBrief.tsx
+++ b/src/components/modals/StakeLock/LockingBrief.tsx
@@ -19,7 +19,7 @@ const LockingBrief: FC<ILockingBrief> = ({
 	onLocking = false,
 }) => {
 	const givpowerInfo = useAppSelector(
-		state => state.subgraph.xDaiValues.givpowerInfo,
+		state => state.subgraph.gnosisValues.givpowerInfo,
 	) as IGIVpower;
 	const unlockDate = new Date(getUnlockDate(givpowerInfo, round));
 	return (
diff --git a/src/components/modals/StakeLock/TotalGIVpowerBox.tsx b/src/components/modals/StakeLock/TotalGIVpowerBox.tsx
index e0b9eb7125..29ce923977 100644
--- a/src/components/modals/StakeLock/TotalGIVpowerBox.tsx
+++ b/src/components/modals/StakeLock/TotalGIVpowerBox.tsx
@@ -20,7 +20,7 @@ import LottieControl from '@/components/LottieControl';
 const TotalGIVpowerBox = () => {
 	const [totalGIVpower, setTotalGIVpower] = useState<BigNumber>();
 	const { account, library, chainId } = useWeb3React();
-	const xDaiValues = useAppSelector(state => state.subgraph.xDaiValues);
+	const gnosisValues = useAppSelector(state => state.subgraph.gnosisValues);
 
 	useEffect(() => {
 		async function fetchTotalGIVpower() {
@@ -39,7 +39,7 @@ const TotalGIVpowerBox = () => {
 				}
 			} catch (err) {
 				console.log({ err });
-				const sdh = new SubgraphDataHelper(xDaiValues);
+				const sdh = new SubgraphDataHelper(gnosisValues);
 				const userGIVPowerBalance = sdh.getUserGIVPowerBalance();
 				setTotalGIVpower(new BigNumber(userGIVPowerBalance.balance));
 			}
diff --git a/src/components/views/claim/cards/Govern.tsx b/src/components/views/claim/cards/Govern.tsx
index af784a008e..b039255a84 100644
--- a/src/components/views/claim/cards/Govern.tsx
+++ b/src/components/views/claim/cards/Govern.tsx
@@ -109,7 +109,7 @@ const GovernCard: FC<IClaimViewCardProps> = ({ index }) => {
 	const [earnEstimate, setEarnEstimate] = useState<BigNumber>(Zero);
 	const [apr, setApr] = useState<APR>(null);
 	const { givTokenDistroHelper } = useGIVTokenDistroHelper();
-	const xDaiValues = useAppSelector(state => state.subgraph.xDaiValues);
+	const gnosisValues = useAppSelector(state => state.subgraph.gnosisValues);
 
 	useEffect(() => {
 		let _stacked = 0;
@@ -148,7 +148,7 @@ const GovernCard: FC<IClaimViewCardProps> = ({ index }) => {
 
 	useEffect(() => {
 		const cb = () => {
-			getGivStakingAPR(config.XDAI_NETWORK_NUMBER, xDaiValues, null)
+			getGivStakingAPR(config.XDAI_NETWORK_NUMBER, gnosisValues, null)
 				.then(_apr => {
 					mounted.current && setApr(_apr);
 				})
@@ -166,7 +166,7 @@ const GovernCard: FC<IClaimViewCardProps> = ({ index }) => {
 		const interval = setInterval(cb, 120 * 1000);
 
 		return () => clearInterval(interval);
-	}, [stacked, xDaiValues]);
+	}, [stacked, gnosisValues]);
 
 	return (
 		<GovernCardContainer activeIndex={step} index={index}>
diff --git a/src/components/views/claim/cards/Stake.tsx b/src/components/views/claim/cards/Stake.tsx
index b8ce682719..74984cc1bf 100644
--- a/src/components/views/claim/cards/Stake.tsx
+++ b/src/components/views/claim/cards/Stake.tsx
@@ -98,7 +98,7 @@ const InvestCard: FC<IClaimViewCardProps> = ({ index }) => {
 	const [earnEstimate, setEarnEstimate] = useState<BigNumber>(Zero);
 	const [APR, setAPR] = useState<BigNumber>(Zero);
 	const { givTokenDistroHelper } = useGIVTokenDistroHelper();
-	const { xDaiValues, mainnetValues } = useAppSelector(
+	const { gnosisValues, mainnetValues } = useAppSelector(
 		state => state.subgraph,
 	);
 
@@ -153,7 +153,7 @@ const InvestCard: FC<IClaimViewCardProps> = ({ index }) => {
 			const promise: Promise<APR> = getLPStakingAPR(
 				poolStakingConfig as SimplePoolStakingConfig,
 				networkProviders[config.XDAI_NETWORK_NUMBER],
-				xDaiValues,
+				gnosisValues,
 			);
 			promiseQueue.push(promise);
 		});
@@ -176,7 +176,7 @@ const InvestCard: FC<IClaimViewCardProps> = ({ index }) => {
 			promiseQueue.push(promise);
 		});
 		getMaxAPR(promiseQueue);
-	}, [mainnetValues, xDaiValues]);
+	}, [mainnetValues, gnosisValues]);
 
 	return (
 		<InvestCardContainer activeIndex={step} index={index}>
diff --git a/src/components/views/givfarm/GIVfarmBottom.tsx b/src/components/views/givfarm/GIVfarmBottom.tsx
index 9f9a5ad2ea..a4caa49642 100644
--- a/src/components/views/givfarm/GIVfarmBottom.tsx
+++ b/src/components/views/givfarm/GIVfarmBottom.tsx
@@ -49,12 +49,25 @@ const renderPools = (chainId?: number, showArchivedPools?: boolean) => {
 					...config.XDAI_CONFIG.regenPools,
 					...config.MAINNET_CONFIG.pools,
 					...config.MAINNET_CONFIG.regenPools,
+					...config.OPTIMISM_CONFIG.pools,
+					...config.OPTIMISM_CONFIG.regenPools,
+			  ]
+			: chainId === config.OPTIMISM_NETWORK_NUMBER
+			? [
+					...config.OPTIMISM_CONFIG.pools,
+					...config.OPTIMISM_CONFIG.regenPools,
+					...config.XDAI_CONFIG.pools,
+					...config.XDAI_CONFIG.regenPools,
+					...config.MAINNET_CONFIG.pools,
+					...config.MAINNET_CONFIG.regenPools,
 			  ]
 			: [
 					...config.MAINNET_CONFIG.pools,
 					...config.MAINNET_CONFIG.regenPools,
 					...config.XDAI_CONFIG.pools,
 					...config.XDAI_CONFIG.regenPools,
+					...config.OPTIMISM_CONFIG.pools,
+					...config.OPTIMISM_CONFIG.regenPools,
 			  ];
 
 	const now = getNowUnixMS();
@@ -153,13 +166,22 @@ export const GIVfarmBottom = () => {
 				</GIVfarmToolBoxRow>
 				<PoolRow>
 					{!showArchivedPools && (
-						<Col sm={6} lg={4} key={`givpower_card`}>
-							<StakingPoolCard
-								poolStakingConfig={getGivStakingConfig(
-									config.XDAI_CONFIG,
-								)}
-							/>
-						</Col>
+						<>
+							<Col sm={6} lg={4} key={`givpower_card_gnosis`}>
+								<StakingPoolCard
+									poolStakingConfig={getGivStakingConfig(
+										config.XDAI_CONFIG,
+									)}
+								/>
+							</Col>
+							<Col sm={6} lg={4} key={`givpower_card_optimism`}>
+								<StakingPoolCard
+									poolStakingConfig={getGivStakingConfig(
+										config.OPTIMISM_CONFIG,
+									)}
+								/>
+							</Col>
+						</>
 					)}
 					{showArchivedPools && (
 						<Col sm={6} lg={4}>
diff --git a/src/components/views/givfarm/GIVfarmTop.tsx b/src/components/views/givfarm/GIVfarmTop.tsx
index 079a4128a3..ab47fa56f4 100644
--- a/src/components/views/givfarm/GIVfarmTop.tsx
+++ b/src/components/views/givfarm/GIVfarmTop.tsx
@@ -59,6 +59,7 @@ export const GIVfarmTop = () => {
 							targetNetworks={[
 								config.MAINNET_NETWORK_NUMBER,
 								config.XDAI_NETWORK_NUMBER,
+								config.OPTIMISM_NETWORK_NUMBER,
 							]}
 						/>
 					</Col>
diff --git a/src/components/views/userProfile/ProfileOverviewTab.tsx b/src/components/views/userProfile/ProfileOverviewTab.tsx
index 6cc2cf207a..14b9faaa4c 100644
--- a/src/components/views/userProfile/ProfileOverviewTab.tsx
+++ b/src/components/views/userProfile/ProfileOverviewTab.tsx
@@ -102,7 +102,7 @@ const ProfileOverviewTab: FC<IUserProfileView> = ({ user, myAccount }) => {
 
 	const [section, setSection] = useState<ISection>(_sections.getGiv);
 	const sdh = new SubgraphDataHelper(
-		useAppSelector(state => state.subgraph.xDaiValues),
+		useAppSelector(state => state.subgraph.gnosisValues),
 	);
 	const { userData } = useAppSelector(state => state.user);
 	const boostedProjectsCount = userData?.boostedProjectsCount ?? 0;
diff --git a/src/components/views/userProfile/boostedTab/EmptyPowerBoosting.tsx b/src/components/views/userProfile/boostedTab/EmptyPowerBoosting.tsx
index 25c945e306..bc4b574e85 100644
--- a/src/components/views/userProfile/boostedTab/EmptyPowerBoosting.tsx
+++ b/src/components/views/userProfile/boostedTab/EmptyPowerBoosting.tsx
@@ -13,7 +13,7 @@ interface IEmptyPowerBoosting {
 
 export const EmptyPowerBoosting: FC<IEmptyPowerBoosting> = ({ myAccount }) => {
 	const sdh = new SubgraphDataHelper(
-		useAppSelector(state => state.subgraph.xDaiValues),
+		useAppSelector(state => state.subgraph.gnosisValues),
 	);
 	const givPower = sdh.getUserGIVPowerBalance();
 	const { formatMessage } = useIntl();
diff --git a/src/components/views/userProfile/boostedTab/ProfileBoostedTab.tsx b/src/components/views/userProfile/boostedTab/ProfileBoostedTab.tsx
index 5c122c5a33..2e69b95ebf 100644
--- a/src/components/views/userProfile/boostedTab/ProfileBoostedTab.tsx
+++ b/src/components/views/userProfile/boostedTab/ProfileBoostedTab.tsx
@@ -53,7 +53,7 @@ export const ProfileBoostedTab: FC<IUserProfileView> = ({
 	});
 
 	const sdh = new SubgraphDataHelper(
-		useAppSelector(state => state.subgraph.xDaiValues),
+		useAppSelector(state => state.subgraph.gnosisValues),
 	);
 	const { userData } = useAppSelector(state => state.user);
 	const boostedProjectsCount = userData?.boostedProjectsCount ?? 0;
diff --git a/src/config/development.ts b/src/config/development.ts
index d552b624c9..bfb068e0cd 100644
--- a/src/config/development.ts
+++ b/src/config/development.ts
@@ -17,7 +17,7 @@ const SEPT_8TH_2022 = 1662595200000;
 const MAINNET_NETWORK_NUMBER = 5; // Goerli
 const XDAI_NETWORK_NUMBER = 100; // xDAI
 const POLYGON_NETWORK_NUMBER = 137;
-const OPTIMISM_NETWORK_NUMBER = 10;
+const OPTIMISM_NETWORK_NUMBER = 420;
 const CELO_NETWORK_NUMBER = 44787;
 
 const config: EnvConfig = {
@@ -263,13 +263,27 @@ const config: EnvConfig = {
 	},
 
 	OPTIMISM_CONFIG: {
-		nodeUrl: networksParams[10]?.rpcUrls[0],
-		...networksParams[10],
+		nodeUrl: networksParams[420]?.rpcUrls[0],
+		...networksParams[420],
 		gasPreference: {
 			// Keep it empty for automatic configuration
 		},
-		blockExplorerName: ['OptimismScan'],
-		subgraphAddress: '',
+		blockExplorerName: ['GoerliOptimismScan'],
+		subgraphAddress:
+			'https://api.thegraph.com/subgraphs/name/giveth/giveth-economy-optim-staging',
+		TOKEN_ADDRESS: '0xc916Ce4025Cb479d9BA9D798A80094a449667F5D',
+		tokenAddressOnUniswapV2: '0x4f4F9b8D5B4d0Dc10506e5551B0513B61fD59e75',
+		TOKEN_DISTRO_ADDRESS: '0x8D2cBce8ea0256bFFBa6fa4bf7CEC46a1d9b43f6',
+		pools: [],
+		regenPools: [],
+		regenStreams: [],
+		GIV: {
+			network: OPTIMISM_NETWORK_NUMBER,
+			LM_ADDRESS: '0x632AC305ed88817480d12155A7F1244cC182C298',
+			GARDEN_ADDRESS: '0x632AC305ed88817480d12155A7F1244cC182C298',
+			BUY_LINK: 'https://',
+		},
+		uniswapV2Subgraph: '',
 	},
 
 	CELO_CONFIG: {
diff --git a/src/config/production.ts b/src/config/production.ts
index 3f85c5f611..46422e5ba9 100644
--- a/src/config/production.ts
+++ b/src/config/production.ts
@@ -365,6 +365,18 @@ const config: EnvConfig = {
 		},
 		blockExplorerName: ['OptimismScan'],
 		subgraphAddress: '',
+		TOKEN_ADDRESS: '0xc916Ce4025Cb479d9BA9D798A80094a449667F5D',
+		tokenAddressOnUniswapV2: '0x4f4F9b8D5B4d0Dc10506e5551B0513B61fD59e75',
+		TOKEN_DISTRO_ADDRESS: '0x8D2cBce8ea0256bFFBa6fa4bf7CEC46a1d9b43f6',
+		pools: [],
+		regenPools: [],
+		regenStreams: [],
+		GIV: {
+			network: OPTIMISM_NETWORK_NUMBER,
+			LM_ADDRESS: '',
+			BUY_LINK: 'https://',
+		},
+		uniswapV2Subgraph: '',
 	},
 
 	CELO_CONFIG: {
diff --git a/src/features/hooks.ts b/src/features/hooks.ts
index 9ed4d646a4..1e34965c55 100644
--- a/src/features/hooks.ts
+++ b/src/features/hooks.ts
@@ -6,4 +6,8 @@ import type { RootState, AppDispatch } from './store';
 export const useAppDispatch = () => useDispatch<AppDispatch>();
 export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
 export const currentValuesHelper = (chainId?: number) =>
-	chainId === config.MAINNET_NETWORK_NUMBER ? 'mainnetValues' : 'xDaiValues';
+	chainId === config.MAINNET_NETWORK_NUMBER
+		? 'mainnetValues'
+		: chainId === config.OPTIMISM_NETWORK_NUMBER
+		? 'optimismValues'
+		: 'gnosisValues';
diff --git a/src/features/subgraph/subgraph.services.ts b/src/features/subgraph/subgraph.services.ts
index d34ced9a7d..95e3b9e789 100644
--- a/src/features/subgraph/subgraph.services.ts
+++ b/src/features/subgraph/subgraph.services.ts
@@ -26,10 +26,10 @@ export const fetchMainnetInfo = async (userAddress?: string) => {
 	}
 };
 
-export const fetchXDaiInfo = async (userAddress?: string) => {
+export const fetchGnosisInfo = async (userAddress?: string) => {
 	try {
 		const response = await fetchSubgraph(
-			SubgraphQueryBuilder.getXDaiQuery(userAddress),
+			SubgraphQueryBuilder.getGnosisQuery(userAddress),
 			config.XDAI_NETWORK_NUMBER,
 		);
 		return transformSubgraphData({
@@ -37,10 +37,31 @@ export const fetchXDaiInfo = async (userAddress?: string) => {
 			networkNumber: config.XDAI_NETWORK_NUMBER,
 		});
 	} catch (e) {
-		console.error('Error on query xDai subgraph:', e);
+		console.error('Error on query Gnosis subgraph:', e);
 		captureException(e, {
 			tags: {
-				section: 'fetchxDaiSubgraph',
+				section: 'fetchGnosisSubgraph',
+			},
+		});
+		return defaultSubgraphValues;
+	}
+};
+
+export const fetchOptimismInfo = async (userAddress?: string) => {
+	try {
+		const response = await fetchSubgraph(
+			SubgraphQueryBuilder.getOptimismQuery(userAddress),
+			config.OPTIMISM_NETWORK_NUMBER,
+		);
+		return transformSubgraphData({
+			...response,
+			networkNumber: config.OPTIMISM_NETWORK_NUMBER,
+		});
+	} catch (e) {
+		console.error('Error on query Optimism subgraph:', e);
+		captureException(e, {
+			tags: {
+				section: 'fetchOptimismSubgraph',
 			},
 		});
 		return defaultSubgraphValues;
diff --git a/src/features/subgraph/subgraph.slice.ts b/src/features/subgraph/subgraph.slice.ts
index 8859d8d62b..931b443a17 100644
--- a/src/features/subgraph/subgraph.slice.ts
+++ b/src/features/subgraph/subgraph.slice.ts
@@ -2,21 +2,12 @@ import { createSlice } from '@reduxjs/toolkit';
 import config from '@/configuration';
 import {
 	fetchCurrentInfoAsync,
-	fetchXDaiInfoAsync,
 	fetchMainnetInfoAsync,
+	fetchGnosisInfoAsync,
+	fetchOptimismInfoAsync,
 } from './subgraph.thunks';
 import type { ISubgraphState } from './subgraph.types';
 
-const defaultGIVpowerInfo = {
-	id: '',
-	initialDate: '0',
-	locksCreated: 0,
-	roundDuration: 1,
-	totalGIVLocked: '0',
-	currentRound: 0,
-	nextRoundDate: '0',
-};
-
 export const defaultSubgraphValues: ISubgraphState = {
 	userNotStakedPositions: [],
 	userStakedPositions: [],
@@ -36,11 +27,13 @@ export const defaultXdaiSubgraphValues: ISubgraphState = {
 const initialState: {
 	currentValues: ISubgraphState;
 	mainnetValues: ISubgraphState;
-	xDaiValues: ISubgraphState;
+	gnosisValues: ISubgraphState;
+	optimismValues: ISubgraphState;
 } = {
 	currentValues: defaultSubgraphValues,
 	mainnetValues: defaultSubgraphValues,
-	xDaiValues: defaultXdaiSubgraphValues,
+	gnosisValues: defaultXdaiSubgraphValues,
+	optimismValues: defaultSubgraphValues,
 };
 
 export const subgraphSlice = createSlice({
@@ -53,16 +46,24 @@ export const subgraphSlice = createSlice({
 				state.currentValues = action.payload.response;
 				if (action.payload.chainId === config.MAINNET_NETWORK_NUMBER) {
 					state.mainnetValues = action.payload.response;
-				}
-				if (action.payload.chainId === config.XDAI_NETWORK_NUMBER) {
-					state.xDaiValues = action.payload.response;
+				} else if (
+					action.payload.chainId === config.XDAI_NETWORK_NUMBER
+				) {
+					state.gnosisValues = action.payload.response;
+				} else if (
+					action.payload.chainId === config.OPTIMISM_NETWORK_NUMBER
+				) {
+					state.optimismValues = action.payload.response;
 				}
 			})
-			.addCase(fetchXDaiInfoAsync.fulfilled, (state, action) => {
-				state.xDaiValues = action.payload;
-			})
 			.addCase(fetchMainnetInfoAsync.fulfilled, (state, action) => {
 				state.mainnetValues = action.payload;
+			})
+			.addCase(fetchGnosisInfoAsync.fulfilled, (state, action) => {
+				state.gnosisValues = action.payload;
+			})
+			.addCase(fetchOptimismInfoAsync.fulfilled, (state, action) => {
+				state.optimismValues = action.payload;
 			});
 	},
 });
diff --git a/src/features/subgraph/subgraph.thunks.ts b/src/features/subgraph/subgraph.thunks.ts
index 1a5381b5f6..23b35a1ef6 100644
--- a/src/features/subgraph/subgraph.thunks.ts
+++ b/src/features/subgraph/subgraph.thunks.ts
@@ -1,12 +1,24 @@
 import { createAsyncThunk } from '@reduxjs/toolkit';
 import config from '@/configuration';
-import { fetchMainnetInfo, fetchXDaiInfo } from './subgraph.services';
+import {
+	fetchMainnetInfo,
+	fetchGnosisInfo,
+	fetchOptimismInfo,
+} from './subgraph.services';
 import { ICurrentInfo } from './subgraph.types';
 
-export const fetchXDaiInfoAsync = createAsyncThunk(
-	'subgraph/fetchXDaiInfo',
+export const fetchOptimismInfoAsync = createAsyncThunk(
+	'subgraph/fetchOptimismInfo',
 	async (userAddress?: string) => {
-		const response = await fetchXDaiInfo(userAddress);
+		const response = await fetchOptimismInfo(userAddress);
+		return { ...response, isLoaded: true };
+	},
+);
+
+export const fetchGnosisInfoAsync = createAsyncThunk(
+	'subgraph/fetchGnosisInfo',
+	async (userAddress?: string) => {
+		const response = await fetchGnosisInfo(userAddress);
 		return { ...response, isLoaded: true };
 	},
 );
@@ -21,14 +33,16 @@ export const fetchMainnetInfoAsync = createAsyncThunk(
 
 export const fetchCurrentInfoAsync = createAsyncThunk(
 	'subgraph/fetchCurrentInfo',
-	async (props: ICurrentInfo) => {
+	async ({ userAddress, chainId }: ICurrentInfo) => {
 		const response =
-			props.chainId === config.MAINNET_NETWORK_NUMBER
-				? await fetchMainnetInfo(props.userAddress)
-				: await fetchXDaiInfo(props.userAddress);
+			chainId === config.MAINNET_NETWORK_NUMBER
+				? await fetchMainnetInfo(userAddress)
+				: chainId === config.OPTIMISM_NETWORK_NUMBER
+				? await fetchOptimismInfo(userAddress)
+				: await fetchGnosisInfo(userAddress);
 		return {
 			response: { ...response, isLoaded: true },
-			chainId: props.chainId,
+			chainId: chainId,
 		};
 	},
 );
diff --git a/src/helpers/blockchain.ts b/src/helpers/blockchain.ts
index 768ef10ac8..d95133e63d 100644
--- a/src/helpers/blockchain.ts
+++ b/src/helpers/blockchain.ts
@@ -80,6 +80,17 @@ export const networksParams: {
 		blockExplorerUrls: ['https://kovan.etherscan.io/'],
 		rpcUrls: ['https://kovan.infura.io/v3/'],
 	},
+	420: {
+		chainId: '0x1A4',
+		chainName: 'Optimism Goerli',
+		nativeCurrency: {
+			name: 'ETH',
+			symbol: 'ETH',
+			decimals: 18,
+		},
+		blockExplorerUrls: ['https://goerli-optimism.etherscan.io/'],
+		rpcUrls: ['https://goerli.optimism.io/'],
+	},
 	137: {
 		chainId: '0x89',
 		chainName: 'Polygon Mainnet',
diff --git a/src/hooks/useStakingPool.tsx b/src/hooks/useStakingPool.tsx
index a23738e99b..7b72074d33 100644
--- a/src/hooks/useStakingPool.tsx
+++ b/src/hooks/useStakingPool.tsx
@@ -36,7 +36,9 @@ export const useStakingPool = (
 	const currentValues = useAppSelector(
 		state =>
 			poolStakingConfig.network === config.XDAI_NETWORK_NUMBER
-				? state.subgraph.xDaiValues
+				? state.subgraph.gnosisValues
+				: poolStakingConfig.network === config.OPTIMISM_NETWORK_NUMBER
+				? state.subgraph.optimismValues
 				: state.subgraph.mainnetValues,
 		() => (hold ? true : false),
 	);
diff --git a/src/hooks/useTokenDistroHelper.tsx b/src/hooks/useTokenDistroHelper.tsx
index 9c2d498774..cd387d1e78 100644
--- a/src/hooks/useTokenDistroHelper.tsx
+++ b/src/hooks/useTokenDistroHelper.tsx
@@ -16,7 +16,9 @@ export const useTokenDistroHelper = (
 	const currentValues = useAppSelector(
 		state =>
 			poolNetwork === config.XDAI_NETWORK_NUMBER
-				? state.subgraph.xDaiValues
+				? state.subgraph.gnosisValues
+				: poolNetwork === config.OPTIMISM_NETWORK_NUMBER
+				? state.subgraph.optimismValues
 				: state.subgraph.mainnetValues,
 		() => (hold ? true : false),
 	);
diff --git a/src/lib/claim.ts b/src/lib/claim.ts
index b027478524..d332a764c4 100644
--- a/src/lib/claim.ts
+++ b/src/lib/claim.ts
@@ -9,7 +9,7 @@ import TOKEN_DISTRO_JSON from '../artifacts/TokenDistro.json';
 import { transformSubgraphData } from '@/lib/subgraph/subgraphDataTransform';
 import { getGasPreference } from '@/lib/helpers';
 import { MerkleDistro } from '@/types/contracts';
-import { fetchXDaiInfo } from '@/features/subgraph/subgraph.services';
+import { fetchGnosisInfo } from '@/features/subgraph/subgraph.services';
 import { SubgraphDataHelper } from '@/lib/subgraph/subgraphDataHelper';
 
 const { abi: MERKLE_ABI } = MerkleDropJson;
@@ -48,7 +48,7 @@ export const fetchAirDropClaimData = async (
 
 export const hasClaimedAirDrop = async (address: string): Promise<boolean> => {
 	try {
-		const response = await fetchXDaiInfo(address);
+		const response = await fetchGnosisInfo(address);
 		const sdh = new SubgraphDataHelper(transformSubgraphData(response));
 
 		const balances = sdh.getGIVTokenDistroBalance();
diff --git a/src/lib/subgraph/subgraphDataTransform.ts b/src/lib/subgraph/subgraphDataTransform.ts
index ff99fb7079..a306b0a635 100644
--- a/src/lib/subgraph/subgraphDataTransform.ts
+++ b/src/lib/subgraph/subgraphDataTransform.ts
@@ -177,11 +177,11 @@ export const transformTokenDistroBalance = (info: any): ITokenDistroBalance => {
 };
 
 const transformGIVpowerInfo = (info: any = {}): IGIVpower => {
-	const id = info.id || '';
-	const initialDate = info.initialDate || '0';
-	const locksCreated = Number(info.locksCreated || 0);
-	const totalGIVLocked = info.totalGIVLocked || '0';
-	const roundDuration = Number(info.roundDuration || 0);
+	const id = info?.id || '';
+	const initialDate = info?.initialDate || '0';
+	const locksCreated = Number(info?.locksCreated || 0);
+	const totalGIVLocked = info?.totalGIVLocked || '0';
+	const roundDuration = Number(info?.roundDuration || 0);
 	return {
 		id,
 		initialDate,
@@ -221,6 +221,7 @@ export const transformSubgraphData = (data: any = {}): ISubgraphState => {
 			case key.startsWith('tokenDistroBalance_'):
 				result[key] = transformTokenDistroBalance(value);
 				break;
+
 			case key === 'givpowerInfo':
 				result[key] = transformGIVpowerInfo(value);
 				break;
diff --git a/src/lib/subgraph/subgraphQueryBuilder.ts b/src/lib/subgraph/subgraphQueryBuilder.ts
index b003534a6f..34b0403d60 100644
--- a/src/lib/subgraph/subgraphQueryBuilder.ts
+++ b/src/lib/subgraph/subgraphQueryBuilder.ts
@@ -212,8 +212,8 @@ export class SubgraphQueryBuilder {
 			.join('');
 	};
 
-	private static getGIVPowersInfoQuery = (): string => {
-		return `givpower(id: "${config.XDAI_CONFIG.GIV.LM_ADDRESS.toLowerCase()}"){
+	private static getGIVPowersInfoQuery = (lmAddress: string): string => {
+		return `givpower(id: "${lmAddress.toLowerCase()}"){
 			id
 			initialDate
 			locksCreated
@@ -283,8 +283,9 @@ export class SubgraphQueryBuilder {
 		`;
 	};
 
-	static getXDaiQuery = (userAddress?: string): string => {
-		return `query {
+	static getGnosisQuery = (userAddress?: string): string => {
+		return `
+		{
 			${SubgraphQueryBuilder.getBalanceQuery(config.XDAI_CONFIG, userAddress)}
 			${SubgraphQueryBuilder.generateTokenDistroQueries(
 				config.XDAI_CONFIG,
@@ -299,7 +300,33 @@ export class SubgraphQueryBuilder {
 				],
 				userAddress,
 			)}
-			givpowerInfo: ${SubgraphQueryBuilder.getGIVPowersInfoQuery()},
+			givpowerInfo: ${SubgraphQueryBuilder.getGIVPowersInfoQuery(
+				config.XDAI_CONFIG.GIV.LM_ADDRESS,
+			)},
+		}
+		`;
+	};
+
+	static getOptimismQuery = (userAddress?: string): string => {
+		return `
+		{
+			${SubgraphQueryBuilder.getBalanceQuery(config.OPTIMISM_CONFIG, userAddress)}
+			${SubgraphQueryBuilder.generateTokenDistroQueries(
+				config.OPTIMISM_CONFIG,
+				userAddress,
+			)}
+			${SubgraphQueryBuilder.generateFarmingQueries(
+				[
+					getGivStakingConfig(config.OPTIMISM_CONFIG),
+					...(config.OPTIMISM_CONFIG
+						.pools as Array<SimplePoolStakingConfig>),
+					...config.OPTIMISM_CONFIG.regenPools,
+				],
+				userAddress,
+			)}
+			givpowerInfo: ${SubgraphQueryBuilder.getGIVPowersInfoQuery(
+				config.OPTIMISM_CONFIG.GIV.LM_ADDRESS,
+			)},
 		}
 		`;
 	};
diff --git a/src/services/subgraph.service.ts b/src/services/subgraph.service.ts
index dca88b8331..2080359f0a 100644
--- a/src/services/subgraph.service.ts
+++ b/src/services/subgraph.service.ts
@@ -13,6 +13,8 @@ export const fetchSubgraph = async (
 		uri = config.MAINNET_CONFIG.subgraphAddress;
 	} else if (network === config.XDAI_NETWORK_NUMBER) {
 		uri = config.XDAI_CONFIG.subgraphAddress;
+	} else if (network === config.OPTIMISM_NETWORK_NUMBER) {
+		uri = config.OPTIMISM_CONFIG.subgraphAddress;
 	} else {
 		console.error('Network is not Defined!');
 		return {};
diff --git a/src/types/config.ts b/src/types/config.ts
index 4a8dd4731b..2110c6478c 100644
--- a/src/types/config.ts
+++ b/src/types/config.ts
@@ -167,7 +167,7 @@ export interface EnvConfig {
 	MAINNET_CONFIG: MainnetNetworkConfig;
 	XDAI_CONFIG: XDaiNetworkConfig;
 	POLYGON_CONFIG: BasicNetworkConfig;
-	OPTIMISM_CONFIG: BasicNetworkConfig;
+	OPTIMISM_CONFIG: SimpleNetworkConfig;
 	CELO_CONFIG: BasicNetworkConfig;
 	GARDEN_LINK: string;
 	BASE_ROUTE: string;