Merge pull request #141 from pooltogether/main

Deploy staging to production

package.json

@@ -49,7 +49,7 @@
  "@pooltogether/v4-twab-delegator-js": "0.2.2",
  "@pooltogether/v4-utils-js": "0.1.5",
  "@pooltogether/wallet-connection": "1.0.3",
- "@rainbow-me/rainbowkit": "^0.12.14",
+ "@rainbow-me/rainbowkit": "0.12.15",
  "@reach/dialog": "^0.15.3",
  "@reach/menu-button": "^0.15.3",
  "@reach/tooltip": "^0.15.3",
@@ -108,6 +108,6 @@
  "react-tooltip": "^4.2.21",
  "tailwindcss": "^2.2.19",
  "typescript": "4",
- "wagmi": "^0.12.13"
+ "wagmi": "0.12.17"
  }
 }

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,

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}

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' }]
 })
 

src/views/Account/Rewards/RewardsCard.tsx

@@ -709,14 +709,14 @@ const ClaimModalReceipt = (props: {
  <TwitterIntentButton
  url='https://app.pooltogether.com?utm_campaign=in-app-share&utm_source=app&utm_medium=twitter&utm_content=rewards-claim'
  text={t('rewardsTweet', {
- amountClaimed: `$${numberWithCommas(cachedClaimableUsd, { precision: 0 })}`
+ amountClaimed: `$${numberWithCommas(cachedClaimableUsd, { precision: 2 })}`
  })}
  hashTags={['PoolTogether']}
  />
  <LensterPostButton
  url='https://app.pooltogether.com?utm_campaign=in-app-share&utm_source=app&utm_medium=lenster&utm_content=rewards-claim'
  text={t('rewardsLensPost', {
- amountClaimed: `$${numberWithCommas(cachedClaimableUsd, { precision: 0 })}`
+ amountClaimed: `$${numberWithCommas(cachedClaimableUsd, { precision: 2 })}`
  })}
  hashTags={['PoolTogether']}
  />

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,

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}

src/views/Prizes/MultiDrawsCard/PrizeClaimSheet.tsx

@@ -190,14 +190,14 @@ export const PrizeClaimSheet = (props: PrizeClaimSheetProps) => {
  <TwitterIntentButton
  url='https://app.pooltogether.com?utm_campaign=in-app-share&utm_source=app&utm_medium=twitter&utm_content=prize-claim'
  text={t('prizesTweet', {
- amountClaimed: `$${numberWithCommas(claimAmountTwitter, { precision: 0 })}`
+ amountClaimed: `$${numberWithCommas(claimAmountTwitter, { precision: 2 })}`
  })}
  hashTags={['PoolTogether']}
  />
  <LensterPostButton
  url='https://app.pooltogether.com?utm_campaign=in-app-share&utm_source=app&utm_medium=lenster&utm_content=prize-claim'
  text={t('prizesLensPost', {
- amountClaimed: `$${numberWithCommas(claimAmountTwitter, { precision: 0 })}`
+ amountClaimed: `$${numberWithCommas(claimAmountTwitter, { precision: 2 })}`
  })}
  hashTags={['PoolTogether']}
  />