Skip to content

Commit

Permalink
After rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
nenadV91 committed Apr 28, 2022
1 parent 6878a5a commit 6ed5e05
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/custom/pages/Profile/LockedGnoVesting/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useActiveWeb3React } from 'hooks/web3'
import MERKLE_DROP_ABI from 'abis/MerkleDrop.json'
import TOKEN_DISTRO_ABI from 'abis/TokenDistro.json'
import { MerkleDrop, TokenDistro } from 'abis/types'
import { useSingleCallResult } from 'state/multicall/hooks'
import { useSingleCallResult } from 'lib/hooks/multicall'
import { useTransactionAdder } from 'state/enhancedTransactions/hooks'
import { useContract } from 'hooks/useContract'
import { COW as COW_TOKENS } from 'constants/tokens'
Expand Down
5 changes: 3 additions & 2 deletions src/custom/state/orders/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,9 @@ export const cancelOrdersBatch = createAction<CancelOrdersBatchParams>('order/ca

export const clearOrders = createAction<{ chainId: ChainId }>('order/clearOrders')

export const updateLastCheckedBlock =
createAction<{ chainId: ChainId; lastCheckedBlock: number }>('order/updateLastCheckedBlock')
export const updateLastCheckedBlock = createAction<{ chainId: ChainId; lastCheckedBlock: number }>(
'order/updateLastCheckedBlock'
)

export type SetIsOrderUnfillableParams = {
id: OrderID
Expand Down
10 changes: 6 additions & 4 deletions src/state/user/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ export interface SerializedPair {
export const updateMatchesDarkMode = createAction<{ matchesDarkMode: boolean }>('user/updateMatchesDarkMode')
export const updateUserDarkMode = createAction<{ userDarkMode: boolean }>('user/updateUserDarkMode')
export const updateUserExpertMode = createAction<{ userExpertMode: boolean }>('user/updateUserExpertMode')
export const updateRecipientToggleVisible =
createAction<{ recipientToggleVisible: boolean }>('user/recipientToggleVisible')
export const updateRecipientToggleVisible = createAction<{ recipientToggleVisible: boolean }>(
'user/recipientToggleVisible'
)
export const updateUserLocale = createAction<{ userLocale: SupportedLocale }>('user/updateUserLocale')
export const updateShowSurveyPopup = createAction<{ showSurveyPopup: boolean }>('user/updateShowSurveyPopup')
export const updateUserClientSideRouter = createAction<{ userClientSideRouter: boolean }>(
Expand All @@ -32,6 +33,7 @@ export const updateUserDeadline = createAction<{ userDeadline: number }>('user/u
export const addSerializedToken = createAction<{ serializedToken: SerializedToken }>('user/addSerializedToken')
export const removeSerializedToken = createAction<{ chainId: number; address: string }>('user/removeSerializedToken')
export const addSerializedPair = createAction<{ serializedPair: SerializedPair }>('user/addSerializedPair')
export const removeSerializedPair =
createAction<{ chainId: number; tokenAAddress: string; tokenBAddress: string }>('user/removeSerializedPair')
export const removeSerializedPair = createAction<{ chainId: number; tokenAAddress: string; tokenBAddress: string }>(
'user/removeSerializedPair'
)
export const toggleURLWarning = createAction<void>('app/toggleURLWarning') // MOD - legacy Uni we want to keep

0 comments on commit 6ed5e05

Please sign in to comment.