Closes #3618

lib/ios/RNNCommandsHandler.m

@@ -178,14 +178,12 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 -(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
 	[self assertReady];
 	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
-
+	
 	[_stackManager popTo:vc animated:vc.options.animations.pop.enable completion:^(NSArray *poppedViewControllers) {
 		[_eventEmitter sendOnNavigationCommandCompletion:popTo params:@{@"componentId": componentId}];
 		[self removePopedViewControllers:poppedViewControllers];
 		completion();
-	} rejection:^(NSString *code, NSString *message, NSError *error) {
-		
-	}];
+	} rejection:rejection];
 }
 
 -(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RCTPromiseRejectBlock)rejection {
@@ -211,7 +209,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_modalManager showModal:newVc completion:^{
+	[_modalManager showModal:newVc animated:newVc.getLeafViewController.options.animations.showModal.enable completion:^{
 		[_eventEmitter sendOnNavigationCommandCompletion:showModal params:@{@"layout": layout}];
 		completion();
 	}];

lib/ios/RNNModalManager.h

@@ -7,7 +7,7 @@
 @property (nonatomic, strong) UIViewController<RNNRootViewProtocol>* toVC;
 
 -(instancetype)initWithStore:(RNNStore*)store;
--(void)showModal:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;
+-(void)showModal:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion;
 -(void)dismissModal:(NSString*)componentId;
 -(void)dismissAllModals;
 

lib/ios/RNNModalManager.m

@@ -13,10 +13,9 @@
 	return self;
 }
 
--(void)showModalAfterLoad:(NSDictionary*)notif {
+-(void)showModal:(BOOL)animated {
 	UIViewController* topVC = [self topPresentedVC];
 	topVC.definesPresentationContext = YES;
-	BOOL animated = true;
 	
 	if ([topVC conformsToProtocol:@protocol(RNNRootViewProtocol)]) {
 		UIViewController<RNNRootViewProtocol> *navigationTopVC = (UIViewController<RNNRootViewProtocol>*)topVC;
@@ -24,11 +23,7 @@
 		if (options.animations.showModal.hasCustomAnimation) {
 			self.toVC.transitioningDelegate = navigationTopVC;
 		}
-		
-		animated = options.animations.showModal.enable;
 	}
-
-	
 	
 	[topVC presentViewController:self.toVC animated:animated completion:^{
 		if (_completionBlock) {
@@ -39,7 +34,7 @@
 	}];
 }
 
--(void)showModal:(UIViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
+-(void)showModal:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNTransitionCompletionBlock)completion {
 	self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;
 	RNNNavigationOptions* options = self.toVC.getLeafViewController.options;
 
@@ -52,10 +47,10 @@
     if ([self.toVC respondsToSelector:@selector(isCustomViewController)] &&
         [self.toVC.getLeafViewController isCustomViewController]
     ) {
-		[self showModalAfterLoad:nil];
+		[self showModal:animated];
 	} else {
 		[self.toVC.getLeafViewController waitForReactViewRender:options.animations.showModal.waitForRender perform:^{
-			[self showModalAfterLoad:nil];
+			[self showModal:animated];
 		}];
 	}
 }

lib/ios/RNNNavigationStackManager.m

@@ -29,13 +29,17 @@ typedef void (^RNNAnimationBlock)(void);
 - (void)popTo:(UIViewController *)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection; {
 	__block NSArray* poppedVCs;
 	
-	[self performAnimationBlock:^{
-		poppedVCs = [viewController.navigationController popToViewController:viewController animated:animated];
-	} completion:^{
-		if (completion) {
-			completion(poppedVCs);
-		}
-	}];
+	if ([viewController.navigationController.childViewControllers containsObject:viewController]) {
+		[self performAnimationBlock:^{
+			poppedVCs = [viewController.navigationController popToViewController:viewController animated:animated];
+		} completion:^{
+			if (completion) {
+				completion(poppedVCs);
+			}
+		}];
+	} else {
+		[RNNErrorHandler reject:rejection withErrorCode:1011 errorDescription:@"component not found in stack"];
+	}
 }
 
 - (void)popToRoot:(UIViewController*)viewController animated:(BOOL)animated completion:(RNNPopCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)rejection {