Reverting unwanted claim changes (#2323)

* Removed claim modal original file test changes * Removed ProgresBar component that ended up not being used * Removed mock claim data * Removed duplicated constant ONE_HUNDRED_PERCENT Co-authored-by: Leandro <[email protected]>
gnosis · Jan 27, 2022 · cd633a0 · cd633a0
1 parent ce73a5b
commit cd633a0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 327 deletions.
diff --git a/src/components/claim/ClaimModal.tsx b/src/components/claim/ClaimModal.tsx
@@ -11,8 +11,8 @@ import tokenLogo from '../../assets/images/token-logo.png'
 import { useActiveWeb3React } from '../../hooks/web3'
 import { useModalOpen, useToggleSelfClaimModal } from '../../state/application/hooks'
 import { ApplicationModal } from '../../state/application/reducer'
-import { useClaimCallback, useUserClaimData, useUserUnclaimedAmount } from 'state/claim/hooks'
-import { useUserHasSubmittedClaim } from 'state/transactions/hooks'
+import { useClaimCallback, useUserClaimData, useUserUnclaimedAmount } from '../../state/claim/hooks'
+import { useUserHasSubmittedClaim } from '../../state/transactions/hooks'
 import { CloseIcon, CustomLightSpinner, ExternalLink, TYPE, UniTokenAnimated } from '../../theme'
 import { ExplorerDataType, getExplorerLink } from '../../utils/getExplorerLink'
 import { ButtonPrimary } from '../Button'
@@ -51,25 +51,23 @@ export default function ClaimModal() {
   const isOpen = useModalOpen(ApplicationModal.SELF_CLAIM)
   const toggleClaimModal = useToggleSelfClaimModal()
 
-  const { chainId } = useActiveWeb3React()
+  const { account, chainId } = useActiveWeb3React()
 
-  const account = '0x0010B775429d6C92333E363CBd6BF28dDF1A87E6'
   // used for UI loading states
   const [attempting, setAttempting] = useState<boolean>(false)
 
   // get user claim data
   const userClaimData = useUserClaimData(account)
 
   // monitor the status of the claim from contracts and txns
-  const { claimCallback } = useClaimCallback(account) // TODO: remove me, hard coded only for testing
+  const { claimCallback } = useClaimCallback(account)
   const unclaimedAmount: CurrencyAmount<Token> | undefined = useUserUnclaimedAmount(account)
   const { claimSubmitted, claimTxn } = useUserHasSubmittedClaim(account ?? undefined)
   const claimConfirmed = Boolean(claimTxn?.receipt)
 
   function onClaim() {
-    console.log(`Trying to claim!!!`, unclaimedAmount?.toString(), claimConfirmed)
     setAttempting(true)
-    claimCallback([{ index: 3 }])
+    claimCallback()
       // reset modal and log error
       .catch((error) => {
         setAttempting(false)

diff --git a/src/custom/components/ProgressBar/index.tsx b/src/custom/components/ProgressBar/index.tsx
diff --git a/src/custom/components/ProgressBar/styled.tsx b/src/custom/components/ProgressBar/styled.tsx
diff --git a/src/custom/constants/index.ts b/src/custom/constants/index.ts
@@ -10,9 +10,6 @@ export const INITIAL_ALLOWED_SLIPPAGE_PERCENT = new Percent('5', '1000') // 0.5%
 export const RADIX_DECIMAL = 10
 export const RADIX_HEX = 16
 
-// TODO: remove, this is duplicated with `import { ONE_HUNDRED_PERCENT } from 'constants/misc'`
-export const ONE_HUNDRED_PERCENT = new Percent(1, 1)
-
 export const DEFAULT_DECIMALS = 18
 export const DEFAULT_PRECISION = 6
 export const DEFAULT_SMALL_LIMIT = '0.000001'

diff --git a/src/custom/state/claim/hooks/index.ts b/src/custom/state/claim/hooks/index.ts
@@ -27,9 +27,6 @@ import {
   transformRepoClaimsToUserClaims,
 } from 'state/claim/hooks/utils'
 import { SupportedChainId } from 'constants/chains'
-import { registerOnWindow } from 'utils/misc'
-import mockData, { MOCK_INDICES } from './mocks/claimData'
-import { getIndexes } from './utils'
 import { useAllClaimingTransactionIndices } from 'state/enhancedTransactions/hooks'
 
 export { useUserClaimData } from '@src/state/claim/hooks'
@@ -266,13 +263,6 @@ export function useUserClaims(account: Account): UserClaims | null {
   return claimKey ? claimInfo[claimKey] : null
 }
 
-// TODO: remove
-const createMockTx = (data: number[]) => ({
-  hash: '0x' + Math.round(Math.random() * 10).toString() + 'AxAFjAhG89G89AfnLK3CCxAfnLKQffQ782G89AfnLK3CCxxx123FF',
-  summary: `Claimed ${Math.random() * 3337} vCOW`,
-  claim: { recipient: '0x97EC4fcD5F78cA6f6E4E1EAC6c0Ec8421bA518B7', indices: data },
-})
-
 /**
  * Fetches from contract the deployment timestamp in ms
  *
@@ -431,20 +421,6 @@ export function useClaimCallback(account: string | null | undefined): {
   const addTransaction = useTransactionAdder()
   const vCowToken = chainId ? V_COW[chainId] : undefined
 
-  // TODO: remove
-  registerOnWindow({
-    addMockClaimTransactions: (data?: number[]) => {
-      let finalData: number[] | undefined = data
-
-      if (!finalData) {
-        const mockDataIndices = connectedAccount ? getIndexes(mockData[connectedAccount] || []) : []
-        finalData = mockDataIndices?.length > 0 ? mockDataIndices : MOCK_INDICES
-      }
-
-      return addTransaction(createMockTx(finalData))
-    },
-  })
-
   const getClaimArgs = useCallback(
     async function (claimInput: ClaimInput[]): Promise<GetClaimManyArgsResult> {
       if (claims.length === 0) {

diff --git a/src/custom/state/claim/hooks/mocks/claimData.ts b/src/custom/state/claim/hooks/mocks/claimData.ts
diff --git a/src/custom/state/orders/utils.ts b/src/custom/state/orders/utils.ts
@@ -1,7 +1,8 @@
 import { OrderKind } from '@gnosis.pm/gp-v2-contracts'
 import { Price } from '@uniswap/sdk-core'
 
-import { ONE_HUNDRED_PERCENT, PENDING_ORDERS_BUFFER } from 'constants/index'
+import { ONE_HUNDRED_PERCENT } from 'constants/misc'
+import { PENDING_ORDERS_BUFFER } from 'constants/index'
 import { OrderMetaData } from 'api/gnosisProtocol'
 import { Order } from 'state/orders/actions'
 import { PriceInformation } from 'utils/price'