From c52bda10d72b7d3bb525f4fbc6fb2fa05ef88afc Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Wed, 12 Jun 2024 12:46:44 -0400 Subject: [PATCH] REF: Update package --- BlueComponents.js | 2 +- components/AmountInput.js | 2 +- components/ArrowPicker.tsx | 2 +- components/BlurredBalanceView.tsx | 2 +- components/Button.tsx | 2 +- components/CoinsSelected.tsx | 2 +- components/DynamicQRCode.tsx | 2 +- components/InputAccessoryAllFunds.js | 2 +- components/LdkButton.tsx | 2 +- components/ListItem.tsx | 2 +- components/MultipleStepsListItem.js | 2 +- components/SecondButton.tsx | 2 +- components/TransactionPendingIconBig.tsx | 2 +- components/WalletToImport.tsx | 2 +- components/addresses/AddressItem.tsx | 2 +- components/icons/PlusIcon.js | 2 +- components/icons/TransactionExpiredIcon.js | 2 +- components/icons/TransactionIncomingIcon.js | 2 +- components/icons/TransactionOffchainIcon.js | 2 +- .../icons/TransactionOffchainIncomingIcon.js | 2 +- components/icons/TransactionOnchainIcon.js | 2 +- components/icons/TransactionOutgoingIcon.js | 2 +- components/icons/TransactionPendingIcon.js | 2 +- ios/BlueWallet.xcodeproj/project.pbxproj | 10 +- .../xcshareddata/swiftpm/Package.resolved | 33 --- navigation/DetailViewScreensStack.tsx | 2 +- package-lock.json | 218 +++++++++--------- package.json | 3 +- screen/lnd/lndCreateInvoice.js | 2 +- screen/lnd/lndViewInvoice.js | 2 +- screen/lnd/lnurlAuth.js | 2 +- screen/lnd/lnurlPay.js | 2 +- screen/lnd/scanLndInvoice.js | 2 +- screen/receive/aztecoRedeem.js | 2 +- screen/send/Confirm.tsx | 2 +- screen/send/ScanQRCode.js | 2 +- screen/send/SendDetails.tsx | 2 +- screen/send/coinControl.js | 2 +- screen/send/create.js | 2 +- screen/send/psbtMultisig.js | 2 +- screen/send/success.js | 2 +- screen/settings/About.tsx | 2 +- screen/settings/lightningSettings.tsx | 2 +- screen/settings/notificationSettings.js | 2 +- screen/transactions/CPFP.js | 2 +- screen/transactions/TransactionStatus.tsx | 2 +- screen/wallets/ProvideEntropy.tsx | 2 +- screen/wallets/ViewEditMultisigCosigners.tsx | 2 +- screen/wallets/addMultisig.js | 2 +- screen/wallets/addMultisigStep2.js | 2 +- screen/wallets/ldkViewLogs.js | 2 +- screen/wallets/signVerify.js | 2 +- screen/wallets/transactions.js | 2 +- tests/e2e/bluewallet.spec.js | 4 +- 54 files changed, 164 insertions(+), 202 deletions(-) delete mode 100644 ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/BlueComponents.js b/BlueComponents.js index 16678d619..f1cf4a37e 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -14,7 +14,7 @@ import { TouchableOpacity, View, } from 'react-native'; -import { Icon, Text } from 'react-native-elements'; +import { Icon, Text } from '@rneui/themed'; import { useTheme } from './components/themes'; import loc from './loc'; diff --git a/components/AmountInput.js b/components/AmountInput.js index 946ca97fd..b62e41b27 100644 --- a/components/AmountInput.js +++ b/components/AmountInput.js @@ -4,7 +4,7 @@ import localizedFormat from 'dayjs/plugin/localizedFormat'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { Image, LayoutAnimation, Pressable, StyleSheet, TextInput, TouchableOpacity, TouchableWithoutFeedback, View } from 'react-native'; -import { Badge, Icon, Text } from 'react-native-elements'; +import { Badge, Icon, Text } from '@rneui/themed'; import { fiatToBTC, diff --git a/components/ArrowPicker.tsx b/components/ArrowPicker.tsx index 2187a5be6..3b1159e1a 100644 --- a/components/ArrowPicker.tsx +++ b/components/ArrowPicker.tsx @@ -1,7 +1,7 @@ /* eslint react/prop-types: "off", react-native/no-inline-styles: "off" */ import React, { useState } from 'react'; import { Keyboard, Pressable, StyleSheet, View } from 'react-native'; -import { Icon, Text } from 'react-native-elements'; +import { Icon, Text } from '@rneui/themed'; import loc from '../loc'; import { useTheme } from './themes'; diff --git a/components/BlurredBalanceView.tsx b/components/BlurredBalanceView.tsx index 41450e395..23e369c29 100644 --- a/components/BlurredBalanceView.tsx +++ b/components/BlurredBalanceView.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { ImageBackground, StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; export const BlurredBalanceView = () => { return ( diff --git a/components/Button.tsx b/components/Button.tsx index b47ed36ef..5abf1f8e5 100644 --- a/components/Button.tsx +++ b/components/Button.tsx @@ -1,6 +1,6 @@ import React, { forwardRef } from 'react'; import { StyleProp, StyleSheet, Text, TouchableOpacity, View, ViewStyle } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from './themes'; diff --git a/components/CoinsSelected.tsx b/components/CoinsSelected.tsx index 7747c3fb0..e8b8c1713 100644 --- a/components/CoinsSelected.tsx +++ b/components/CoinsSelected.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Avatar } from 'react-native-elements'; +import { Avatar } from '@rneui/themed'; import loc from '../loc'; diff --git a/components/DynamicQRCode.tsx b/components/DynamicQRCode.tsx index 748a3eb3e..5f90fc05e 100644 --- a/components/DynamicQRCode.tsx +++ b/components/DynamicQRCode.tsx @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Dimensions, LayoutAnimation, StyleSheet, TouchableOpacity, View } from 'react-native'; -import { Text } from 'react-native-elements'; +import { Text } from '@rneui/themed'; import { encodeUR } from '../blue_modules/ur'; import { BlueSpacing20 } from '../BlueComponents'; diff --git a/components/InputAccessoryAllFunds.js b/components/InputAccessoryAllFunds.js index 11886b0cc..c3da10cb0 100644 --- a/components/InputAccessoryAllFunds.js +++ b/components/InputAccessoryAllFunds.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import { InputAccessoryView, Keyboard, Platform, StyleSheet, View } from 'react-native'; -import { Text } from 'react-native-elements'; +import { Text } from '@rneui/themed'; import { BlueButtonLink } from '../BlueComponents'; import loc from '../loc'; diff --git a/components/LdkButton.tsx b/components/LdkButton.tsx index 3d78545c9..2fdd4cf18 100644 --- a/components/LdkButton.tsx +++ b/components/LdkButton.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { DimensionValue, Image, StyleSheet, TouchableOpacity, View } from 'react-native'; -import { Text } from 'react-native-elements'; +import { Text } from '@rneui/themed'; import { useTheme } from './themes'; diff --git a/components/ListItem.tsx b/components/ListItem.tsx index 2f88d4541..1835c4da4 100644 --- a/components/ListItem.tsx +++ b/components/ListItem.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react'; import { ActivityIndicator, I18nManager, Pressable, PressableProps, StyleSheet, Switch, TouchableOpacity } from 'react-native'; -import { Avatar, ListItem as RNElementsListItem } from 'react-native-elements'; // Replace with actual import paths +import { Avatar, ListItem as RNElementsListItem } from '@rneui/themed'; // Replace with actual import paths import { useTheme } from './themes'; diff --git a/components/MultipleStepsListItem.js b/components/MultipleStepsListItem.js index f442e7147..409b46d51 100644 --- a/components/MultipleStepsListItem.js +++ b/components/MultipleStepsListItem.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { useRef } from 'react'; import { ActivityIndicator, findNodeHandle, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import ActionSheet from '../screen/ActionSheet'; import ActionSheetOptions from '../screen/ActionSheet.common'; diff --git a/components/SecondButton.tsx b/components/SecondButton.tsx index f6201ce47..e80df4e6b 100644 --- a/components/SecondButton.tsx +++ b/components/SecondButton.tsx @@ -1,6 +1,6 @@ import React, { forwardRef } from 'react'; import { StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from './themes'; diff --git a/components/TransactionPendingIconBig.tsx b/components/TransactionPendingIconBig.tsx index 3e908b425..d30dff2ad 100644 --- a/components/TransactionPendingIconBig.tsx +++ b/components/TransactionPendingIconBig.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from './themes'; diff --git a/components/WalletToImport.tsx b/components/WalletToImport.tsx index 1425a6e0a..5cb738e0c 100644 --- a/components/WalletToImport.tsx +++ b/components/WalletToImport.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { I18nManager, StyleSheet, TouchableOpacity, View } from 'react-native'; -import { Text } from 'react-native-elements'; +import { Text } from '@rneui/themed'; import { useTheme } from './themes'; diff --git a/components/addresses/AddressItem.tsx b/components/addresses/AddressItem.tsx index 19808c7b9..20821906a 100644 --- a/components/addresses/AddressItem.tsx +++ b/components/addresses/AddressItem.tsx @@ -2,7 +2,7 @@ import React, { useMemo, useRef } from 'react'; import Clipboard from '@react-native-clipboard/clipboard'; import { useNavigation } from '@react-navigation/native'; import { StyleSheet, Text, View } from 'react-native'; -import { ListItem } from 'react-native-elements'; +import { ListItem } from '@rneui/themed'; import Share from 'react-native-share'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import confirm from '../../helpers/confirm'; diff --git a/components/icons/PlusIcon.js b/components/icons/PlusIcon.js index 23ceaaf78..461c35585 100644 --- a/components/icons/PlusIcon.js +++ b/components/icons/PlusIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, TouchableOpacity } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/components/icons/TransactionExpiredIcon.js b/components/icons/TransactionExpiredIcon.js index 3050d45f3..df884eade 100644 --- a/components/icons/TransactionExpiredIcon.js +++ b/components/icons/TransactionExpiredIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/components/icons/TransactionIncomingIcon.js b/components/icons/TransactionIncomingIcon.js index 1d7fd5177..677f473a4 100644 --- a/components/icons/TransactionIncomingIcon.js +++ b/components/icons/TransactionIncomingIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/components/icons/TransactionOffchainIcon.js b/components/icons/TransactionOffchainIcon.js index 698c868a0..ef29e194b 100644 --- a/components/icons/TransactionOffchainIcon.js +++ b/components/icons/TransactionOffchainIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/components/icons/TransactionOffchainIncomingIcon.js b/components/icons/TransactionOffchainIncomingIcon.js index 0dbfc88a1..fc22df3b8 100644 --- a/components/icons/TransactionOffchainIncomingIcon.js +++ b/components/icons/TransactionOffchainIncomingIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/components/icons/TransactionOnchainIcon.js b/components/icons/TransactionOnchainIcon.js index 836363e60..7dadac8cf 100644 --- a/components/icons/TransactionOnchainIcon.js +++ b/components/icons/TransactionOnchainIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/components/icons/TransactionOutgoingIcon.js b/components/icons/TransactionOutgoingIcon.js index 353ede491..27cfc6aa5 100644 --- a/components/icons/TransactionOutgoingIcon.js +++ b/components/icons/TransactionOutgoingIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/components/icons/TransactionPendingIcon.js b/components/icons/TransactionPendingIcon.js index 6442b80dc..178b995b7 100644 --- a/components/icons/TransactionPendingIcon.js +++ b/components/icons/TransactionPendingIcon.js @@ -1,6 +1,6 @@ import React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { useTheme } from '../themes'; diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj index 17b1afc54..c45c4e887 100644 --- a/ios/BlueWallet.xcodeproj/project.pbxproj +++ b/ios/BlueWallet.xcodeproj/project.pbxproj @@ -165,7 +165,7 @@ B4B1A4652BFA73110072E3BB /* WidgetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B1A4612BFA73110072E3BB /* WidgetHelper.swift */; }; B4EE583C226703320003363C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B40D4E35225841ED00428FCC /* Assets.xcassets */; }; C59F90CE0D04D3E4BB39BC5D /* libPods-BlueWalletUITests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6F02C2F7CA3591E4E0B06EBA /* libPods-BlueWalletUITests.a */; }; - C978A716948AB7DEC5B6F677 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -484,7 +484,7 @@ files = ( 782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */, 764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */, - C978A716948AB7DEC5B6F677 /* (null) in Frameworks */, + C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */, 773E382FE62E836172AAB98B /* libPods-BlueWallet.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1152,7 +1152,7 @@ ); mainGroup = 83CBB9F61A601CBA00E9B192; packageReferences = ( - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */, + 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */, B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */, ); productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */; @@ -2671,7 +2671,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */ = { + 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/EFPrefix/EFQRCode.git"; requirement = { @@ -2692,7 +2692,7 @@ /* Begin XCSwiftPackageProductDependency section */ 6DFC806F24EA0B6C007B8700 /* EFQRCode */ = { isa = XCSwiftPackageProductDependency; - package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */; + package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode.git" */; productName = EFQRCode; }; B41B76842B66B2FF002C48D5 /* Bugsnag */ = { diff --git a/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 23bedbaa3..000000000 --- a/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,33 +0,0 @@ -{ - "originHash" : "89509f555bc90a15b96ca0a326a69850770bdaac04a46f9cf482d81533702e3c", - "pins" : [ - { - "identity" : "bugsnag-cocoa", - "kind" : "remoteSourceControl", - "location" : "https://github.com/bugsnag/bugsnag-cocoa", - "state" : { - "revision" : "16b9145fc66e5296f16e733f6feb5d0e450574e8", - "version" : "6.28.1" - } - }, - { - "identity" : "efqrcode", - "kind" : "remoteSourceControl", - "location" : "https://github.com/EFPrefix/EFQRCode.git", - "state" : { - "revision" : "2991c2f318ad9529d93b2a73a382a3f9c72c64ce", - "version" : "6.2.2" - } - }, - { - "identity" : "swift_qrcodejs", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ApolloZhu/swift_qrcodejs.git", - "state" : { - "revision" : "374dc7f7b9e76c6aeb393f6a84590c6d387e1ecb", - "version" : "2.2.2" - } - } - ], - "version" : 3 -} diff --git a/navigation/DetailViewScreensStack.tsx b/navigation/DetailViewScreensStack.tsx index b75b494f4..cb806b298 100644 --- a/navigation/DetailViewScreensStack.tsx +++ b/navigation/DetailViewScreensStack.tsx @@ -1,7 +1,7 @@ import { NativeStackNavigationOptions } from '@react-navigation/native-stack'; import React, { useMemo } from 'react'; import { I18nManager, Platform, TouchableOpacity } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { isDesktop } from '../blue_modules/environment'; import HeaderRightButton from '../components/HeaderRightButton'; diff --git a/package-lock.json b/package-lock.json index b3a087051..beeedcd10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,8 @@ "@react-navigation/native": "6.1.17", "@react-navigation/native-stack": "6.9.26", "@remobile/react-native-qrcode-local-image": "https://github.com/BlueWallet/react-native-qrcode-local-image", + "@rneui/base": "^4.0.0-rc.8", + "@rneui/themed": "^4.0.0-rc.8", "@spsina/bip47": "github:BlueWallet/bip47#f4b8047", "aezeed": "0.0.5", "assert": "2.1.0", @@ -66,7 +68,6 @@ "react-native-device-info": "11.1.0", "react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#6033c4e1b0dd0a6760b5f5a5a2c3b2e5d07f2ae4", "react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4", - "react-native-elements": "3.4.3", "react-native-fs": "2.20.0", "react-native-gesture-handler": "2.16.2", "react-native-handoff": "https://github.com/BlueWallet/react-native-handoff#31d005f93d31099d0e564590a3bbd052b8a02b39", @@ -6269,6 +6270,68 @@ "resolved": "git+ssh://git@github.com/BlueWallet/react-native-qrcode-local-image.git#31b0113110fbafcf5a5f3ca4183a563550f5c352", "license": "MIT" }, + "node_modules/@rneui/base": { + "version": "4.0.0-rc.8", + "resolved": "https://registry.npmjs.org/@rneui/base/-/base-4.0.0-rc.8.tgz", + "integrity": "sha512-teJ6bUki+TQ+r+abefEWYb2wRUaMgRhp1oxtKa84UfDqTiCF0ItyJ0L8FhMb6AAkTOkWC34301T7j3H4df6ueA==", + "dependencies": { + "@types/react-native-vector-icons": "^6.4.10", + "color": "^3.2.1", + "deepmerge": "^4.2.2", + "hoist-non-react-statics": "^3.3.2", + "react-native-ratings": "^8.1.0", + "react-native-size-matters": "^0.4.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/@rneui/themed" + }, + "peerDependencies": { + "react-native-safe-area-context": ">= 3.0.0", + "react-native-vector-icons": ">7.0.0" + } + }, + "node_modules/@rneui/base/node_modules/color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "dependencies": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, + "node_modules/@rneui/base/node_modules/react-native-ratings": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-8.1.0.tgz", + "integrity": "sha512-+QOJ4G3NjVkI1D+tk4EGx1dCvVfbD2nQdkrj9cXrcAoEiwmbep4z4bZbCKmWMpQ5h2dqbxABU8/eBnbDmvAc3g==", + "dependencies": { + "lodash": "^4.17.15" + }, + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, + "node_modules/@rneui/base/node_modules/react-native-size-matters": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.4.2.tgz", + "integrity": "sha512-DKE3f/sdcozd24oASgkP1iGg+YU3HoajRa5k3a4wkRzpiqREq8SGX12Y5zBgAt/8IivLQoTMYkyQu1/Giuy+zQ==", + "peerDependencies": { + "react-native": "*" + } + }, + "node_modules/@rneui/themed": { + "version": "4.0.0-rc.8", + "resolved": "https://registry.npmjs.org/@rneui/themed/-/themed-4.0.0-rc.8.tgz", + "integrity": "sha512-8L/XOrL9OK/r+/iBLvx63TbIdZOXF8SIjN9eArMYm6kRbMr8m4BitXllDN8nBhBsSPNYvL6EAgjk+i2MfY4sBA==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/@rneui/themed" + }, + "peerDependencies": { + "@rneui/base": "4.0.0-rc.7" + } + }, "node_modules/@sideway/address": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", @@ -16912,11 +16975,6 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" - }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -18569,14 +18627,6 @@ "node": ">=8" } }, - "node_modules/opencollective-postinstall": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", - "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", - "bin": { - "opencollective-postinstall": "index.js" - } - }, "node_modules/optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -19617,35 +19667,6 @@ "react-native-reanimated": ">=2.8.0" } }, - "node_modules/react-native-elements": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/react-native-elements/-/react-native-elements-3.4.3.tgz", - "integrity": "sha512-VtZc25EecPZyUBER85zFK9ZbY6kkUdcm1ZwJ9hdoGSCr1R/GFgxor4jngOcSYeMvQ+qimd5No44OVJW3rSJECA==", - "hasInstallScript": true, - "dependencies": { - "@types/react-native-vector-icons": "^6.4.6", - "color": "^3.1.2", - "deepmerge": "^4.2.2", - "hoist-non-react-statics": "^3.3.2", - "lodash.isequal": "^4.5.0", - "opencollective-postinstall": "^2.0.3", - "react-native-ratings": "8.0.4", - "react-native-size-matters": "^0.3.1" - }, - "peerDependencies": { - "react-native-safe-area-context": ">= 3.0.0", - "react-native-vector-icons": ">7.0.0" - } - }, - "node_modules/react-native-elements/node_modules/color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "dependencies": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - }, "node_modules/react-native-fs": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz", @@ -19866,18 +19887,6 @@ "resolved": "https://registry.npmjs.org/react-native-rate/-/react-native-rate-1.2.12.tgz", "integrity": "sha512-A/z3s7Zth08aXcJnru6S4p71NG8acx2w5LhIfItwTJUbQruNJugk8WrN51dLBCSDv8W33kbS5YoUT4M9jOP5gA==" }, - "node_modules/react-native-ratings": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-8.0.4.tgz", - "integrity": "sha512-Xczu5lskIIRD6BEdz9A0jDRpEck/SFxRqiglkXi0u67yAtI1/pcJC76P4MukCbT8K4BPVl+42w83YqXBoBRl7A==", - "dependencies": { - "lodash": "^4.17.15" - }, - "peerDependencies": { - "react": "*", - "react-native": "*" - } - }, "node_modules/react-native-reanimated": { "version": "3.11.0", "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.11.0.tgz", @@ -19935,14 +19944,6 @@ "node": ">=16" } }, - "node_modules/react-native-size-matters": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.3.1.tgz", - "integrity": "sha512-mKOfBLIBFBcs9br1rlZDvxD5+mAl8Gfr5CounwJtxI6Z82rGrMO+Kgl9EIg3RMVf3G855a85YVqHJL2f5EDRlw==", - "peerDependencies": { - "react-native": "*" - } - }, "node_modules/react-native-svg": { "version": "13.14.1", "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.14.1.tgz", @@ -27299,6 +27300,48 @@ "version": "git+ssh://git@github.com/BlueWallet/react-native-qrcode-local-image.git#31b0113110fbafcf5a5f3ca4183a563550f5c352", "from": "@remobile/react-native-qrcode-local-image@https://github.com/BlueWallet/react-native-qrcode-local-image" }, + "@rneui/base": { + "version": "4.0.0-rc.8", + "resolved": "https://registry.npmjs.org/@rneui/base/-/base-4.0.0-rc.8.tgz", + "integrity": "sha512-teJ6bUki+TQ+r+abefEWYb2wRUaMgRhp1oxtKa84UfDqTiCF0ItyJ0L8FhMb6AAkTOkWC34301T7j3H4df6ueA==", + "requires": { + "@types/react-native-vector-icons": "^6.4.10", + "color": "^3.2.1", + "deepmerge": "^4.2.2", + "hoist-non-react-statics": "^3.3.2", + "react-native-ratings": "^8.1.0", + "react-native-size-matters": "^0.4.0" + }, + "dependencies": { + "color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "requires": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, + "react-native-ratings": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-8.1.0.tgz", + "integrity": "sha512-+QOJ4G3NjVkI1D+tk4EGx1dCvVfbD2nQdkrj9cXrcAoEiwmbep4z4bZbCKmWMpQ5h2dqbxABU8/eBnbDmvAc3g==", + "requires": { + "lodash": "^4.17.15" + } + }, + "react-native-size-matters": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.4.2.tgz", + "integrity": "sha512-DKE3f/sdcozd24oASgkP1iGg+YU3HoajRa5k3a4wkRzpiqREq8SGX12Y5zBgAt/8IivLQoTMYkyQu1/Giuy+zQ==" + } + } + }, + "@rneui/themed": { + "version": "4.0.0-rc.8", + "resolved": "https://registry.npmjs.org/@rneui/themed/-/themed-4.0.0-rc.8.tgz", + "integrity": "sha512-8L/XOrL9OK/r+/iBLvx63TbIdZOXF8SIjN9eArMYm6kRbMr8m4BitXllDN8nBhBsSPNYvL6EAgjk+i2MfY4sBA==" + }, "@sideway/address": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", @@ -35274,11 +35317,6 @@ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" - }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -36554,11 +36592,6 @@ "is-wsl": "^1.1.0" } }, - "opencollective-postinstall": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", - "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==" - }, "optionator": { "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", @@ -37422,32 +37455,6 @@ "@babel/preset-typescript": "^7.17.12" } }, - "react-native-elements": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/react-native-elements/-/react-native-elements-3.4.3.tgz", - "integrity": "sha512-VtZc25EecPZyUBER85zFK9ZbY6kkUdcm1ZwJ9hdoGSCr1R/GFgxor4jngOcSYeMvQ+qimd5No44OVJW3rSJECA==", - "requires": { - "@types/react-native-vector-icons": "^6.4.6", - "color": "^3.1.2", - "deepmerge": "^4.2.2", - "hoist-non-react-statics": "^3.3.2", - "lodash.isequal": "^4.5.0", - "opencollective-postinstall": "^2.0.3", - "react-native-ratings": "8.0.4", - "react-native-size-matters": "^0.3.1" - }, - "dependencies": { - "color": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", - "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", - "requires": { - "color-convert": "^1.9.3", - "color-string": "^1.6.0" - } - } - } - }, "react-native-fs": { "version": "2.20.0", "resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz", @@ -37590,14 +37597,6 @@ "resolved": "https://registry.npmjs.org/react-native-rate/-/react-native-rate-1.2.12.tgz", "integrity": "sha512-A/z3s7Zth08aXcJnru6S4p71NG8acx2w5LhIfItwTJUbQruNJugk8WrN51dLBCSDv8W33kbS5YoUT4M9jOP5gA==" }, - "react-native-ratings": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-8.0.4.tgz", - "integrity": "sha512-Xczu5lskIIRD6BEdz9A0jDRpEck/SFxRqiglkXi0u67yAtI1/pcJC76P4MukCbT8K4BPVl+42w83YqXBoBRl7A==", - "requires": { - "lodash": "^4.17.15" - } - }, "react-native-reanimated": { "version": "3.11.0", "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-3.11.0.tgz", @@ -37636,11 +37635,6 @@ "resolved": "https://registry.npmjs.org/react-native-share/-/react-native-share-10.2.1.tgz", "integrity": "sha512-Z2LWGYWH7raM4H6Oauttv1tEhaB43XSWJAN8iS6oaSG9CnyrUBeYFF4QpU1AH5RgNeylXQdN8CtbizCHHt6coQ==" }, - "react-native-size-matters": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.3.1.tgz", - "integrity": "sha512-mKOfBLIBFBcs9br1rlZDvxD5+mAl8Gfr5CounwJtxI6Z82rGrMO+Kgl9EIg3RMVf3G855a85YVqHJL2f5EDRlw==" - }, "react-native-svg": { "version": "13.14.1", "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.14.1.tgz", diff --git a/package.json b/package.json index 8bcf30fba..b825815e5 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,8 @@ "@react-navigation/native": "6.1.17", "@react-navigation/native-stack": "6.9.26", "@remobile/react-native-qrcode-local-image": "https://github.com/BlueWallet/react-native-qrcode-local-image", + "@rneui/base": "4.0.0-rc.8", + "@rneui/themed": "4.0.0-rc.8", "@spsina/bip47": "github:BlueWallet/bip47#f4b8047", "aezeed": "0.0.5", "assert": "2.1.0", @@ -151,7 +153,6 @@ "react-native-device-info": "11.1.0", "react-native-document-picker": "https://github.com/BlueWallet/react-native-document-picker#6033c4e1b0dd0a6760b5f5a5a2c3b2e5d07f2ae4", "react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4", - "react-native-elements": "3.4.3", "react-native-fs": "2.20.0", "react-native-gesture-handler": "2.16.2", "react-native-handoff": "https://github.com/BlueWallet/react-native-handoff#31d005f93d31099d0e564590a3bbd052b8a02b39", diff --git a/screen/lnd/lndCreateInvoice.js b/screen/lnd/lndCreateInvoice.js index 549892d98..85726e3ba 100644 --- a/screen/lnd/lndCreateInvoice.js +++ b/screen/lnd/lndCreateInvoice.js @@ -14,7 +14,7 @@ import { TouchableWithoutFeedback, View, } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { parse } from 'url'; // eslint-disable-line n/no-deprecated-api import { btcToSatoshi, fiatToBTC, satoshiToBTC } from '../../blue_modules/currency'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; diff --git a/screen/lnd/lndViewInvoice.js b/screen/lnd/lndViewInvoice.js index 4e3da91dc..bae1ce386 100644 --- a/screen/lnd/lndViewInvoice.js +++ b/screen/lnd/lndViewInvoice.js @@ -1,7 +1,7 @@ import React, { useEffect, useRef, useState } from 'react'; import { useNavigationState, useRoute } from '@react-navigation/native'; import { BackHandler, I18nManager, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import Share from 'react-native-share'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import { BlueLoading, BlueSpacing20, BlueText, BlueTextCentered } from '../../BlueComponents'; diff --git a/screen/lnd/lnurlAuth.js b/screen/lnd/lnurlAuth.js index 179d9a90e..5acf84724 100644 --- a/screen/lnd/lnurlAuth.js +++ b/screen/lnd/lnurlAuth.js @@ -1,7 +1,7 @@ import { useNavigation, useRoute } from '@react-navigation/native'; import React, { useCallback, useMemo, useState } from 'react'; import { I18nManager, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import URL from 'url'; import { BlueCard, BlueLoading, BlueSpacing20, BlueSpacing40, BlueText } from '../../BlueComponents'; import Lnurl from '../../class/lnurl'; diff --git a/screen/lnd/lnurlPay.js b/screen/lnd/lnurlPay.js index ee7854ec7..d127bc573 100644 --- a/screen/lnd/lnurlPay.js +++ b/screen/lnd/lnurlPay.js @@ -2,7 +2,7 @@ import AsyncStorage from '@react-native-async-storage/async-storage'; import { useRoute } from '@react-navigation/native'; import React, { useEffect, useState } from 'react'; import { I18nManager, Image, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { btcToSatoshi, fiatToBTC, satoshiToBTC, satoshiToLocalCurrency } from '../../blue_modules/currency'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import { BlueCard, BlueDismissKeyboardInputAccessory, BlueLoading, BlueSpacing20, BlueText } from '../../BlueComponents'; diff --git a/screen/lnd/scanLndInvoice.js b/screen/lnd/scanLndInvoice.js index e11042806..956349adf 100644 --- a/screen/lnd/scanLndInvoice.js +++ b/screen/lnd/scanLndInvoice.js @@ -11,7 +11,7 @@ import { TouchableOpacity, View, } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { btcToSatoshi, fiatToBTC } from '../../blue_modules/currency'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; diff --git a/screen/receive/aztecoRedeem.js b/screen/receive/aztecoRedeem.js index 1309d2ac0..51d22a091 100644 --- a/screen/receive/aztecoRedeem.js +++ b/screen/receive/aztecoRedeem.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { I18nManager, Keyboard, StyleSheet, Text, TouchableOpacity, TouchableWithoutFeedback, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { BlueLoading, BlueSpacing, BlueText } from '../../BlueComponents'; import Azteco from '../../class/azteco'; import presentAlert from '../../components/Alert'; diff --git a/screen/send/Confirm.tsx b/screen/send/Confirm.tsx index 0a80c82b2..52e3cc578 100644 --- a/screen/send/Confirm.tsx +++ b/screen/send/Confirm.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useMemo, useReducer } from 'react'; import { ActivityIndicator, FlatList, TouchableOpacity, StyleSheet, Switch, View } from 'react-native'; -import { Text } from 'react-native-elements'; +import { Text } from '@rneui/themed'; import { PayjoinClient } from 'payjoin-client'; import BigNumber from 'bignumber.js'; import * as bitcoin from 'bitcoinjs-lib'; diff --git a/screen/send/ScanQRCode.js b/screen/send/ScanQRCode.js index fc921ae32..443de5abe 100644 --- a/screen/send/ScanQRCode.js +++ b/screen/send/ScanQRCode.js @@ -5,7 +5,7 @@ import createHash from 'create-hash'; import React, { useEffect, useState } from 'react'; import { Alert, Image, Platform, StyleSheet, TextInput, TouchableOpacity, View } from 'react-native'; import { CameraScreen } from 'react-native-camera-kit'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { launchImageLibrary } from 'react-native-image-picker'; import Base43 from '../../blue_modules/base43'; diff --git a/screen/send/SendDetails.tsx b/screen/send/SendDetails.tsx index 34338e083..4069e21bd 100644 --- a/screen/send/SendDetails.tsx +++ b/screen/send/SendDetails.tsx @@ -23,7 +23,7 @@ import { View, } from 'react-native'; import DocumentPicker from 'react-native-document-picker'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import RNFS from 'react-native-fs'; import { btcToSatoshi, fiatToBTC } from '../../blue_modules/currency'; diff --git a/screen/send/coinControl.js b/screen/send/coinControl.js index fc918941d..343ed0820 100644 --- a/screen/send/coinControl.js +++ b/screen/send/coinControl.js @@ -16,7 +16,7 @@ import { useWindowDimensions, View, } from 'react-native'; -import { Avatar, Badge, Icon, ListItem as RNElementsListItem } from 'react-native-elements'; +import { Avatar, Badge, Icon, ListItem as RNElementsListItem } from '@rneui/themed'; import * as RNLocalize from 'react-native-localize'; import debounce from '../../blue_modules/debounce'; import { BlueSpacing10, BlueSpacing20 } from '../../BlueComponents'; diff --git a/screen/send/create.js b/screen/send/create.js index 21bd6ceae..ce7fb4dae 100644 --- a/screen/send/create.js +++ b/screen/send/create.js @@ -5,7 +5,7 @@ import * as bitcoin from 'bitcoinjs-lib'; import PropTypes from 'prop-types'; import React, { useCallback, useEffect } from 'react'; import { Alert, FlatList, Linking, Platform, StyleSheet, Text, TextInput, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import RNFS from 'react-native-fs'; import { PERMISSIONS, request, RESULTS } from 'react-native-permissions'; import Share from 'react-native-share'; diff --git a/screen/send/psbtMultisig.js b/screen/send/psbtMultisig.js index 15bb02abd..aa43fd32b 100644 --- a/screen/send/psbtMultisig.js +++ b/screen/send/psbtMultisig.js @@ -3,7 +3,7 @@ import { useRoute } from '@react-navigation/native'; import BigNumber from 'bignumber.js'; import * as bitcoin from 'bitcoinjs-lib'; import { FlatList, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { satoshiToBTC, satoshiToLocalCurrency } from '../../blue_modules/currency'; import { BlueCard, BlueText } from '../../BlueComponents'; diff --git a/screen/send/success.js b/screen/send/success.js index fa415fa2d..d8351bb04 100644 --- a/screen/send/success.js +++ b/screen/send/success.js @@ -4,7 +4,7 @@ import BigNumber from 'bignumber.js'; import LottieView from 'lottie-react-native'; import PropTypes from 'prop-types'; import { StyleSheet, View } from 'react-native'; -import { Text } from 'react-native-elements'; +import { Text } from '@rneui/themed'; import { BlueCard } from '../../BlueComponents'; import Button from '../../components/Button'; import SafeArea from '../../components/SafeArea'; diff --git a/screen/settings/About.tsx b/screen/settings/About.tsx index cc1efb235..96f8a1f44 100644 --- a/screen/settings/About.tsx +++ b/screen/settings/About.tsx @@ -2,7 +2,7 @@ import React from 'react'; import Clipboard from '@react-native-clipboard/clipboard'; import { Alert, Image, Linking, Platform, ScrollView, StyleSheet, Text, TouchableOpacity, useWindowDimensions, View } from 'react-native'; import { getApplicationName, getBuildNumber, getBundleId, getUniqueIdSync, getVersion, hasGmsSync } from 'react-native-device-info'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import Rate, { AndroidMarket } from 'react-native-rate'; import A from '../../blue_modules/analytics'; import { BlueCard, BlueSpacing20, BlueTextCentered } from '../../BlueComponents'; diff --git a/screen/settings/lightningSettings.tsx b/screen/settings/lightningSettings.tsx index b8275d75e..66ebf7c2f 100644 --- a/screen/settings/lightningSettings.tsx +++ b/screen/settings/lightningSettings.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import AsyncStorage from '@react-native-async-storage/async-storage'; import { RouteProp, useRoute } from '@react-navigation/native'; import { Alert, I18nManager, Linking, ScrollView, StyleSheet, TextInput, View } from 'react-native'; -import { Button as ButtonRNElements } from 'react-native-elements'; +import { Button as ButtonRNElements } from '@rneui/themed'; import { BlueButtonLink, BlueCard, BlueLoading, BlueSpacing20, BlueText } from '../../BlueComponents'; import { BlueApp } from '../../class'; diff --git a/screen/settings/notificationSettings.js b/screen/settings/notificationSettings.js index ae34211c7..6cb9dad46 100644 --- a/screen/settings/notificationSettings.js +++ b/screen/settings/notificationSettings.js @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useState } from 'react'; import { I18nManager, Linking, ScrollView, StyleSheet, TextInput, TouchableWithoutFeedback, View } from 'react-native'; -import { Button as ButtonRNElements } from 'react-native-elements'; +import { Button as ButtonRNElements } from '@rneui/themed'; import Notifications from '../../blue_modules/notifications'; import { BlueCard, BlueLoading, BlueSpacing20, BlueText } from '../../BlueComponents'; diff --git a/screen/transactions/CPFP.js b/screen/transactions/CPFP.js index b5c26169b..d05fe9ca2 100644 --- a/screen/transactions/CPFP.js +++ b/screen/transactions/CPFP.js @@ -12,7 +12,7 @@ import { } from 'react-native'; import Clipboard from '@react-native-clipboard/clipboard'; import PropTypes from 'prop-types'; -import { Text } from 'react-native-elements'; +import { Text } from '@rneui/themed'; import * as BlueElectrum from '../../blue_modules/BlueElectrum'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import Notifications from '../../blue_modules/notifications'; diff --git a/screen/transactions/TransactionStatus.tsx b/screen/transactions/TransactionStatus.tsx index 672363b12..646eaf9f9 100644 --- a/screen/transactions/TransactionStatus.tsx +++ b/screen/transactions/TransactionStatus.tsx @@ -2,7 +2,7 @@ import { RouteProp, useNavigation, useRoute } from '@react-navigation/native'; import { NativeStackNavigationProp } from '@react-navigation/native-stack'; import React, { useCallback, useEffect, useMemo, useReducer, useRef } from 'react'; import { ActivityIndicator, BackHandler, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import * as BlueElectrum from '../../blue_modules/BlueElectrum'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import { BlueCard, BlueLoading, BlueSpacing10, BlueSpacing20, BlueText } from '../../BlueComponents'; diff --git a/screen/wallets/ProvideEntropy.tsx b/screen/wallets/ProvideEntropy.tsx index 472d8af86..6f4282c38 100644 --- a/screen/wallets/ProvideEntropy.tsx +++ b/screen/wallets/ProvideEntropy.tsx @@ -13,7 +13,7 @@ import { View, useWindowDimensions, } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { BlueSpacing20 } from '../../BlueComponents'; import { FButton, FContainer } from '../../components/FloatButtons'; diff --git a/screen/wallets/ViewEditMultisigCosigners.tsx b/screen/wallets/ViewEditMultisigCosigners.tsx index b108c8144..8f3b3b303 100644 --- a/screen/wallets/ViewEditMultisigCosigners.tsx +++ b/screen/wallets/ViewEditMultisigCosigners.tsx @@ -16,7 +16,7 @@ import { Text, View, } from 'react-native'; -import { Badge, Icon } from 'react-native-elements'; +import { Badge, Icon } from '@rneui/themed'; import { isDesktop, isTablet } from '../../blue_modules/environment'; import { encodeUR } from '../../blue_modules/ur'; import { diff --git a/screen/wallets/addMultisig.js b/screen/wallets/addMultisig.js index f7e2d8aad..9ea748462 100644 --- a/screen/wallets/addMultisig.js +++ b/screen/wallets/addMultisig.js @@ -2,7 +2,7 @@ import { useNavigation, useRoute } from '@react-navigation/native'; import LottieView from 'lottie-react-native'; import React, { useEffect, useRef, useState } from 'react'; import { Keyboard, ScrollView, StyleSheet, Text, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import { BlueSpacing20 } from '../../BlueComponents'; import { MultisigHDWallet } from '../../class'; diff --git a/screen/wallets/addMultisigStep2.js b/screen/wallets/addMultisigStep2.js index 8b1a98ae1..3bce7e725 100644 --- a/screen/wallets/addMultisigStep2.js +++ b/screen/wallets/addMultisigStep2.js @@ -15,7 +15,7 @@ import { TouchableOpacity, View, } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import A from '../../blue_modules/analytics'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; diff --git a/screen/wallets/ldkViewLogs.js b/screen/wallets/ldkViewLogs.js index f3f47452f..56215300a 100644 --- a/screen/wallets/ldkViewLogs.js +++ b/screen/wallets/ldkViewLogs.js @@ -1,7 +1,7 @@ import { useNavigation, useRoute } from '@react-navigation/native'; import React, { useEffect, useRef, useState } from 'react'; import { ScrollView, StyleSheet, TouchableOpacity, View } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import * as fs from '../../blue_modules/fs'; import { BlueLoading, BlueSpacing20, BlueText } from '../../BlueComponents'; import { LightningLdkWallet } from '../../class'; diff --git a/screen/wallets/signVerify.js b/screen/wallets/signVerify.js index b25dee6f7..9fefc6cef 100644 --- a/screen/wallets/signVerify.js +++ b/screen/wallets/signVerify.js @@ -11,7 +11,7 @@ import { TouchableWithoutFeedback, View, } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import Share from 'react-native-share'; import triggerHapticFeedback, { HapticFeedbackTypes } from '../../blue_modules/hapticFeedback'; import { BlueDoneAndDismissKeyboardInputAccessory, BlueFormLabel, BlueSpacing10, BlueSpacing20, BlueSpacing40 } from '../../BlueComponents'; diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js index d93424345..295894098 100644 --- a/screen/wallets/transactions.js +++ b/screen/wallets/transactions.js @@ -17,7 +17,7 @@ import { TouchableOpacity, View, } from 'react-native'; -import { Icon } from 'react-native-elements'; +import { Icon } from '@rneui/themed'; import * as BlueElectrum from '../../blue_modules/BlueElectrum'; import BlueClipboard from '../../blue_modules/clipboard'; diff --git a/tests/e2e/bluewallet.spec.js b/tests/e2e/bluewallet.spec.js index 4a023adb5..f7a82216d 100644 --- a/tests/e2e/bluewallet.spec.js +++ b/tests/e2e/bluewallet.spec.js @@ -240,7 +240,7 @@ describe('BlueWallet UI Tests - no wallets', () => { // go to Security page where we will enable encryption await element(by.id('SecurityButton')).tap(); - // await expect(element(by.id('EncyptedAndPasswordProtected'))).toBeVisible(); // @see https://github.com/react-native-elements/react-native-elements/issues/2519 + // await expect(element(by.id('EncyptedAndPasswordProtected'))).toBeVisible(); // @see https://github.com/@rneui/themed/@rneui/themed/issues/2519 await expect(element(by.id('PlausibleDeniabilityButton'))).toBeNotVisible(); if (device.getPlatform() === 'ios') { @@ -291,7 +291,7 @@ describe('BlueWallet UI Tests - no wallets', () => { await element(by.id('SettingsButton')).tap(); await expect(element(by.id('SecurityButton'))).toBeVisible(); await element(by.id('SecurityButton')).tap(); - // await expect(element(by.id('EncyptedAndPasswordProtected'))).toBeVisible(); // @see https://github.com/react-native-elements/react-native-elements/issues/2519 + // await expect(element(by.id('EncyptedAndPasswordProtected'))).toBeVisible(); // @see https://github.com/@rneui/themed/@rneui/themed/issues/2519 await expect(element(by.id('PlausibleDeniabilityButton'))).toBeVisible(); await element(by.id('PlausibleDeniabilityButton')).tap();