fix merge
This commit is contained in:
@@ -6,7 +6,6 @@ import Animated, {
|
|||||||
useReducedMotion,
|
useReducedMotion,
|
||||||
withTiming,
|
withTiming,
|
||||||
} from 'react-native-reanimated'
|
} from 'react-native-reanimated'
|
||||||
import {i18n} from '@lingui/core'
|
|
||||||
|
|
||||||
import {decideShouldRoll} from 'lib/custom-animations/util'
|
import {decideShouldRoll} from 'lib/custom-animations/util'
|
||||||
import {s} from 'lib/styles'
|
import {s} from 'lib/styles'
|
||||||
@@ -119,8 +118,8 @@ export function CountWheel({
|
|||||||
prevIsLiked.current = isLiked
|
prevIsLiked.current = isLiked
|
||||||
}, [isLiked, likeCount])
|
}, [isLiked, likeCount])
|
||||||
|
|
||||||
const formattedCount = formatCount(i18n, likeCount)
|
const formattedCount = formatCount(likeCount)
|
||||||
const formattedPrevCount = formatCount(i18n, prevCount)
|
const formattedPrevCount = formatCount(prevCount)
|
||||||
|
|
||||||
const enteringAnimation =
|
const enteringAnimation =
|
||||||
shouldAnimate && shouldRoll
|
shouldAnimate && shouldRoll
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {View} from 'react-native'
|
import {View} from 'react-native'
|
||||||
import {useReducedMotion} from 'react-native-reanimated'
|
import {useReducedMotion} from 'react-native-reanimated'
|
||||||
import {i18n} from '@lingui/core'
|
|
||||||
|
|
||||||
import {decideShouldRoll} from 'lib/custom-animations/util'
|
import {decideShouldRoll} from 'lib/custom-animations/util'
|
||||||
import {s} from 'lib/styles'
|
import {s} from 'lib/styles'
|
||||||
@@ -74,8 +73,8 @@ export function CountWheel({
|
|||||||
prevIsLiked.current = isLiked
|
prevIsLiked.current = isLiked
|
||||||
}, [isLiked, likeCount, shouldAnimate, shouldRoll])
|
}, [isLiked, likeCount, shouldAnimate, shouldRoll])
|
||||||
|
|
||||||
const formattedCount = formatCount(i18n, likeCount)
|
const formattedCount = formatCount(likeCount)
|
||||||
const formattedPrevCount = formatCount(i18n, prevCount)
|
const formattedPrevCount = formatCount(prevCount)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View>
|
<View>
|
||||||
|
|||||||
Reference in New Issue
Block a user