Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 8 additions & 40 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNReanimated (3.17.1):
- RNReanimated (3.16.7):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1855,44 +1855,18 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated (= 3.17.1)
- RNReanimated/worklets (= 3.17.1)
- Yoga
- RNReanimated/reanimated (3.17.1):
- DoubleConversion
- glog
- hermes-engine
- RCT-Folly (= 2024.11.18.00)
- RCTRequired
- RCTTypeSafety
- React-Core
- React-debug
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 3.17.1)
- RNReanimated/reanimated (= 3.16.7)
- RNReanimated/worklets (= 3.16.7)
- Yoga
- RNReanimated/reanimated/apple (3.17.1):
- RNReanimated/reanimated (3.16.7):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1904,18 +1878,17 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/reanimated/apple (= 3.16.7)
- Yoga
- RNReanimated/worklets (3.17.1):
- RNReanimated/reanimated/apple (3.16.7):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1927,19 +1900,16 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
- React-utils
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- RNReanimated/worklets/apple (= 3.17.1)
- Yoga
- RNReanimated/worklets/apple (3.17.1):
- RNReanimated/worklets (3.16.7):
- DoubleConversion
- glog
- hermes-engine
Expand All @@ -1951,9 +1921,7 @@ PODS:
- React-Fabric
- React-featureflags
- React-graphics
- React-hermes
- React-ImageManager
- React-jsi
- React-NativeModulesApple
- React-RCTFabric
- React-rendererdebug
Expand Down Expand Up @@ -2455,7 +2423,7 @@ SPEC CHECKSUMS:
RNQrGenerator: afacf12b55dfba0e3aaca963eec23691e8426431
RNQuickAction: c2c8f379e614428be0babe4d53a575739667744d
RNReactNativeHapticFeedback: f9cfb40676f21a52e9e172648d033f539156a5ec
RNReanimated: cdbe5dfe73c9143df3f750ff547a758eb16d2ab8
RNReanimated: f999fb5f61876de2729bc4863f036dd5841200fc
RNScreens: 96fe858d87d26c3f46f0696f9e8824ce33a05aa7
RNShare: b1660f26d8bc57cbf9acf11872a8eb2f3ecf4825
RNSVG: e1b90420e46f8923da4b5023963afd4964d0d12a
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"react-native-quick-base64": "2.1.2",
"react-native-quick-bip39": "0.0.9",
"react-native-quick-crypto": "0.7.12",
"react-native-reanimated": "3.17.1",
"react-native-reanimated": "3.16.7",
"react-native-reanimated-carousel": "4.0.2",
"react-native-restart": "0.0.27",
"react-native-safe-area-context": "5.2.0",
Expand Down
6 changes: 2 additions & 4 deletions src/screens/Wallets/Receive/ReceiveDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { ReactElement, memo, useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { Image, Platform, StyleSheet, View } from 'react-native';
import { Image, StyleSheet, View } from 'react-native';
import Animated, { FadeIn, FadeOut } from 'react-native-reanimated';

import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
Expand Down Expand Up @@ -177,9 +177,7 @@ const ReceiveDetails = ({
<Animated.View
style={styles.bottom}
entering={FadeIn}
// FadeOut causing a bug on Android
exiting={Platform.OS === 'ios' ? FadeOut : undefined}
>
exiting={FadeOut}>
<Caption13Up style={styles.label} color="secondary">
{t('tags')}
</Caption13Up>
Expand Down
21 changes: 5 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5894,7 +5894,7 @@ __metadata:
react-native-quick-base64: 2.1.2
react-native-quick-bip39: 0.0.9
react-native-quick-crypto: 0.7.12
react-native-reanimated: 3.17.1
react-native-reanimated: 3.16.7
react-native-reanimated-carousel: 4.0.2
react-native-restart: 0.0.27
react-native-safe-area-context: 5.2.0
Expand Down Expand Up @@ -12629,16 +12629,6 @@ __metadata:
languageName: node
linkType: hard

"react-native-is-edge-to-edge@npm:1.1.6":
version: 1.1.6
resolution: "react-native-is-edge-to-edge@npm:1.1.6"
peerDependencies:
react: ">=18.2.0"
react-native: ">=0.73.0"
checksum: 4e07c1e34c01c8d50fd7c1d0460db06f6f0515197405230386a8ffb950cb724b10743af032310d1384df0a90059bfb8992ba2d93344ce86315315f0493feccc2
languageName: node
linkType: hard

"react-native-keyboard-accessory@npm:0.1.16":
version: 0.1.16
resolution: "react-native-keyboard-accessory@npm:0.1.16"
Expand Down Expand Up @@ -12818,9 +12808,9 @@ __metadata:
languageName: node
linkType: hard

"react-native-reanimated@npm:3.17.1":
version: 3.17.1
resolution: "react-native-reanimated@npm:3.17.1"
"react-native-reanimated@npm:3.16.7":
version: 3.16.7
resolution: "react-native-reanimated@npm:3.16.7"
dependencies:
"@babel/plugin-transform-arrow-functions": ^7.0.0-0
"@babel/plugin-transform-class-properties": ^7.0.0-0
Expand All @@ -12833,12 +12823,11 @@ __metadata:
"@babel/preset-typescript": ^7.16.7
convert-source-map: ^2.0.0
invariant: ^2.2.4
react-native-is-edge-to-edge: 1.1.6
peerDependencies:
"@babel/core": ^7.0.0-0
react: "*"
react-native: "*"
checksum: fd05040a3fc6a8f4efb387657c0cd6c314e5e6b50f859e127d6891d8f81c65b020ddcf78615aa0074b4e134e450d38c40db916c544e1e2efa26c50c82815607d
checksum: 108095709cd7a3effc5b5d276d94e161b399bd2d06e32140834168a0051545401bb09228071447e5925571da3f86f335d2a82c76751cdae07f66faf50b25c97f
languageName: node
linkType: hard

Expand Down
Loading