Bump packages

pooltogether · Jun 26, 2023 · f6c9ae5 · f6c9ae5
1 parent 22456dd
commit f6c9ae5
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -47,8 +47,8 @@
     "@pooltogether/v4-client-js": "1.18.1",
     "@pooltogether/v4-pool-data": "1.11.0",
     "@pooltogether/v4-twab-delegator-js": "0.2.2",
-    "@pooltogether/v4-utils-js": "0.1.5",
-    "@pooltogether/wallet-connection": "1.0.3",
+    "@pooltogether/v4-utils-js": "0.1.7",
+    "@pooltogether/wallet-connection": "1.1.0",
     "@rainbow-me/rainbowkit": "0.12.15",
     "@reach/dialog": "^0.15.3",
     "@reach/menu-button": "^0.15.3",
@@ -62,7 +62,6 @@
     "@types/node": "17.0.21",
     "@types/react": "^18.0.20",
     "@types/react-dom": "^18.0.6",
-    "@wagmi/chains": "^0.1.13",
     "autoprefixer": "^10.3.1",
     "beautiful-react-hooks": "^3.6.2",
     "classnames": "^2.3.1",

diff --git a/src/components/Input/TxButton.tsx b/src/components/Input/TxButton.tsx
@@ -3,10 +3,10 @@ import { getNetworkNiceNameByChainId } from '@pooltogether/utilities'
 import {
   TransactionState,
   TransactionStatus,
-  useConnectWallet,
   useIsWalletConnected,
   useIsWalletOnChainId
 } from '@pooltogether/wallet-connection'
+import { useConnectModal } from '@rainbow-me/rainbowkit'
 import { useTranslation } from 'next-i18next'
 import React, { useMemo } from 'react'
 import { useSwitchNetwork } from 'wagmi'
@@ -36,7 +36,7 @@ export const TxButton = (props: TxButtonProps) => {
     ...buttonProps
   } = props
   const isWalletConnected = useIsWalletConnected()
-  const connectWallet = useConnectWallet()
+  const { openConnectModal } = useConnectModal()
   const { switchNetwork } = useSwitchNetwork()
 
   const { t } = useTranslation()
@@ -53,7 +53,7 @@ export const TxButton = (props: TxButtonProps) => {
       if (!!_connectWallet) {
         return [t('connectWallet'), _connectWallet, 'button']
       }
-      return [t('connectWallet'), connectWallet, 'button']
+      return [t('connectWallet'), openConnectModal, 'button']
     } else if (status === TransactionStatus.pendingUserConfirmation) {
       return [t('confirmInWallet'), () => null, 'button']
     } else if (status === TransactionStatus.pendingBlockchainConfirmation) {
@@ -69,7 +69,7 @@ export const TxButton = (props: TxButtonProps) => {
     isWalletOnProperNetwork,
     _connectWallet,
     t,
-    connectWallet,
+    openConnectModal,
     networkName,
     switchNetwork,
     chainId,

diff --git a/src/components/Modal/DepositModal/index.tsx b/src/components/Modal/DepositModal/index.tsx
@@ -15,6 +15,7 @@ import {
   PrizePool
 } from '@pooltogether/v4-client-js'
 import { useTransaction } from '@pooltogether/wallet-connection'
+import { useConnectModal } from '@rainbow-me/rainbowkit'
 import { ApprovalType } from '@views/Deposit/DepositTrigger/DepositModal'
 import { RSV } from 'eth-permit/dist/rpc'
 import { useCallback, useEffect, useState } from 'react'
@@ -99,6 +100,8 @@ export const DepositModal: React.FC<{
     setSelectedViewId(ViewIds.deposit)
   }
 
+  const { openConnectModal } = useConnectModal()
+
   return (
     <BottomSheetWithViewState
       snapPoints={snapToFull}
@@ -131,7 +134,7 @@ export const DepositModal: React.FC<{
       // reviewView
       sendDepositTransaction={sendDepositTransaction}
       clearDepositTransaction={() => setDepositTransactionId('')}
-      connectWallet={() => setSelectedViewId(ViewIds.walletConnection)}
+      connectWallet={openConnectModal}
       approvalType={approvalType}
       setApprovalType={setApprovalType}
       eip2612DepositPermit={eip2612DepositPermit}

diff --git a/src/constants/config.ts b/src/constants/config.ts
@@ -204,7 +204,8 @@ export const BRIDGE_URLS = Object.freeze({
     { url: 'https://app.optimism.io/bridge', title: 'Optimism bridge' },
     { url: 'https://wallet.polygon.technology/bridge', title: 'Polygon bridge' },
     { url: 'https://bridge.avax.network/', title: 'Avalanche bridge' },
-    { url: 'https://bridge.arbitrum.io/', title: 'Arbitrum bridge' }
+    { url: 'https://bridge.arbitrum.io/', title: 'Arbitrum bridge' },
+    { url: 'https://across.to/bridge', title: 'Across bridge' }
     // { url: 'https://zapper.fi/bridge', title: 'Zapper' },
     // { url: 'https://app.hop.exchange/send?token=USDC', title: 'Hop Protocol' }
   ],
@@ -214,7 +215,10 @@ export const BRIDGE_URLS = Object.freeze({
     // { url: 'https://app.hop.exchange/send?token=USDC', title: 'Hop Protocol' }
   ],
   [CHAIN_ID.avalanche]: [{ url: 'https://bridge.avax.network/', title: 'Avalanche bridge' }],
-  [CHAIN_ID.optimism]: [{ url: 'https://app.optimism.io/bridge', title: 'Optimism bridge' }],
+  [CHAIN_ID.optimism]: [
+    { url: 'https://app.optimism.io/bridge', title: 'Optimism bridge' },
+    { url: 'https://across.to/bridge', title: 'Across bridge' }
+  ],
   [CHAIN_ID.arbitrum]: [{ url: 'https://bridge.arbitrum.io/', title: 'Arbitrum bridge' }]
 })
 

diff --git a/src/views/Account/V3DepositList/PrizePoolDepositView.tsx b/src/views/Account/V3DepositList/PrizePoolDepositView.tsx
@@ -16,8 +16,6 @@ import {
   Transaction,
   TransactionState,
   TransactionStatus,
-  useConnectWallet,
-  useIsWalletConnected,
   useTransaction,
   useUsersAddress
 } from '@pooltogether/wallet-connection'
@@ -162,8 +160,6 @@ const DepositFormView = (props: DepositFormViewProps) => {
   const { chainId, ticket, token, amountToDeposit, form, depositTx, setReviewDepositView } = props
 
   const { t } = useTranslation()
-  const connectWallet = useConnectWallet()
-  const isWalletConnected = useIsWalletConnected()
 
   const {
     handleSubmit,

diff --git a/src/views/Deposit/DepositTrigger/DepositModal/index.tsx b/src/views/Deposit/DepositTrigger/DepositModal/index.tsx
@@ -14,6 +14,7 @@ import {
   PrizePool
 } from '@pooltogether/v4-client-js'
 import { useTransaction } from '@pooltogether/wallet-connection'
+import { useConnectModal } from '@rainbow-me/rainbowkit'
 import { RSV } from 'eth-permit/dist/rpc'
 import { useRouter } from 'next/router'
 import { useTranslation } from 'next-i18next'
@@ -83,6 +84,8 @@ export const DepositModal: React.FC<{
 
   const { t } = useTranslation()
 
+  const { openConnectModal } = useConnectModal()
+
   const views: ModalWithViewStateView[] = [
     {
       id: ViewIds.explore,
@@ -156,7 +159,7 @@ export const DepositModal: React.FC<{
       // reviewView
       sendDepositTransaction={sendDepositTransaction}
       clearDepositTransaction={() => setDepositTransactionId('')}
-      connectWallet={() => setSelectedViewId(ViewIds.walletConnection)}
+      connectWallet={openConnectModal}
       approvalType={approvalType}
       setApprovalType={setApprovalType}
       eip2612DepositPermit={eip2612DepositPermit}

diff --git a/yarn.lock b/yarn.lock
@@ -2562,10 +2562,29 @@
     ethers "^5.5.1"
     lodash "^4.17.21"
 
-"@pooltogether/[email protected]":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@pooltogether/wallet-connection/-/wallet-connection-1.0.3.tgz#2b9bf1a46629e7067ae03f0f65bde03782cf246c"
-  integrity sha512-TTfU+1CKeFkfHO94iWjnEibeSXXfAoqxnuTUP2g3iLQ2eMVEFNxAuYV/6kfLLtSCmSMyW8a/Qs0TVWcg74c+GQ==
+"@pooltogether/[email protected]":
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/@pooltogether/v4-utils-js/-/v4-utils-js-0.1.7.tgz#01a00154b1ec5e31269f6137bf8fce1096dfd8c2"
+  integrity sha512-vHkXLYZOCF0G0gyXCM8Kc8GoAH5rQCcDD9Ta2ADaQNNF7X7o/AkQ2jhKVY+UKuzSvpsnTe3ajNETbGqctZvShQ==
+  dependencies:
+    "@ethersproject/abi" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/contracts" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/networks" "^5.5.0"
+    "@ethersproject/solidity" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/units" "^5.5.0"
+    "@pooltogether/contract-list-schema" "^0.1.4"
+    ethers "^5.5.1"
+    lodash "^4.17.21"
+
+"@pooltogether/[email protected]":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@pooltogether/wallet-connection/-/wallet-connection-1.1.0.tgz#a4360cd835b29e2ca6cfffeb096217ee8f308f4c"
+  integrity sha512-2p16herS7xs8GF0Ri9WGNGmKLSrjdGUszuoViObQDimwJl1B3H8Uh8PZX4CbRpxhQ0CyForZJAamGAlmtnDa5A==
   dependencies:
     "@download/blockies" "^1.0.3"
 
@@ -2607,10 +2626,10 @@
     style-value-types "^3.1.7"
     tslib "^1.10.0"
 
-"@rainbow-me/[email protected]-canary.3":
-  version "0.12.15-canary.3"
-  resolved "https://registry.yarnpkg.com/@rainbow-me/rainbowkit/-/rainbowkit-0.12.15-canary.3.tgz#856b281f5fed5ed34026fa1c26e71df29867e92e"
-  integrity sha512-atPVgPty+WwKzAufXnuh+7LqwdsuW+cv8LPfwQXPVPEHSlFqaXLy8LFwOWwh0KpKY3rl+cpVnTBUmDKoXiqSoQ==
+"@rainbow-me/[email protected]":
+  version "0.12.15"
+  resolved "https://registry.yarnpkg.com/@rainbow-me/rainbowkit/-/rainbowkit-0.12.15.tgz#b5c785ac1759a12fd3bdf58a94810c51e5cfeb5c"
+  integrity sha512-FL2EiH3Cr1Pjoda21cGexvcxzUGUB0eNojMeRpM5xu9tLVVGMwsaLLrmVztFRi77zcxTFzP5whbjo0LJb3r2bQ==
   dependencies:
     "@vanilla-extract/css" "1.9.1"
     "@vanilla-extract/dynamic" "2.0.2"
@@ -4017,11 +4036,6 @@
   resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-0.2.22.tgz#25e511e134a00742e4fbf5108613dadf876c5bd9"
   integrity sha512-TdiOzJT6TO1JrztRNjTA5Quz+UmQlbvWFG8N41u9tta0boHA1JCAzGGvU6KuIcOmJfRJkKOUIt67wlbopCpVHg==
 
-"@wagmi/chains@^0.1.13":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@wagmi/chains/-/chains-0.1.14.tgz#2740762f2719df2c69c63ab30b67fdf4bef70305"
-  integrity sha512-hSzb6Ni/PejVzliKkc5T3ehzRJxr5k4fZMGYuouqwArWQ8z7R4jrIlm2j2nNOD7Epz6ZucdiVluU1YH0d/EEyw==
-
 "@wagmi/[email protected]":
   version "0.3.21"
   resolved "https://registry.yarnpkg.com/@wagmi/connectors/-/connectors-0.3.21.tgz#0bec726c14217ad391f6e49af1203ccf0249786e"
@@ -4037,10 +4051,10 @@
     abitype "^0.3.0"
     eventemitter3 "^4.0.7"
 
-"@wagmi/[email protected].14":
-  version "0.10.14"
-  resolved "https://registry.yarnpkg.com/@wagmi/core/-/core-0.10.14.tgz#5b07df06c5d5a29bcee76b1ad71695e88559955b"
-  integrity sha512-+iQj5YNdVQ/kLVpVMLmF71Y2vnW3ox4b4Na4S9fvQazGudhqfqfpQ+YPYmH6SIIuZ1VhRnBmjJIY88IZt/OkwA==
+"@wagmi/[email protected].15":
+  version "0.10.15"
+  resolved "https://registry.yarnpkg.com/@wagmi/core/-/core-0.10.15.tgz#b9304bc0df07ebdddf6a9c26eef49825d4065964"
+  integrity sha512-rCrCVk28BxO8smLtBBnCZkvWFU1jI61x6DUidXAMagQ5yZdiDTr/YZpJzOkiR09fQCKq62INyRkJlRsk43SEoQ==
   dependencies:
     "@wagmi/chains" "0.2.22"
     "@wagmi/connectors" "0.3.21"
@@ -15964,15 +15978,15 @@ w3c-xmlserializer@^2.0.0:
   dependencies:
     xml-name-validator "^3.0.0"
 
-[email protected].16:
-  version "0.12.16"
-  resolved "https://registry.yarnpkg.com/wagmi/-/wagmi-0.12.16.tgz#4e5e2a29fd9d646b5a06e0ff8838be4d3459ed03"
-  integrity sha512-ZnQYC7wkcxNrfIZ+8LIYIXaEmnih8n4aUBZ5J+YI6QwnAWfo80jI79Z5F0BBML6wG7PYP2iIzMbIlnDIfx67uQ==
+[email protected].17:
+  version "0.12.17"
+  resolved "https://registry.yarnpkg.com/wagmi/-/wagmi-0.12.17.tgz#ae6787acb747ddfc6d9da3335cec559c8051731e"
+  integrity sha512-0HArKpVI0nlek135d8LfrIQv38pzCSOZVVUOHGdPS8Mweypeb3niCAHbIjr5ERXhLsoZO8jf9eSUML6ErdXxog==
   dependencies:
     "@tanstack/query-sync-storage-persister" "^4.27.1"
     "@tanstack/react-query" "^4.28.0"
     "@tanstack/react-query-persist-client" "^4.28.0"
-    "@wagmi/core" "0.10.14"
+    "@wagmi/core" "0.10.15"
     abitype "^0.3.0"
     use-sync-external-store "^1.2.0"