Skip to content

Commit

Permalink
feat(prices): redirect uk users to coin on click
Browse files Browse the repository at this point in the history
  • Loading branch information
mperdomo-bc committed Apr 29, 2024
1 parent c3cfeee commit 4f91fb0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ export const getTableColumns =
buySellActions,
formActions,
isCoinViewV2Enabled,
isUkUser,
modalActions,
routerActions,
swapActions,
walletCurrency
}: TableColumnsType) =>
() =>
[
getNameColumn(modalActions, routerActions, isCoinViewV2Enabled),
getNameColumn(modalActions, routerActions, isCoinViewV2Enabled, isUkUser),
getPriceColumn(walletCurrency),
getPriceChangeColumn(),
getMarketCapColumn(walletCurrency),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@ const CellWrapper = styled(HeaderWrapper)`
export const getNameColumn = (
modalActions: TableColumnsType['modalActions'],
routerActions: TableColumnsType['routerActions'],
isCoinViewV2Enabled: boolean
isCoinViewV2Enabled: boolean,
isUkUser: boolean
) => ({
Cell: ({ row: { original: values } }) => {
return (
<CellWrapper
onClick={() => {
if (isCoinViewV2Enabled) {
if (isCoinViewV2Enabled || isUkUser) {
routerActions.push(`/coins/${values.coin}`)
} else {
modalActions.showModal(ModalName.REQUEST_CRYPTO_MODAL, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ export type TableColumnsType = {
buySellActions: ReturnType<typeof mapDispatchToProps>['buySellActions']
formActions: ReturnType<typeof mapDispatchToProps>['formActions']
isCoinViewV2Enabled: boolean
isUkUser: boolean
modalActions: ReturnType<typeof mapDispatchToProps>['modalActions']
routerActions: ReturnType<typeof mapDispatchToProps>['routerActions']
swapActions: ReturnType<typeof mapDispatchToProps>['swapActions']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import styled from 'styled-components'
import { getCurrency } from '@core/redux/settings/selectors'
import { getCoinViewV2 } from '@core/redux/walletOptions/selectors'
import { CellText, HeaderText, HeaderToggle, TableWrapper } from 'components/Table'
import { getData as getUserCountry } from 'components/Banner/selectors'

import { Props as _P, SuccessStateType as _S } from '.'
import { getTableColumns } from './Table'
Expand All @@ -27,9 +28,12 @@ export const TableBodyWrapper = styled.div`

const PricesTable = (props: Props) => {
const isCoinViewV2Enabled = useSelector(getCoinViewV2).getOrElse(false) as boolean
const isUserFromUK = useSelector(getUserCountry)?.country === 'GB'
const isIpFromUK = useSelector(getUserCountry)?.ipCountry === 'GB'
const textFilter = useSelector((state) => formValueSelector('prices')(state, 'textFilter'))
const walletCurrency = useSelector(getCurrency).getOrElse('USD')

const isUkUser = isUserFromUK || isIpFromUK

const {
analyticsActions,
buySellActions,
Expand All @@ -46,6 +50,7 @@ const PricesTable = (props: Props) => {
buySellActions,
formActions,
isCoinViewV2Enabled,
isUkUser,
modalActions,
routerActions,
swapActions,
Expand Down

0 comments on commit 4f91fb0

Please sign in to comment.