fix #452

android/app/BUCK

@@ -46,13 +46,13 @@ android_library(
 
 android_build_config(
   name = 'build_config',
-  package = 'com.statusim',
+  package = 'im.status.ethereum',
 )
 
 android_resource(
   name = 'res',
   res = 'src/main/res',
-  package = 'com.statusim',
+  package = 'im.status.ethereum',
 )
 
 android_binary(

android/app/build.gradle

@@ -84,7 +84,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.statusim"
+        applicationId "im.status.ethereum"
         minSdkVersion 18
         targetSdkVersion 22
         versionCode 1

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.statusim">
+          package="im.status.ethereum">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>

android/app/src/main/java/im/status/ethereum/MainActivity.java

@@ -1,4 +1,4 @@
-package com.statusim;
+package im.status.ethereum;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;

android/app/src/main/java/im/status/ethereum/MainApplication.java

@@ -1,4 +1,4 @@
-package com.statusim;
+package im.status.ethereum;
 
 import android.app.Application;
 
@@ -9,7 +9,7 @@ import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 
-import com.statusim.module.StatusPackage;
+import im.status.ethereum.module.StatusPackage;
 import io.realm.react.RealmReactPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
 import com.rt2zz.reactnativecontacts.ReactNativeContacts;

android/app/src/main/java/im/status/ethereum/RootUtil.java

@@ -1,4 +1,4 @@
-package com.statusim;
+package im.status.ethereum;
 
 import java.io.File;
 import java.io.BufferedReader;

ios/StatusIm.xcodeproj/project.pbxproj

@@ -1657,7 +1657,7 @@
 					"-lc++",
 					"-ObjC",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.statusim;
+				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				VALID_ARCHS = "arm64 armv7 armv7s x86_64";
 			};
@@ -1709,7 +1709,7 @@
 					"-lc++",
 					"-ObjC",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.statusim;
+				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				VALID_ARCHS = "arm64 armv7 armv7s x86_64";
 			};

modules/react-native-status/android/build.gradle

@@ -14,5 +14,5 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:+'
-    compile(group: 'status-im', name: 'status-go', version: 'tx-discard', ext: 'aar')
+    compile(group: 'status-im', name: 'status-go', version: 'tx-multi-actions', ext: 'aar')
 }

modules/react-native-status/android/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.statusim.module">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="im.status.ethereum.module">
 </manifest>

modules/react-native-status/android/src/main/java/im/status/ethereum/module/ConnectorHandler.java

@@ -1,4 +1,4 @@
-package com.statusim.module;
+package im.status.ethereum.module;
 
 
 import android.os.Message;

modules/react-native-status/android/src/main/java/im/status/ethereum/module/ServiceConnector.java

@@ -1,4 +1,4 @@
-package com.statusim.module;
+package im.status.ethereum.module;
 
 
 import android.content.ComponentName;

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusConnector.java

@@ -1,4 +1,4 @@
-package com.statusim.module;
+package im.status.ethereum.module;
 
 
 import android.content.Context;

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusMessages.java

@@ -1,4 +1,4 @@
-package com.statusim.module;
+package im.status.ethereum.module;
 
 
 public class StatusMessages {

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

@@ -1,4 +1,4 @@
-package com.statusim.module;
+package im.status.ethereum.module;
 
 import android.app.Activity;
 import android.view.WindowManager;

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java

@@ -1,11 +1,11 @@
-package com.statusim.module;
+package im.status.ethereum.module;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.statusim.module.StatusService;
+import im.status.ethereum.module.StatusService;
 
 import java.util.ArrayList;
 import java.util.Collections;

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java

@@ -1,4 +1,4 @@
-package com.statusim.module;
+package im.status.ethereum.module;
 
 import android.app.Service;
 import android.content.Intent;

modules/react-native-status/ios/RCTStatus/pom.xml

@@ -25,7 +25,7 @@
                         <artifactItem>
                             <groupId>status-im</groupId>
                             <artifactId>status-go-ios-simulator</artifactId>
-                            <version>tx-discard</version>
+                            <version>tx-multi-actions</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
                             <outputDirectory>./</outputDirectory>

test/clj/status_im/appium.clj

@@ -16,7 +16,7 @@
                        (.setCapability "deviceName" "device")
                        (.setCapability "platformVersion" "6.0.0")
                        (.setCapability "app" (.getAbsolutePath app))
-                       (.setCapability "appPackage" "com.statusim")
+                       (.setCapability "appPackage" "im.status.ethereum")
                        (.setCapability "appActivity" ".MainActivity"))
         driver       (AndroidDriver. (URL. "http://127.0.0.1:4723/wd/hub") capabilities)]
     (-> driver