diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js --- a/native/account/logged-out-modal.react.js +++ b/native/account/logged-out-modal.react.js @@ -15,7 +15,7 @@ } from 'react-native'; import Animated, { EasingNode } from 'react-native-reanimated'; import { SafeAreaView } from 'react-native-safe-area-context'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from '@expo/vector-icons/FontAwesome'; import { useDispatch } from 'react-redux'; import { isLoggedIn } from 'lib/selectors/user-selectors'; diff --git a/native/account/panel-components.react.js b/native/account/panel-components.react.js --- a/native/account/panel-components.react.js +++ b/native/account/panel-components.react.js @@ -9,7 +9,7 @@ ScrollView, } from 'react-native'; import Animated from 'react-native-reanimated'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from '@expo/vector-icons/FontAwesome'; import type { LoadingStatus } from 'lib/types/loading-types'; diff --git a/native/calendar/entry.react.js b/native/calendar/entry.react.js --- a/native/calendar/entry.react.js +++ b/native/calendar/entry.react.js @@ -14,7 +14,7 @@ LayoutAnimation, Keyboard, } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from '@expo/vector-icons/FontAwesome'; import { useDispatch } from 'react-redux'; import shallowequal from 'shallowequal'; import tinycolor from 'tinycolor2'; diff --git a/native/calendar/loading-indicator.react.js b/native/calendar/loading-indicator.react.js --- a/native/calendar/loading-indicator.react.js +++ b/native/calendar/loading-indicator.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { ActivityIndicator, StyleSheet, Platform } from 'react-native'; -import Icon from 'react-native-vector-icons/Feather'; +import Icon from '@expo/vector-icons/Feather'; import type { LoadingStatus } from 'lib/types/loading-types'; diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js --- a/native/chat/chat-input-bar.react.js +++ b/native/chat/chat-input-bar.react.js @@ -15,7 +15,7 @@ } from 'react-native'; import { TextInputKeyboardMangerIOS } from 'react-native-keyboard-input'; import Animated, { EasingNode } from 'react-native-reanimated'; -import Icon from 'react-native-vector-icons/Ionicons'; +import Icon from '@expo/vector-icons/Ionicons'; import { useDispatch } from 'react-redux'; import { diff --git a/native/chat/chat-thread-list-see-more-sidebars.react.js b/native/chat/chat-thread-list-see-more-sidebars.react.js --- a/native/chat/chat-thread-list-see-more-sidebars.react.js +++ b/native/chat/chat-thread-list-see-more-sidebars.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { Text } from 'react-native'; -import Icon from 'react-native-vector-icons/Ionicons'; +import Icon from '@expo/vector-icons/Ionicons'; import type { ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/chat/chat-thread-list.react.js b/native/chat/chat-thread-list.react.js --- a/native/chat/chat-thread-list.react.js +++ b/native/chat/chat-thread-list.react.js @@ -13,7 +13,7 @@ } from 'react-native'; import { FloatingAction } from 'react-native-floating-action'; import Animated from 'react-native-reanimated'; -import IonIcon from 'react-native-vector-icons/Ionicons'; +import IonIcon from '@expo/vector-icons/Ionicons'; import { createSelector } from 'reselect'; import { searchUsers } from 'lib/actions/user-actions'; diff --git a/native/chat/composed-message.react.js b/native/chat/composed-message.react.js --- a/native/chat/composed-message.react.js +++ b/native/chat/composed-message.react.js @@ -4,7 +4,7 @@ import * as React from 'react'; import { StyleSheet, View } from 'react-native'; import Animated from 'react-native-reanimated'; -import Icon from 'react-native-vector-icons/Feather'; +import Icon from '@expo/vector-icons/Feather'; import { createMessageReply } from 'lib/shared/message-utils'; import { assertComposableMessageType } from 'lib/types/message-types'; diff --git a/native/chat/inline-multimedia.react.js b/native/chat/inline-multimedia.react.js --- a/native/chat/inline-multimedia.react.js +++ b/native/chat/inline-multimedia.react.js @@ -3,8 +3,8 @@ import * as React from 'react'; import { View, StyleSheet, Text } from 'react-native'; import * as Progress from 'react-native-progress'; -import Icon from 'react-native-vector-icons/Feather'; -import IonIcon from 'react-native-vector-icons/Ionicons'; +import Icon from '@expo/vector-icons/Feather'; +import IonIcon from '@expo/vector-icons/Ionicons'; import tinycolor from 'tinycolor2'; import { isLocalUploadID } from 'lib/media/media-utils'; diff --git a/native/chat/message-list-header-title.react.js b/native/chat/message-list-header-title.react.js --- a/native/chat/message-list-header-title.react.js +++ b/native/chat/message-list-header-title.react.js @@ -6,7 +6,7 @@ } from '@react-navigation/elements'; import * as React from 'react'; import { View, Platform } from 'react-native'; -import Icon from 'react-native-vector-icons/Ionicons'; +import Icon from '@expo/vector-icons/Ionicons'; import type { ThreadInfo } from 'lib/types/thread-types'; import { firstLine } from 'lib/utils/string-utils'; diff --git a/native/chat/new-messages-pill.react.js b/native/chat/new-messages-pill.react.js --- a/native/chat/new-messages-pill.react.js +++ b/native/chat/new-messages-pill.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { TouchableOpacity, View, Text, Platform, Animated } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from '@expo/vector-icons/FontAwesome'; import { useStyles } from '../themes/colors'; import type { ViewStyle } from '../types/styles'; diff --git a/native/chat/relationship-prompt.react.js b/native/chat/relationship-prompt.react.js --- a/native/chat/relationship-prompt.react.js +++ b/native/chat/relationship-prompt.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { Alert, Text, View } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome5'; +import Icon from '@expo/vector-icons/FontAwesome5'; import { useRelationshipPrompt } from 'lib/hooks/relationship-prompt'; import { userRelationshipStatus } from 'lib/types/relationship-types'; diff --git a/native/chat/settings/color-selector-modal.react.js b/native/chat/settings/color-selector-modal.react.js --- a/native/chat/settings/color-selector-modal.react.js +++ b/native/chat/settings/color-selector-modal.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { TouchableHighlight, Alert } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from '@expo/vector-icons/FontAwesome'; import { changeThreadSettingsActionTypes, diff --git a/native/chat/settings/compose-subchannel-modal.react.js b/native/chat/settings/compose-subchannel-modal.react.js --- a/native/chat/settings/compose-subchannel-modal.react.js +++ b/native/chat/settings/compose-subchannel-modal.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { Text } from 'react-native'; -import IonIcon from 'react-native-vector-icons/Ionicons'; +import IonIcon from '@expo/vector-icons/Ionicons'; import { threadTypeDescriptions } from 'lib/shared/thread-utils'; import { type ThreadInfo, threadTypes } from 'lib/types/thread-types'; diff --git a/native/chat/settings/thread-settings-list-action.react.js b/native/chat/settings/thread-settings-list-action.react.js --- a/native/chat/settings/thread-settings-list-action.react.js +++ b/native/chat/settings/thread-settings-list-action.react.js @@ -2,8 +2,8 @@ import * as React from 'react'; import { View, Text, Platform } from 'react-native'; -import type { IoniconsGlyphs } from 'react-native-vector-icons/Ionicons'; -import Icon from 'react-native-vector-icons/Ionicons'; +import type { IoniconsGlyphs } from '@expo/vector-icons/Ionicons'; +import Icon from '@expo/vector-icons/Ionicons'; import Button from '../../components/button.react'; import { useStyles } from '../../themes/colors'; diff --git a/native/chat/swipeable-message.react.js b/native/chat/swipeable-message.react.js --- a/native/chat/swipeable-message.react.js +++ b/native/chat/swipeable-message.react.js @@ -16,7 +16,7 @@ Extrapolate, type SharedValue, } from 'react-native-reanimated'; -import type { IconProps } from 'react-native-vector-icons'; +import type { IconProps } from '@expo/vector-icons'; import tinycolor from 'tinycolor2'; import CommIcon from '../components/comm-icon.react'; diff --git a/native/chat/swipeable-thread.react.js b/native/chat/swipeable-thread.react.js --- a/native/chat/swipeable-thread.react.js +++ b/native/chat/swipeable-thread.react.js @@ -2,7 +2,7 @@ import { useNavigation } from '@react-navigation/native'; import * as React from 'react'; -import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons'; +import MaterialIcon from '@expo/vector-icons/MaterialCommunityIcons'; import useToggleUnreadStatus from 'lib/hooks/toggle-unread-status'; import type { ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/chat/thread-settings-button.react.js b/native/chat/thread-settings-button.react.js --- a/native/chat/thread-settings-button.react.js +++ b/native/chat/thread-settings-button.react.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import Icon from 'react-native-vector-icons/Ionicons'; +import Icon from '@expo/vector-icons/Ionicons'; import { type ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/components/action-row.react.js b/native/components/action-row.react.js --- a/native/components/action-row.react.js +++ b/native/components/action-row.react.js @@ -4,7 +4,7 @@ import { View, Text as RawText } from 'react-native'; import RawIcon, { type IoniconsGlyphs, -} from 'react-native-vector-icons/Ionicons'; +} from '@expo/vector-icons/Ionicons'; import Button from '../components/button.react'; import { useColors, useStyles } from '../themes/colors'; diff --git a/native/components/comm-icon.react.js b/native/components/comm-icon.react.js --- a/native/components/comm-icon.react.js +++ b/native/components/comm-icon.react.js @@ -1,6 +1,6 @@ // @flow -import { createIconSetFromIcoMoon, type Icon } from 'react-native-vector-icons'; +import { createIconSetFromIcoMoon, type Icon } from '@expo/vector-icons'; import icoMoonConfig from 'lib/shared/comm-icon-config.json'; diff --git a/native/components/swmansion-icon.react.js b/native/components/swmansion-icon.react.js --- a/native/components/swmansion-icon.react.js +++ b/native/components/swmansion-icon.react.js @@ -1,6 +1,6 @@ // @flow -import { createIconSetFromIcoMoon, type Icon } from 'react-native-vector-icons'; +import { createIconSetFromIcoMoon, type Icon } from '@expo/vector-icons'; import icoMoonConfig from 'lib/shared/swmansion-icon-config.json'; diff --git a/native/components/thread-ancestors-label.react.js b/native/components/thread-ancestors-label.react.js --- a/native/components/thread-ancestors-label.react.js +++ b/native/components/thread-ancestors-label.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { Text, View } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome5'; +import Icon from '@expo/vector-icons/FontAwesome5'; import { useAncestorThreads } from 'lib/shared/ancestor-threads'; import { type ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/components/thread-ancestors.react.js b/native/components/thread-ancestors.react.js --- a/native/components/thread-ancestors.react.js +++ b/native/components/thread-ancestors.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { View, ScrollView } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome5'; +import Icon from '@expo/vector-icons/FontAwesome5'; import { ancestorThreadInfos } from 'lib/selectors/thread-selectors'; import type { ThreadInfo } from 'lib/types/thread-types'; diff --git a/native/components/thread-icon.react.js b/native/components/thread-icon.react.js --- a/native/components/thread-icon.react.js +++ b/native/components/thread-icon.react.js @@ -2,7 +2,7 @@ import * as React from 'react'; import { StyleSheet } from 'react-native'; -import EntypoIcon from 'react-native-vector-icons/Entypo'; +import EntypoIcon from '@expo/vector-icons/Entypo'; import { threadTypes, type ThreadType } from 'lib/types/thread-types'; diff --git a/native/crash.react.js b/native/crash.react.js --- a/native/crash.react.js +++ b/native/crash.react.js @@ -13,7 +13,7 @@ ActivityIndicator, } from 'react-native'; import ExitApp from 'react-native-exit-app'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from '@expo/vector-icons/FontAwesome'; import { sendReportActionTypes, sendReport } from 'lib/actions/report-actions'; import { logOutActionTypes, logOut } from 'lib/actions/user-actions'; diff --git a/native/ios/Comm.xcodeproj/project.pbxproj b/native/ios/Comm.xcodeproj/project.pbxproj --- a/native/ios/Comm.xcodeproj/project.pbxproj +++ b/native/ios/Comm.xcodeproj/project.pbxproj @@ -841,22 +841,6 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Comm/Pods-Comm-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf", - "${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/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-menu/EXDevMenu.bundle", @@ -864,22 +848,6 @@ name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf", - "${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}/AccessibilityResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevLauncher.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevMenu.bundle", @@ -897,22 +865,6 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NotificationService/Pods-NotificationService-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf", - "${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/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-launcher/EXDevLauncher.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-menu/EXDevMenu.bundle", @@ -920,22 +872,6 @@ name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf", - "${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}/AccessibilityResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevLauncher.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXDevMenu.bundle", diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock --- a/native/ios/Podfile.lock +++ b/native/ios/Podfile.lock @@ -526,8 +526,6 @@ - React-RCTImage - RNSVG (12.3.0): - React-Core - - RNVectorIcons (6.6.0): - - React - SDWebImage (5.13.5): - SDWebImage/Core (= 5.13.5) - SDWebImage/Core (5.13.5) @@ -630,7 +628,6 @@ - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../node_modules/react-native-screens`) - RNSVG (from `../node_modules/react-native-svg`) - - RNVectorIcons (from `../node_modules/react-native-vector-icons`) - "SQLCipher-Amalgamation (from `../../node_modules/@commapp/sqlcipher-amalgamation`)" - Yoga (from `../../node_modules/react-native/ReactCommon/yoga`) @@ -811,8 +808,6 @@ :path: "../node_modules/react-native-screens" RNSVG: :path: "../node_modules/react-native-svg" - RNVectorIcons: - :path: "../node_modules/react-native-vector-icons" SQLCipher-Amalgamation: :path: "../../node_modules/@commapp/sqlcipher-amalgamation" Yoga: @@ -907,7 +902,6 @@ RNReanimated: 60e291d42c77752a0f6d6f358387bdf225a87c6e RNScreens: 6e1ea5787989f92b0671049b808aef64fa1ef98c RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8 - RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4 SDWebImage: 23d714cd599354ee7906dbae26dff89b421c4370 SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21 SPTPersistentCache: df36ea46762d7cf026502bbb86a8b79d0080dff4 diff --git a/native/media/camera-modal.react.js b/native/media/camera-modal.react.js --- a/native/media/camera-modal.react.js +++ b/native/media/camera-modal.react.js @@ -24,7 +24,7 @@ import Reanimated, { EasingNode as ReanimatedEasing, } from 'react-native-reanimated'; -import Icon from 'react-native-vector-icons/Ionicons'; +import Icon from '@expo/vector-icons/Ionicons'; import { useDispatch } from 'react-redux'; import { pathFromURI, filenameFromPathOrURI } from 'lib/media/file-utils'; diff --git a/native/media/media-gallery-media.react.js b/native/media/media-gallery-media.react.js --- a/native/media/media-gallery-media.react.js +++ b/native/media/media-gallery-media.react.js @@ -14,8 +14,8 @@ import Reanimated, { EasingNode as ReanimatedEasing, } from 'react-native-reanimated'; -import Icon from 'react-native-vector-icons/FontAwesome'; -import MaterialIcon from 'react-native-vector-icons/MaterialIcons'; +import Icon from '@expo/vector-icons/FontAwesome'; +import MaterialIcon from '@expo/vector-icons/MaterialIcons'; import Video from 'react-native-video'; import { type MediaLibrarySelection } from 'lib/types/media-types'; diff --git a/native/media/send-media-button.react.js b/native/media/send-media-button.react.js --- a/native/media/send-media-button.react.js +++ b/native/media/send-media-button.react.js @@ -9,7 +9,7 @@ Platform, Animated, } from 'react-native'; -import Icon from 'react-native-vector-icons/FontAwesome'; +import Icon from '@expo/vector-icons/FontAwesome'; import type { ViewStyle } from '../types/styles'; diff --git a/native/media/video-playback-modal.react.js b/native/media/video-playback-modal.react.js --- a/native/media/video-playback-modal.react.js +++ b/native/media/video-playback-modal.react.js @@ -7,7 +7,7 @@ import { TapGestureHandler } from 'react-native-gesture-handler'; import * as Progress from 'react-native-progress'; import Animated from 'react-native-reanimated'; -import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; +import Icon from '@expo/vector-icons/MaterialCommunityIcons'; import Video from 'react-native-video'; import { useIsAppBackgroundedOrInactive } from 'lib/shared/lifecycle-utils'; diff --git a/native/package.json b/native/package.json --- a/native/package.json +++ b/native/package.json @@ -50,6 +50,7 @@ "dependencies": { "@commapp/sqlcipher-amalgamation": "^4.4.3-a", "@expo/react-native-action-sheet": "^3.14.0", + "@expo/vector-icons": "^13.0.0", "@react-native-async-storage/async-storage": "^1.17.10", "@react-native-clipboard/clipboard": "^1.11.1", "@react-native-community/art": "^1.2.0", @@ -104,7 +105,6 @@ "react-native-screens": "~3.8.0", "react-native-svg": "^12.3.0", "react-native-tab-view": "^3.3.0", - "react-native-vector-icons": "^6.6.0", "react-native-video": "^5.2.1", "react-native-webview": "^11.23.0", "react-redux": "^7.1.1", diff --git a/native/themes/fonts.js b/native/themes/fonts.js --- a/native/themes/fonts.js +++ b/native/themes/fonts.js @@ -1,10 +1,10 @@ // @flow -import FeatherIcon from 'react-native-vector-icons/Feather'; -import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome'; -import IonIcon from 'react-native-vector-icons/Ionicons'; -import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'; -import MaterialIcon from 'react-native-vector-icons/MaterialIcons'; +import FeatherIcon from '@expo/vector-icons/Feather'; +import FontAwesomeIcon from '@expo/vector-icons/FontAwesome'; +import IonIcon from '@expo/vector-icons/Ionicons'; +import MaterialCommunityIcon from '@expo/vector-icons/MaterialCommunityIcons'; +import MaterialIcon from '@expo/vector-icons/MaterialIcons'; // This is only necessary on iOS if we switch to use_frameworks // We're keeping it here in case we ever do that again diff --git a/patches/react-native-vector-icons+6.6.0.patch b/patches/react-native-vector-icons+6.6.0.patch deleted file mode 100644 --- a/patches/react-native-vector-icons+6.6.0.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/node_modules/react-native-vector-icons/dist/index.js.flow b/node_modules/react-native-vector-icons/dist/index.js.flow -index 75c5d2d..4481676 100644 ---- a/node_modules/react-native-vector-icons/dist/index.js.flow -+++ b/node_modules/react-native-vector-icons/dist/index.js.flow -@@ -12,6 +12,7 @@ export type IconButtonProps = { - color?: Color, - name: Glyphs, - size?: number, -+ ... - }; - - declare class IconButton extends PureComponent< -@@ -58,6 +59,7 @@ export type IconProps = { - color?: Color, - name: Glyphs, - size?: number, -+ ... - }; - - export type ImageSource = {| -diff --git a/node_modules/react-native-vector-icons/index.js.flow b/node_modules/react-native-vector-icons/index.js.flow -index 75c5d2d..4481676 100644 ---- a/node_modules/react-native-vector-icons/index.js.flow -+++ b/node_modules/react-native-vector-icons/index.js.flow -@@ -12,6 +12,7 @@ export type IconButtonProps = { - color?: Color, - name: Glyphs, - size?: number, -+ ... - }; - - declare class IconButton extends PureComponent< -@@ -58,6 +59,7 @@ export type IconProps = { - color?: Color, - name: Glyphs, - size?: number, -+ ... - }; - - export type ImageSource = {| diff --git a/yarn.lock b/yarn.lock --- a/yarn.lock +++ b/yarn.lock @@ -14448,7 +14448,7 @@ resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y= -lodash@^4.0.0, lodash@^4.0.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.7.0, lodash@^4.8.0: +lodash@^4.0.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.7.0, lodash@^4.8.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -18131,15 +18131,6 @@ dependencies: whatwg-url-without-unicode "8.0.0-3" -react-native-vector-icons@^6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/react-native-vector-icons/-/react-native-vector-icons-6.6.0.tgz#66cf004918eb05d90778d64bd42077c1800d481b" - integrity sha512-MImKVx8JEvVVBnaShMr7/yTX4Y062JZMupht1T+IEgbqBj4aQeQ1z2SH4VHWKNtWtppk4kz9gYyUiMWqx6tNSw== - dependencies: - lodash "^4.0.0" - prop-types "^15.6.2" - yargs "^13.2.2" - react-native-video@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/react-native-video/-/react-native-video-5.2.1.tgz#a17e856759d7e17eee9cbd9df0d05ba22e88d457" @@ -22476,7 +22467,7 @@ y18n "^4.0.0" yargs-parser "^16.1.0" -yargs@^13.2.2, yargs@^13.2.4, yargs@^13.3.0, yargs@^13.3.2: +yargs@^13.2.4, yargs@^13.3.0, yargs@^13.3.2: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==