diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58381295b75dab4babc2b6d6d6eec556daf5f26e..c005f09ef4a1b05d3a0bdb2d85c0286d892939d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 1.0.12
+- get initial intent inside module, support rn 0.29.0 
+
 ### 1.0.11
 - change android library version to use 9.+ instead of 9.0.1 so it lives well with other libraries
 
diff --git a/README.md b/README.md
index 0da453e89c125809ae9e479fde0171eb7aa3c0fb..4fe1f943f2573bb54e7c29b88296cf71ca4bae75 100644
--- a/README.md
+++ b/README.md
@@ -74,13 +74,6 @@ public void onNewIntent (Intent intent) {
   super.onNewIntent(intent);
     setIntent(intent);
 }       
-
-// Add package
-@Override
-    protected List<ReactPackage> getPackages() {
-    ...
-      new FIRMessagingPackage(getIntent()),                               // <-- add getIntent()
-    ...
 ```
 
 ## IOS Configuration
diff --git a/android/react-native-fcm.iml b/android/react-native-fcm.iml
index f1f4a602ae52e00f542f0a9e5b9a2b6dcc6ca085..fa72a0def0af389a3974c797189643345170615d 100644
--- a/android/react-native-fcm.iml
+++ b/android/react-native-fcm.iml
@@ -65,14 +65,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -81,13 +73,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/9.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
@@ -102,35 +101,33 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-base-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" />
+    <orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-iid-9.2.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-common-9.2.0" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
-    <orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-messaging-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-analytics-impl-9.2.0" level="project" />
+    <orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
+    <orderEntry type="library" exported="" name="firebase-core-9.2.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-urlconnection-3.2.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-tasks-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="play-services-basement-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-common-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-iid-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="firebase-core-9.0.1" level="project" />
+    <orderEntry type="library" exported="" name="imagepipeline-base-0.11.0" level="project" />
+    <orderEntry type="library" exported="" name="fresco-0.11.0" level="project" />
+    <orderEntry type="library" exported="" name="react-native-0.29.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-ws-3.2.0" level="project" />
     <orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
+    <orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-analytics-9.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
     <orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
-    <orderEntry type="library" exported="" name="firebase-analytics-impl-9.0.1" level="project" />
-    <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
-    <orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="imagepipeline-0.11.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-basement-9.2.0" level="project" />
+    <orderEntry type="library" exported="" name="firebase-messaging-9.2.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="play-services-tasks-9.2.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
index 14536f21e7bcb516ca3cdb3c82b981d8405f0589..d13cfb8e2b0f863925ae877284efb62905b10e4c 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java
@@ -29,10 +29,10 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li
     private final static String TAG = FIRMessagingModule.class.getCanonicalName();
     Intent mIntent;
 
-    public FIRMessagingModule(ReactApplicationContext reactContext, Intent intent) {
+    public FIRMessagingModule(ReactApplicationContext reactContext) {
         super(reactContext);
 
-        mIntent = intent;
+        mIntent = getCurrentActivity().getIntent();
 
         getReactApplicationContext().addLifecycleEventListener(this);
         registerTokenRefreshHandler();
diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
index 5c980c6ca040f89372897f1339c222c0e65e1936..c568a67a6830d6a798a68e8e8d33d2cf679b5515 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingPackage.java
@@ -18,15 +18,11 @@ public class FIRMessagingPackage implements ReactPackage {
     public FIRMessagingPackage(){
     }
 
-    public FIRMessagingPackage(Intent intent){
-        mIntent = intent;
-    }
-
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
 
-        modules.add(new FIRMessagingModule(reactContext, mIntent));
+        modules.add(new FIRMessagingModule(reactContext));
         return modules;
     }
 
diff --git a/package.json b/package.json
index 8329c475d800e16534cbc7a61cdbfe8eb9f348f6..dc48bf35070cb40cfabdd2210e45d70cb813d3b0 100644
--- a/package.json
+++ b/package.json
@@ -22,5 +22,5 @@
     "type": "git",
     "url": "git+https://github.com/evollu/react-native-fcm.git"
   },
-  "version": "1.0.11"
+  "version": "1.0.12"
 }