diff --git a/ios/RNFirebase/analytics/RNFirebaseAnalytics.m b/ios/RNFirebase/analytics/RNFirebaseAnalytics.m index d3e62764..4c412924 100644 --- a/ios/RNFirebase/analytics/RNFirebaseAnalytics.m +++ b/ios/RNFirebase/analytics/RNFirebaseAnalytics.m @@ -16,7 +16,9 @@ RCT_EXPORT_METHOD(setAnalyticsCollectionEnabled:(BOOL) enabled) { } RCT_EXPORT_METHOD(setCurrentScreen:(NSString *) screenName screenClass:(NSString *) screenClassOverriew) { - [FIRAnalytics setScreenName:screenName screenClass:screenClassOverriew]; + dispatch_async(dispatch_get_main_queue(), ^{ + [FIRAnalytics setScreenName:screenName screenClass:screenClassOverriew]; + }); } RCT_EXPORT_METHOD(setUserId: (NSString *) id) { diff --git a/ios/RNFirebase/messaging/RNFirebaseMessaging.m b/ios/RNFirebase/messaging/RNFirebaseMessaging.m index a3b5cee9..b53fe76a 100644 --- a/ios/RNFirebase/messaging/RNFirebaseMessaging.m +++ b/ios/RNFirebase/messaging/RNFirebaseMessaging.m @@ -386,7 +386,9 @@ RCT_EXPORT_METHOD(getScheduledLocalNotifications:(RCTPromiseResolveBlock)resolve } RCT_EXPORT_METHOD(setBadgeNumber: (NSInteger*) number) { - [RCTSharedApplication() setApplicationIconBadgeNumber:number]; + dispatch_async(dispatch_get_main_queue(), ^{ + [RCTSharedApplication() setApplicationIconBadgeNumber:number]; + } } RCT_EXPORT_METHOD(getBadgeNumber: (RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {