diff --git a/components/LightningLoadingPattern.tsx b/components/LightningLoadingPattern.tsx index e6c425283..cabd5e08d 100644 --- a/components/LightningLoadingPattern.tsx +++ b/components/LightningLoadingPattern.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { Dimensions, View } from 'react-native'; +import { Dimensions } from 'react-native'; import Lottie from 'lottie-react-native'; import { themeColor } from '../utils/ThemeUtils'; @@ -12,542 +12,539 @@ interface LightningLoadingPatternProps { function LightningLoadingPattern(props: LightningLoadingPatternProps) { const { color } = props; return ( - - - + /> ); } diff --git a/components/LoadingColumns.tsx b/components/LoadingColumns.tsx index c0440adac..b48ec7ad8 100644 --- a/components/LoadingColumns.tsx +++ b/components/LoadingColumns.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { Dimensions, View } from 'react-native'; +import { Dimensions } from 'react-native'; import Lottie from 'lottie-react-native'; import { themeColor } from '../utils/ThemeUtils'; @@ -7,26 +7,23 @@ const loader = require('../assets/images/Lottie/columns.json'); function LoadingColumns() { return ( - - - + /> ); } diff --git a/components/LoadingIndicator.tsx b/components/LoadingIndicator.tsx index 0466b0811..cedeeadb7 100644 --- a/components/LoadingIndicator.tsx +++ b/components/LoadingIndicator.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import { View } from 'react-native'; import Lottie from 'lottie-react-native'; import { themeColor } from '../utils/ThemeUtils'; @@ -13,25 +12,22 @@ function LoadingIndicator(props: LoadingIndicatorProps) { const { size } = props; return ( - - - + /> ); } diff --git a/components/PaidIndicator.tsx b/components/PaidIndicator.tsx index 14d75f4e0..aac9792ce 100644 --- a/components/PaidIndicator.tsx +++ b/components/PaidIndicator.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { Dimensions, Vibration, View } from 'react-native'; +import { Dimensions, Vibration } from 'react-native'; import Lottie from 'lottie-react-native'; import { themeColor } from '../utils/ThemeUtils'; @@ -17,7 +17,157 @@ function PaidIndicator() { const indicatorSize = Dimensions.get('window').height * 0.4; return ( - - - + /> ); } diff --git a/components/SuccessAnimation.tsx b/components/SuccessAnimation.tsx index d92c3f2b1..d501e8080 100644 --- a/components/SuccessAnimation.tsx +++ b/components/SuccessAnimation.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { Dimensions, View } from 'react-native'; +import { Dimensions } from 'react-native'; import Lottie from 'lottie-react-native'; const success = require('../assets/images/Lottie/payment-sent-bounce.json'); @@ -7,19 +7,16 @@ const success = require('../assets/images/Lottie/payment-sent-bounce.json'); function SuccessAnimation() { const windowSize = Dimensions.get('window'); return ( - - - + /> ); } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index a0ce8c224..accd9f24a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -18,9 +18,11 @@ PODS: - hermes-engine/Pre-built (= 0.73.4) - hermes-engine/Pre-built (0.73.4) - libevent (2.1.12) - - lottie-ios (3.4.4) - - lottie-react-native (5.1.6): - - lottie-ios (~> 3.4.0) + - lottie-ios (4.4.1) + - lottie-react-native (6.7.2): + - glog + - lottie-ios (= 4.4.1) + - RCT-Folly (= 2022.05.16.00) - React-Core - RCT-Folly (2022.05.16.00): - boost @@ -1416,8 +1418,8 @@ SPEC CHECKSUMS: glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - lottie-ios: 8f97d3271e155c2d688875c29cd3c74908aef5f8 - lottie-react-native: 8f9d4be452e23f6e5ca0fdc11669dc99ab52be81 + lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494 + lottie-react-native: 3b9199d34e014bcb71c46728992ef5c8026538bb RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 RCTRequired: ab7f915c15569f04a49669e573e6e319a53f9faa RCTTypeSafety: 63b97ced7b766865057e7154db0e81ce4ee6cf1e diff --git a/ios/zeus.xcodeproj/project.pbxproj b/ios/zeus.xcodeproj/project.pbxproj index 89e13c874..f5dc83350 100644 --- a/ios/zeus.xcodeproj/project.pbxproj +++ b/ios/zeus.xcodeproj/project.pbxproj @@ -1510,6 +1510,8 @@ "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/LottiePrivacyInfo.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/Lottie_React_Native_Privacy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( @@ -1530,6 +1532,8 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LottiePrivacyInfo.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Lottie_React_Native_Privacy.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -1577,6 +1581,8 @@ "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/LottiePrivacyInfo.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/Lottie_React_Native_Privacy.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( @@ -1597,6 +1603,8 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LottiePrivacyInfo.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Lottie_React_Native_Privacy.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/package.json b/package.json index aab0e3bf5..d73427e91 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "jsc-android": "241213.1.0", "lodash": "4.17.21", "long": "5.2.3", - "lottie-react-native": "5.1.6", + "lottie-react-native": "6.7.2", "mobx": "5.15.3", "mobx-react": "6.1.4", "moment": "2.29.4", diff --git a/yarn.lock b/yarn.lock index a08517ac1..d9302f4e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4347,11 +4347,6 @@ decode-uri-component@^0.2.0, decode-uri-component@^0.2.2: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== -dedent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.6.0.tgz#0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb" - integrity sha512-cSfRWjXJtZQeRuZGVvDrJroCR5V2UvBNUMHsPCdNYzuAG8b9V8aAy3KUcdQrGQPXs17Y+ojbPh1aOCplg9YR9g== - dedent@^1.0.0: version "1.5.1" resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff" @@ -5818,7 +5813,7 @@ internal-slot@^1.0.5: has "^1.0.3" side-channel "^1.0.4" -invariant@*, invariant@^2.2.2, invariant@^2.2.4: +invariant@*, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== @@ -7014,13 +7009,10 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -lottie-react-native@5.1.6: - version "5.1.6" - resolved "https://registry.yarnpkg.com/lottie-react-native/-/lottie-react-native-5.1.6.tgz#6ae72829c3c0b95952dddd3d78c043f4dfbcb487" - integrity sha512-vhdeZstXMfuVKwnddYWjJgQ/1whGL58IJEJu/iSf0XQ5gAb4pp/+vy91mdYQLezlb8Aw4Vu3fKnqErJL2hwchg== - dependencies: - invariant "^2.2.2" - react-native-safe-modules "^1.0.3" +lottie-react-native@6.7.2: + version "6.7.2" + resolved "https://registry.yarnpkg.com/lottie-react-native/-/lottie-react-native-6.7.2.tgz#615fc16f88970fcbdf63699537f499b5937afe8a" + integrity sha512-MZVx6N1EeO/EaSx8T44mJ0aHc5Mqee+xIfWwszni0oz8U2wlHdaWGjES44dHxaxgAp/0dRaFt3PkpZ6egTzcBg== lower-case@^2.0.2: version "2.0.2" @@ -8522,13 +8514,6 @@ react-native-safe-area-view@^0.14.9: dependencies: hoist-non-react-statics "^2.3.1" -react-native-safe-modules@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/react-native-safe-modules/-/react-native-safe-modules-1.0.3.tgz#f5f29bb9d09d17581193843d4173ad3054f74890" - integrity sha512-DUxti4Z+AgJ/ZsO5U7p3uSCUBko8JT8GvFlCeOXk9bMd+4qjpoDvMYpfbixXKgL88M+HwmU/KI1YFN6gsQZyBA== - dependencies: - dedent "^0.6.0" - react-native-screens@3.29.0: version "3.29.0" resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.29.0.tgz#1dee0326defbc1d4ef4e68287abb32a8e6b76b29"