Merge branch 'development' into bull-run-campaign

README.md

@@ -498,4 +498,7 @@ Those contracts (except Ethereum-specific WALLET, xWALLET and SupplyController)
 ### v0.7.5
 - removed embeded Yearn Tesseract card from Earn section
 - update the @trezor/connect-web lib to latest from v9
-- implement `eth_gasPrice` rpcCall method for gnosisSafe
+- implement `eth_gasPrice` rpcCall method for gnosisSafe
+
+### v0.7.6
+- ambire-commonv1.0.2 - Hide OKX, Moonbeam, Moonriver, KCC Networks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ambire-wallet",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "private": true,
   "homepage": "./",
   "dependencies": {
@@ -26,7 +26,7 @@
     "@web3-react/abstract-connector": "^6.0.7",
     "@web3-react/types": "^6.0.7",
     "adex-protocol-eth": "git+https://[email protected]/AmbireTech/adex-protocol-eth.git#4ddebac4109e9709c4cc862ee0708f208dac9ee2",
-    "ambire-common": "github:AmbireTech/ambire-common#add/bull-run-campaign-dapps",
+    "ambire-common": "github:AmbireTech/ambire-common#v1.0.2",
     "bip44-constants": "^128.0.0",
     "blockies-ts": "^1.0.0",
     "chart.js": "^3.9.1",

src/context/ToastProvider/ToastProvider.js

@@ -126,11 +126,6 @@ const ToastProvider = ({ children }) => {
                         {badge ? <div className="badge">{badge}</div> : null}
                         {content}
                       </div>
-                      {sticky ? (
-                        <div className="close" onClick={() => removeToast(id)}>
-                          <MdOutlineClose />
-                        </div>
-                      ) : null}
                     </div>
                   </CSSTransition>
                 )

src/hooks/walletConnect/walletConnectV2.js

@@ -177,12 +177,28 @@ export default function useWalletConnectV2({
             reason: getSdkError('USER_DISCONNECTED')
           })
         } catch (e) {
-          console.log('WC2 disconnect error', e)
+          // Should happen in extremely rare cases in which the user's
+          // storage is corrupted and the keychain is not found.
+          if (e?.message?.includes('No matching key. keychain')) {
+            try {
+              await web3wallet.engine.signClient.session.delete(topic, 'USER_DISCONNECTED')
+            } catch {
+              addToast(
+                'Could not disconnect from the dApp. Please contact support if the issue persists.',
+                {
+                  error: true
+                }
+              )
+              console.log('WC2 disconnect error', e)
+            }
+          } else {
+            console.log('WC2 disconnect error', e)
+          }
         }
       }
       setIsConnecting(false)
     },
-    [web3wallet]
+    [web3wallet, addToast]
   )
 
   const resolveMany = (ids, resolution) => {