fix merge

This commit is contained in:
Hailey
2024-09-01 01:34:12 -07:00
parent 38c7946bed
commit 006ee98226
2 changed files with 4 additions and 6 deletions
+2 -3
View File
@@ -6,7 +6,6 @@ import Animated, {
useReducedMotion,
withTiming,
} from 'react-native-reanimated'
import {i18n} from '@lingui/core'
import {decideShouldRoll} from 'lib/custom-animations/util'
import {s} from 'lib/styles'
@@ -119,8 +118,8 @@ export function CountWheel({
prevIsLiked.current = isLiked
}, [isLiked, likeCount])
const formattedCount = formatCount(i18n, likeCount)
const formattedPrevCount = formatCount(i18n, prevCount)
const formattedCount = formatCount(likeCount)
const formattedPrevCount = formatCount(prevCount)
const enteringAnimation =
shouldAnimate && shouldRoll
+2 -3
View File
@@ -1,7 +1,6 @@
import React from 'react'
import {View} from 'react-native'
import {useReducedMotion} from 'react-native-reanimated'
import {i18n} from '@lingui/core'
import {decideShouldRoll} from 'lib/custom-animations/util'
import {s} from 'lib/styles'
@@ -74,8 +73,8 @@ export function CountWheel({
prevIsLiked.current = isLiked
}, [isLiked, likeCount, shouldAnimate, shouldRoll])
const formattedCount = formatCount(i18n, likeCount)
const formattedPrevCount = formatCount(i18n, prevCount)
const formattedCount = formatCount(likeCount)
const formattedPrevCount = formatCount(prevCount)
return (
<View>