diff --git a/.android/gradle.properties b/.android/gradle.properties
index 598d13fee..94adc3a3f 100644
--- a/.android/gradle.properties
+++ b/.android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/.ios/Podfile b/.ios/Podfile
index 08805d6c7..55ea59749 100644
--- a/.ios/Podfile
+++ b/.ios/Podfile
@@ -2,6 +2,7 @@ platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+ENV['SWIFT_VERSION'] = '5'
 
 project 'Runner', {
   'Debug' => :debug,
@@ -31,6 +32,7 @@ target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
 
   pod 'FlutterPluginRegistrant', :path => File.join('Flutter', 'FlutterPluginRegistrant'), :inhibit_warnings => true
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '10.10.0'
 end
 
 post_install do |installer|
diff --git a/.ios/Runner/AppDelegate.m b/.ios/Runner/AppDelegate.m
index 7644d81dc..c6cc0d83f 100644
--- a/.ios/Runner/AppDelegate.m
+++ b/.ios/Runner/AppDelegate.m
@@ -5,6 +5,7 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+      [GMSServices provideAPIKey:@"AIzaSyD8vwvoaEPEgYemp1EkIETetJMvyS4Ptqk"];
   [GeneratedPluginRegistrant registerWithRegistry:self];
   return [super application:application didFinishLaunchingWithOptions:launchOptions];
 }
diff --git a/lib/action/bottom_modal_action.dart b/lib/action/bottom_modal_action.dart
index e460fd742..5e1eb375b 100644
--- a/lib/action/bottom_modal_action.dart
+++ b/lib/action/bottom_modal_action.dart
@@ -71,7 +71,7 @@ class ShowBottomModalAction extends EnsembleAction {
               enableDrag: _enableDrag(scopeManager),
               showDragHandle: _enableDragHandler(scopeManager),
               builder: (modalContext) =>
-                  ContextScopeWidget(rootContext: context, child: widget!))
+                  ContextScopeWidget(rootContext: modalContext, child: widget!))
           .then((payload) {
         if (onDismiss != null) {
           return ScreenController().executeActionWithScope(
@@ -102,6 +102,6 @@ class DismissBottomModalAction extends EnsembleAction {
       return Navigator.maybePop(
           bottomModalContext, scopeManager.dataContext.eval(payload));
     }
-    return Navigator.maybePop(context, scopeManager.dataContext.eval(payload));
+    return Future.value(null);
   }
 }