Skip to content

Commit

Permalink
Merge pull request Expensify#40122 from software-mansion-labs/@wolewi…
Browse files Browse the repository at this point in the history 
…cki/bump-react-native-airship

feat: bump react-native-airship
  • Loading branch information
@cristipaval
cristipaval authored Apr 15, 2024
2 parents eb6fc1b + aec4f34 commit 4d190c7
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 59 deletions.
8 changes: 0 additions & 8 deletions ios/NewExpensify.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,9 +626,7 @@
"${PODS_ROOT}/Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipExtendedActionsResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipPreferenceCenterResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher/GTMSessionFetcher_Core_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
Expand All @@ -641,9 +639,7 @@
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipExtendedActionsResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipPreferenceCenterResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMSessionFetcher_Core_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
Expand Down Expand Up @@ -793,9 +789,7 @@
"${PODS_ROOT}/Target Support Files/Pods-NewExpensify/Pods-NewExpensify-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipExtendedActionsResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipPreferenceCenterResources.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher/GTMSessionFetcher_Core_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
Expand All @@ -808,9 +802,7 @@
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipExtendedActionsResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipPreferenceCenterResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMSessionFetcher_Core_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
Expand Down
41 changes: 20 additions & 21 deletions ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
PODS:
- Airship (16.12.1):
- Airship/Automation (= 16.12.1)
- Airship/Basement (= 16.12.1)
- Airship/Core (= 16.12.1)
- Airship/ExtendedActions (= 16.12.1)
- Airship/MessageCenter (= 16.12.1)
- Airship/Automation (16.12.1):
- Airship (17.7.3):
- Airship/Automation (= 17.7.3)
- Airship/Basement (= 17.7.3)
- Airship/Core (= 17.7.3)
- Airship/FeatureFlags (= 17.7.3)
- Airship/MessageCenter (= 17.7.3)
- Airship/PreferenceCenter (= 17.7.3)
- Airship/Automation (17.7.3):
- Airship/Core
- Airship/Basement (16.12.1)
- Airship/Core (16.12.1):
- Airship/Basement (17.7.3)
- Airship/Core (17.7.3):
- Airship/Basement
- Airship/ExtendedActions (16.12.1):
- Airship/FeatureFlags (17.7.3):
- Airship/Core
- Airship/MessageCenter (16.12.1):
- Airship/MessageCenter (17.7.3):
- Airship/Core
- Airship/PreferenceCenter (16.12.1):
- Airship/PreferenceCenter (17.7.3):
- Airship/Core
- AirshipFrameworkProxy (2.1.1):
- Airship (= 16.12.1)
- Airship/MessageCenter (= 16.12.1)
- Airship/PreferenceCenter (= 16.12.1)
- AirshipFrameworkProxy (5.1.1):
- Airship (= 17.7.3)
- AirshipServiceExtension (17.8.0)
- AppAuth (1.6.2):
- AppAuth/Core (= 1.6.2)
Expand Down Expand Up @@ -1162,8 +1161,8 @@ PODS:
- React-Mapbuffer (0.73.4):
- glog
- React-debug
- react-native-airship (15.3.1):
- AirshipFrameworkProxy (= 2.1.1)
- react-native-airship (17.2.1):
- AirshipFrameworkProxy (= 5.1.1)
- glog
- hermes-engine
- RCT-Folly (= 2022.05.16.00)
Expand Down Expand Up @@ -2438,8 +2437,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
Airship: 2f4510b497a8200780752a5e0304a9072bfffb6d
AirshipFrameworkProxy: ea1b6c665c798637b93c465b5e505be3011f1d9d
Airship: 5a6d3f8a982398940b0d48423bb9b8736717c123
AirshipFrameworkProxy: 7255f4ed9836dc2920f2f1ea5657ced4cee8a35c
AirshipServiceExtension: 0a5fb14c3fd1879355ab05a81d10f64512a4f79c
AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
Expand Down Expand Up @@ -2508,7 +2507,7 @@ SPEC CHECKSUMS:
React-jsitracing: e8a2dafb9878dbcad02b6b2b88e66267fb427b74
React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab
React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad
react-native-airship: 2ed75ff2278f11ff1c1ab08ed68f5bf02727b971
react-native-airship: 6ab7a7974d53f92b0c46548fc198f797fdbf371f
react-native-blob-util: a3ee23cfdde79c769c138d505670055de233b07a
react-native-cameraroll: 95ce0d1a7d2d1fe55bf627ab806b64de6c3e69e9
react-native-config: 5ce986133b07fc258828b20b9506de0e683efc1c
Expand Down
7 changes: 4 additions & 3 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"@storybook/cli": "^8.0.6",
"@storybook/react": "^8.0.6",
"@storybook/theming": "^8.0.6",
"@ua/react-native-airship": "^15.3.1",
"@ua/react-native-airship": "17.2.1",
"@vue/preload-webpack-plugin": "^2.0.0",
"awesome-phonenumber": "^5.4.0",
"babel-polyfill": "^6.26.0",
Expand Down
24 changes: 0 additions & 24 deletions patches/@ua+react-native-airship+15.3.1.patch
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/libs/Notification/PushNotification/index.native.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function pushNotificationEventCallback(eventType: EventType, notification: PushP
*/
function refreshNotificationOptInStatus() {
Airship.push.getNotificationStatus().then((notificationStatus) => {
const isOptedIn = notificationStatus.airshipOptIn && notificationStatus.systemEnabled;
const isOptedIn = notificationStatus.isOptedIn && notificationStatus.areNotificationsAllowed;
if (isOptedIn === isUserOptedInToPushNotifications) {
return;
}
Expand Down Expand Up @@ -94,7 +94,7 @@ const init: Init = () => {
});

// Keep track of which users have enabled push notifications via an NVP.
Airship.addListener(EventType.NotificationOptInStatus, refreshNotificationOptInStatus);
Airship.addListener(EventType.PushNotificationStatusChangedStatus, refreshNotificationOptInStatus);

ForegroundNotifications.configureForegroundNotifications();
};
Expand Down

0 comments on commit 4d190c7

Please sign in to comment.