From 08e4c7f7c87b781769a3cb2bf0d3f792c6e874cc Mon Sep 17 00:00:00 2001
From: venky <venky.sridh@gmail.com>
Date: Sun, 27 Aug 2023 15:37:27 +0200
Subject: [PATCH 1/4] fix: update twitter URL

---
 public/index.html                               | 2 +-
 src/components/expeditions/ExpeditionsModal.tsx | 2 +-
 src/utils/uiConstants.tsx                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index c53866a3f..f607a40de 100644
--- a/public/index.html
+++ b/public/index.html
@@ -24,7 +24,7 @@
     <meta name="twitter:description" content="A governance-enabled automated market maker with adjustable fees." />
     <meta name="twitter:image" content="http://swapr.eth.limo/og.png" />
     <meta name="twitter:image:alt" content="Swapr" />
-    <meta name="twitter:site" content="@SwaprEth" />
+    <meta name="twitter:site" content="@Swapr_dapp" />
     <meta
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'strict-dynamic' 'nonce-<%= CSP_NONCE %>' 'unsafe-inline' 'unsafe-eval'; script-src-attr 'none'; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'; connect-src 'self' data: ws: wss: http: https:; img-src 'self' data: blob: https:; font-src 'self' data:; media-src 'self' blob: https:; frame-src 'self' dexscreener.com blob:; object-src 'self'; base-uri 'none'"
diff --git a/src/components/expeditions/ExpeditionsModal.tsx b/src/components/expeditions/ExpeditionsModal.tsx
index 628286318..bc779365b 100644
--- a/src/components/expeditions/ExpeditionsModal.tsx
+++ b/src/components/expeditions/ExpeditionsModal.tsx
@@ -45,7 +45,7 @@ export default function ExpeditionsModal({ onDismiss }: { onDismiss: () => void
           </Row>
           <Row>
             <Text>
-              Follow Swapr <ExternalLink href="https://twitter.com/swapreth">Twitter</ExternalLink> or{' '}
+              Follow Swapr <ExternalLink href="https://twitter.com/swapr_dapp">Twitter</ExternalLink> or{' '}
               <ExternalLink href="https://discord.gg/4QXEJQkvHH">Discord</ExternalLink> to get updates on Expeditions.
             </Text>
           </Row>
diff --git a/src/utils/uiConstants.tsx b/src/utils/uiConstants.tsx
index f413eceb1..866b9a9b5 100644
--- a/src/utils/uiConstants.tsx
+++ b/src/utils/uiConstants.tsx
@@ -345,7 +345,7 @@ export const FooterContent = {
         },
         {
           label: 'Twitter',
-          href: 'https://twitter.com/SwaprEth',
+          href: 'https://twitter.com/Swapr_dapp',
         },
         {
           label: 'Forum',

From bb23186f4739a976357cd21a9a667156888eec04 Mon Sep 17 00:00:00 2001
From: Leonardo Berteotti <berteotti2@gmail.com>
Date: Tue, 29 Aug 2023 11:41:36 +0100
Subject: [PATCH 2/4] fix: add wallet connect to CSP (#1865)

---
 .env.development        | 3 ++-
 .env.production         | 1 +
 public/index.html       | 2 +-
 src/connectors/index.ts | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 590d158c5..a72450334 100644
--- a/.env.development
+++ b/.env.development
@@ -7,4 +7,5 @@ REACT_APP_SOCKET_API_KEY=72a5b4b0-e727-48be-8aa1-5da9d62fe635
 # Default to chrome. Reference:node_modules/react-dev-utils/openBrowser.js
 # BROWSER=Brave Browser
 REACT_APP_STACKLY_DESIGN_VERSION=old
-REACT_APP_SHOW_STACKLY_POPUP=true
\ No newline at end of file
+REACT_APP_SHOW_STACKLY_POPUP=true
+REACT_APP_WALLET_CONNECT_ID=47ba8ad6d35c9c9087a75b35360c4b3a
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 9f27f0962..ab979b219 100644
--- a/.env.production
+++ b/.env.production
@@ -3,3 +3,4 @@ REACT_APP_FATHOM_SITE_SCRIPT_URL=https://gold-stunning.swapr.site/script.js
 REACT_APP_STACKLY_DESIGN_VERSION=old
 REACT_APP_SHOW_STACKLY_POPUP=true
 REACT_APP_SOCKET_API_KEY=0b353e78-04e1-41ef-8bf3-61453e2ad1da
+REACT_APP_WALLET_CONNECT_ID=47ba8ad6d35c9c9087a75b35360c4b3a
diff --git a/public/index.html b/public/index.html
index f607a40de..ad991f048 100644
--- a/public/index.html
+++ b/public/index.html
@@ -27,7 +27,7 @@
     <meta name="twitter:site" content="@Swapr_dapp" />
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'strict-dynamic' 'nonce-<%= CSP_NONCE %>' 'unsafe-inline' 'unsafe-eval'; script-src-attr 'none'; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'; connect-src 'self' data: ws: wss: http: https:; img-src 'self' data: blob: https:; font-src 'self' data:; media-src 'self' blob: https:; frame-src 'self' dexscreener.com blob:; object-src 'self'; base-uri 'none'"
+      content="default-src 'self'; script-src 'strict-dynamic' 'nonce-<%= CSP_NONCE %>' 'unsafe-inline' 'unsafe-eval'; script-src-attr 'none'; worker-src 'self' blob:; style-src 'self' 'unsafe-inline'; connect-src 'self' data: ws: wss: http: https:; img-src 'self' data: blob: https:; font-src 'self' data:; media-src 'self' blob: https:; frame-src 'self' dexscreener.com  verify.walletconnect.com blob:; object-src 'self'; base-uri 'none'"
     />
     <link rel="icon" href="%PUBLIC_URL%/favicon.png" />
     <script nonce="<%= CSP_NONCE %>">
diff --git a/src/connectors/index.ts b/src/connectors/index.ts
index 8a394c4f3..ded401b9c 100644
--- a/src/connectors/index.ts
+++ b/src/connectors/index.ts
@@ -34,13 +34,13 @@ export const [walletConnect, walletConnectHooks] = initializeConnector<WalletCon
     new WalletConnect({
       actions,
       options: {
-        projectId: '47ba8ad6d35c9c9087a75b35360c4b3a',
+        projectId: process.env.REACT_APP_WALLET_CONNECT_ID as string,
         chains: [ChainId.MAINNET],
         optionalChains: [
           ChainId.RINKEBY,
           ChainId.ARBITRUM_ONE,
           ChainId.ARBITRUM_RINKEBY,
-          ChainId.XDAI,
+          ChainId.GNOSIS,
           ChainId.POLYGON,
           ChainId.ARBITRUM_GOERLI,
           ChainId.OPTIMISM_MAINNET,

From c1c4240a55f99e2f1124bc13aeb15ea0b212691e Mon Sep 17 00:00:00 2001
From: Rorry <rodrigojali@gmail.com>
Date: Wed, 6 Sep 2023 21:29:14 -0300
Subject: [PATCH 3/4] feat(SWA-96): add native  in Optimism Mainnet

---
 src/constants/index.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/constants/index.tsx b/src/constants/index.tsx
index c49e11540..f01ef0926 100644
--- a/src/constants/index.tsx
+++ b/src/constants/index.tsx
@@ -82,6 +82,14 @@ export const ARBITRUM_NATIVE_USDC = new Token(
   'USD Coin'
 )
 
+export const OPTIMISM_NATIVE_USDC = new Token(
+  ChainId.OPTIMISM_MAINNET,
+  '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
+  6,
+  'USDC',
+  'USD Coin'
+)
+
 export const HONEY = new Token(ChainId.XDAI, '0x71850b7E9Ee3f13Ab46d67167341E4bDc905Eef9', 18, 'HNY', 'Honey')
 
 export const STAKE = new Token(
@@ -207,6 +215,7 @@ export const BASES_TO_CHECK_TRADES_AGAINST: ChainTokenList = {
   [ChainId.OPTIMISM_GOERLI]: [],
   [ChainId.OPTIMISM_MAINNET]: [
     USDC[ChainId.OPTIMISM_MAINNET],
+    OPTIMISM_NATIVE_USDC,
     USDT[ChainId.OPTIMISM_MAINNET],
     WBTC[ChainId.OPTIMISM_MAINNET],
   ],
@@ -259,6 +268,7 @@ export const SUGGESTED_BASES: ChainTokenList = {
     OP[ChainId.OPTIMISM_MAINNET],
     DAI[ChainId.OPTIMISM_MAINNET],
     USDC[ChainId.OPTIMISM_MAINNET],
+    OPTIMISM_NATIVE_USDC,
     USDT[ChainId.OPTIMISM_MAINNET],
     WBTC[ChainId.OPTIMISM_MAINNET],
   ],

From 5c8dfdf1a76e5c51b194b44f212ef1163957caff Mon Sep 17 00:00:00 2001
From: Rorry <rodrigojali@gmail.com>
Date: Wed, 6 Sep 2023 21:33:35 -0300
Subject: [PATCH 4/4] chore(SWA-96): update SDK dependency to point the SDK PR
 for testing purposes

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6ba2fa623..878d23a6c 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@reduxjs/toolkit": "^1.9.5",
     "@swapr/core": "^0.3.19",
     "@swapr/periphery": "^0.3.22",
-    "@swapr/sdk": "1.9.1",
+    "@swapr/sdk": "SwaprHQ/swapr-sdk#feat/swa-96-add-support-for-native-usdc-in-optimism",
     "@tanstack/react-query": "4.24.6",
     "@uniswap/token-lists": "^1.0.0-beta.27",
     "@uniswap/v3-periphery": "1.4.1",