diff --git a/.env b/.env
index bb636cc4fa..2079b78b3f 100644
--- a/.env
+++ b/.env
@@ -7,9 +7,7 @@ RN_BRIDGE_THRESHOLD_WARNINGS=0
POW_TARGET=0.002
POW_TIME=1
DEFAULT_NETWORK=mainnet_rpc
-INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c
DEBUG_WEBVIEW=1
-INSTABUG_SURVEYS=1
GROUP_CHATS_ENABLED=1
CACHED_WEBVIEWS_ENABLED=1
EXTENSIONS=1
diff --git a/.env.e2e b/.env.e2e
index 80ed5fae69..30bda5dd0a 100644
--- a/.env.e2e
+++ b/.env.e2e
@@ -6,7 +6,6 @@ RN_BRIDGE_THRESHOLD_WARNINGS=0
POW_TARGET=0.002
POW_TIME=1
DEFAULT_NETWORK=testnet_rpc
-INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c
DEBUG_WEBVIEW=1
GROUP_CHATS_ENABLED=0
EXTENSIONS=1
diff --git a/.env.jenkins b/.env.jenkins
index 981a232e96..9d7ffc3fc2 100644
--- a/.env.jenkins
+++ b/.env.jenkins
@@ -7,7 +7,6 @@ RN_BRIDGE_THRESHOLD_WARNINGS=0
POW_TARGET=0.002
POW_TIME=1
DEFAULT_NETWORK=mainnet_rpc
-INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c
DEBUG_WEBVIEW=1
GROUP_CHATS_ENABLED=1
MAINNET_WARNING_ENABLED=1
diff --git a/.env.nightly b/.env.nightly
index 110182b4e6..294d875989 100644
--- a/.env.nightly
+++ b/.env.nightly
@@ -7,7 +7,6 @@ RN_BRIDGE_THRESHOLD_WARNINGS=0
POW_TARGET=0.002
POW_TIME=1
DEFAULT_NETWORK=mainnet_rpc
-INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c
DEBUG_WEBVIEW=1
GROUP_CHATS_ENABLED=0
MAINNET_WARNING_ENABLED=1
diff --git a/.env.nightly.staging.fleet b/.env.nightly.staging.fleet
index 35ca487e31..4143b2efd9 100644
--- a/.env.nightly.staging.fleet
+++ b/.env.nightly.staging.fleet
@@ -6,9 +6,7 @@ RN_BRIDGE_THRESHOLD_WARNINGS=0
POW_TARGET=0.002
POW_TIME=1
DEFAULT_NETWORK=mainnet_rpc
-INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c
DEBUG_WEBVIEW=1
-INSTABUG_SURVEYS=1
GROUP_CHATS_ENABLED=0
MAINNET_WARNING_ENABLED=1
EXTENSIONS=1
diff --git a/.env.prod b/.env.prod
index 6b4072c17e..381f6f63e3 100644
--- a/.env.prod
+++ b/.env.prod
@@ -8,7 +8,6 @@ RN_BRIDGE_THRESHOLD_WARNINGS=0
POW_TARGET=0.002
POW_TIME=1
DEFAULT_NETWORK=mainnet_rpc
-INSTABUG_TOKEN=758630ed52864cbad9c5eeeac596c60c
DEBUG_WEBVIEW=0
GROUP_CHATS_ENABLED=0
MAINNET_WARNING_ENABLED=1
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d849bc15d2..1c36960bd9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -224,13 +224,12 @@ dependencies {
implementation project(':react-native-svg')
implementation 'com.android.support:multidex:1.0.2'
implementation project(':react-native-http-bridge')
- implementation project(':instabug-reactnative')
implementation project(':react-native-splash-screen')
implementation project(':react-native-image-resizer')
implementation project(':react-native-dialogs')
implementation project(':realm')
implementation fileTree(dir: "libs", include: ["*.jar"])
- implementation "com.android.support:appcompat-v7:26.1.0"
+ implementation "com.android.support:appcompat-v7:27.1.0"
// Force using exact RN version instead of relying on gradle dependency resolution
// https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
//compile ("com.facebook.react:react-native:0.55.4") { force = true } // From node_modules
@@ -253,7 +252,6 @@ dependencies {
implementation 'com.google.firebase:firebase-core:16.0.3' //this decides your firebase SDK version
implementation 'com.google.firebase:firebase-messaging:17.1.0'
implementation project(':react-native-keychain')
- implementation project(':instabug-reactnative')
compile 'com.github.status-im:function:0.0.1'
implementation fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6b90d26d3b..1209366318 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -21,8 +21,6 @@
-
-
diff --git a/android/app/src/main/java/im/status/ethereum/MainActivity.java b/android/app/src/main/java/im/status/ethereum/MainActivity.java
index 3193c4b6b3..43e1796219 100644
--- a/android/app/src/main/java/im/status/ethereum/MainActivity.java
+++ b/android/app/src/main/java/im/status/ethereum/MainActivity.java
@@ -23,7 +23,6 @@ import android.os.Bundle;
import com.facebook.react.ReactActivity;
import com.facebook.react.modules.core.PermissionListener;
import org.devio.rn.splashscreen.SplashScreen;
-import com.instabug.library.Instabug;
import java.util.Properties;
import im.status.ethereum.module.StatusThreadPoolExecutor;
@@ -115,8 +114,6 @@ public class MainActivity extends ReactActivity
SplashScreen.show(this, true);
super.onCreate(savedInstanceState);
- Instabug.setIntroMessageEnabled(false);
-
if (!shouldShowRootedNotification()) {
configureStatus();
} else {
diff --git a/android/app/src/main/java/im/status/ethereum/MainApplication.java b/android/app/src/main/java/im/status/ethereum/MainApplication.java
index b934a3c80e..8ef2e240ea 100644
--- a/android/app/src/main/java/im/status/ethereum/MainApplication.java
+++ b/android/app/src/main/java/im/status/ethereum/MainApplication.java
@@ -9,7 +9,6 @@ import io.invertase.firebase.RNFirebasePackage;
import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
-import com.instabug.reactlibrary.RNInstabugReactnativePackage;
import com.ocetnik.timer.BackgroundTimerPackage;
import com.horcrux.svg.SvgPackage;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
@@ -76,14 +75,7 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
new PickerPackage(),
new WebViewBridgePackage(webViewDebugEnabled, callRPC),
new ReactNativeConfigPackage(),
- new KeychainPackage(),
- new RNInstabugReactnativePackage.Builder(BuildConfig.INSTABUG_TOKEN,MainApplication.this)
- .setInvocationEvent("shake")
- .setPrimaryColor("#1D82DC")
- .setFloatingEdge("left")
- .setFloatingButtonOffsetFromTop(250)
- .build()
- ));
+ new KeychainPackage()));
return packages;
}
diff --git a/android/settings.gradle b/android/settings.gradle
index cdd0146f3d..49411df87c 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -5,8 +5,6 @@ include ':react-native-firebase'
project(':react-native-firebase').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-firebase/android')
include ':react-native-securerandom'
project(':react-native-securerandom').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-securerandom/android')
-include ':instabug-reactnative'
-project(':instabug-reactnative').projectDir = new File(rootProject.projectDir, '../node_modules/instabug-reactnative/android')
include ':react-native-background-timer'
project(':react-native-background-timer').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-background-timer/android')
include ':react-native-svg'
@@ -14,8 +12,6 @@ project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../n
include ':app'
include ':react-native-http-bridge'
project(':react-native-http-bridge').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-http-bridge/android')
-include ':instabug-reactnative'
-project(':instabug-reactnative').projectDir = new File(rootProject.projectDir, '../node_modules/instabug-reactnative/android')
include ':react-native-splash-screen'
project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
include ':react-native-image-resizer'
diff --git a/clj-rn.conf.edn b/clj-rn.conf.edn
index 2c3b8b1b3a..7fe90e0a5c 100644
--- a/clj-rn.conf.edn
+++ b/clj-rn.conf.edn
@@ -24,7 +24,6 @@
"web3"
"web3-utils"
"chance"
- "instabug-reactnative"
"react-native-http-bridge"
"emojilib"
"eth-phishing-detect"
diff --git a/desktop_files/.re-natal b/desktop_files/.re-natal
index 726532df98..3bdefe44e2 100644
--- a/desktop_files/.re-natal
+++ b/desktop_files/.re-natal
@@ -7,7 +7,6 @@
"modules": [
"react-native-image-resizer",
"react-native-camera",
- "instabug-reactnative",
"nfc-react-native",
"react-native-background-timer"
]
@@ -17,7 +16,6 @@
"modules": [
"react-native-image-resizer",
"react-native-camera",
- "instabug-reactnative",
"nfc-react-native",
"react-native-background-timer"
]
diff --git a/desktop_files/package-lock.json b/desktop_files/package-lock.json
index e6eadeab64..096eb5498d 100644
--- a/desktop_files/package-lock.json
+++ b/desktop_files/package-lock.json
@@ -7146,11 +7146,6 @@
}
}
},
- "instabug-reactnative": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/instabug-reactnative/-/instabug-reactnative-2.12.0.tgz",
- "integrity": "sha512-aD2JLofdXfZWvlcg3t3lEoUM+HN7qLaKry68Ypjuh+cFGCXtblbKz4ozEfEFBw4rvEm31s8BSd1e/aFiHPXBmQ=="
- },
"invariant": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
diff --git a/desktop_files/package.json b/desktop_files/package.json
index a11bbdfa11..19e032648d 100644
--- a/desktop_files/package.json
+++ b/desktop_files/package.json
@@ -44,7 +44,6 @@
"google-breakpad": "git+https://github.com/status-im/google-breakpad.git",
"homoglyph-finder": "1.1.1",
"identicon.js": "github:status-im/identicon.js",
- "instabug-reactnative": "2.12.0",
"js-sha3": "^0.8.0",
"level-filesystem": "1.2.0",
"metro": "^0.38.1",
diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj
index 2f3e25c605..b20954165e 100644
--- a/ios/StatusIm.xcodeproj/project.pbxproj
+++ b/ios/StatusIm.xcodeproj/project.pbxproj
@@ -27,17 +27,13 @@
213311F38CA74CE280FD09AD /* libRNI18n.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52F6ED6465184513A082652B /* libRNI18n.a */; };
22118DE1207A419FBFE7B62D /* libRealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CD48A32459B64E96843BB238 /* libRealmReact.a */; };
25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
- 3A8BF31C42291E324219071C /* InstabugCore.framework in Embed Instabug Framework */ = {isa = PBXBuildFile; fileRef = EA36FD18BC2ECACF0A8B83DE /* InstabugCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3E15DFEC1F6F4D7CAE088F49 /* libTcpSockets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C2A4E93F6B154AEFA3485B45 /* libTcpSockets.a */; };
475D202F20B7450D00879A77 /* libRNFirebase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 475D1FC020B7413500879A77 /* libRNFirebase.a */; };
4C16DE0C1F89508700AA10DB /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */; };
- 4CA4DA1B206D105D006A98B0 /* libRNInstabug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E3F1C121DDAE781005E4779 /* libRNInstabug.a */; };
- 63AE4174241B852A045FAE1F /* InstabugCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA36FD18BC2ECACF0A8B83DE /* InstabugCore.framework */; };
74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
81C6E6AE0AA739BE9D87C1D0 /* libPods-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FC1CBCFE6C906043D6CCEEE1 /* libPods-StatusImTests.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
8E55E6877F950B81C8D711C5 /* libPods-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 101A4045637A2ADF57D28EF5 /* libPods-StatusIm.a */; };
- 91446A820DA5E1C15C24D2A7 /* Instabug.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D72275B7ADF9FC3304DCE5 /* Instabug.framework */; };
925C1F4C1F7B73B20063DFA0 /* nanopb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 925C1F451F7B73B20063DFA0 /* nanopb.framework */; };
92A0DF7D1F4DE3A4002051BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 92A0DF491F4DE3A0002051BC /* GoogleService-Info.plist */; };
983F077E2119C9D2004133ED /* message.wav in Resources */ = {isa = PBXBuildFile; fileRef = 983F07442119C9D2004133ED /* message.wav */; };
@@ -55,7 +51,6 @@
BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; };
C93242561FE1C68C00FE7099 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C93242531FE1C68C00FE7099 /* libRCTAnimation.a */; };
CE4E31B31D8695250033ED64 /* Statusgo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.framework */; };
- DA0D1ABA19458751CC2840C3 /* Instabug.framework in Embed Instabug Framework */ = {isa = PBXBuildFile; fileRef = 22D72275B7ADF9FC3304DCE5 /* Instabug.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E0AD9E8F495A4907B65104BF /* libRCTImageResizer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BEE3436791D42248F853999 /* libRCTImageResizer.a */; };
FD4F213C3873473CB703B1D2 /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674B3D9595A047AB8D518F4E /* libRNFS.a */; };
/* End PBXBuildFile section */
@@ -264,13 +259,6 @@
remoteGlobalIDString = 2D2A28881D9B049200D4039D;
remoteInfo = "RCTWebSocket-tvOS";
};
- 9E3F1C111DDAE781005E4779 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = F3548417D8DA4362B6796A54 /* RNInstabug.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 24DF11ED1DA3A2B90056F77C;
- remoteInfo = RNInstabug;
- };
9EC013781E06FB1900155B5C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */;
@@ -482,18 +470,6 @@
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
- C5A3444E637B7B715148AD1B /* Embed Instabug Framework */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 10;
- files = (
- DA0D1ABA19458751CC2840C3 /* Instabug.framework in Embed Instabug Framework */,
- 3A8BF31C42291E324219071C /* InstabugCore.framework in Embed Instabug Framework */,
- );
- name = "Embed Instabug Framework";
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
@@ -529,7 +505,6 @@
20A5C96E1D92716C002C4965 /* QBImagePicker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QBImagePicker.framework; path = "../node_modules/react-native-image-crop-picker/ios/QBImagePicker/build/Debug-iphoneos/QBImagePicker.framework"; sourceTree = ""; };
20B6B6831D92C42600CC5C6A /* RSKImageCropper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RSKImageCropper.framework; sourceTree = BUILT_PRODUCTS_DIR; };
20B6B6861D92C42600CC5C6A /* QBImagePicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = QBImagePicker.framework; sourceTree = BUILT_PRODUCTS_DIR; };
- 22D72275B7ADF9FC3304DCE5 /* Instabug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Instabug.framework; path = "../node_modules/instabug-reactnative/ios/Instabug.framework"; sourceTree = ""; };
2BEE3436791D42248F853999 /* libRCTImageResizer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTImageResizer.a; sourceTree = ""; };
305F194186D848FDB07AF34C /* RNFS.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFS.xcodeproj; path = "../node_modules/react-native-fs/RNFS.xcodeproj"; sourceTree = ""; };
38A44830EC5708E89387F641 /* Pods-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm.release.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm/Pods-StatusIm.release.xcconfig"; sourceTree = ""; };
@@ -542,7 +517,6 @@
475D1FCE20B7415300879A77 /* libFirebaseMessaging.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libFirebaseMessaging.a; sourceTree = BUILT_PRODUCTS_DIR; };
4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
- 4EC426A98043452BB6F9C134 /* libRNInstabug.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNInstabug.a; sourceTree = ""; };
52F6ED6465184513A082652B /* libRNI18n.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNI18n.a; sourceTree = ""; };
5535217F57E44D77AA9CF083 /* libRCTOrientation.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRCTOrientation.a; sourceTree = ""; };
5E5A7625B76441D984EA8C0D /* RCTImageResizer.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTImageResizer.xcodeproj; path = "../node_modules/react-native-image-resizer/ios/RCTImageResizer.xcodeproj"; sourceTree = ""; };
@@ -583,9 +557,7 @@
CE4E31B21D8695250033ED64 /* Statusgo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Statusgo.framework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.framework"; sourceTree = ""; };
D489EE8D5F52DA10AC715727 /* Pods-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusImTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-StatusImTests/Pods-StatusImTests.release.xcconfig"; sourceTree = ""; };
DF1CD4C3D1254774ACCAE4E8 /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = ""; };
- EA36FD18BC2ECACF0A8B83DE /* InstabugCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InstabugCore.framework; path = "../node_modules/instabug-reactnative/ios/InstabugCore.framework"; sourceTree = ""; };
F090E261B9854867A728CE4F /* RealmReact.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RealmReact.xcodeproj; path = "../node_modules/realm/react-native/ios/RealmReact.xcodeproj"; sourceTree = ""; };
- F3548417D8DA4362B6796A54 /* RNInstabug.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNInstabug.xcodeproj; path = "../node_modules/instabug-reactnative/ios/RNInstabug.xcodeproj"; sourceTree = ""; };
F9238D6B1E5F055900C047B9 /* SF-UI-Text-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-UI-Text-Semibold.otf"; sourceTree = ""; };
FC1CBCFE6C906043D6CCEEE1 /* libPods-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -604,7 +576,6 @@
buildActionMask = 2147483647;
files = (
475D202F20B7450D00879A77 /* libRNFirebase.a in Frameworks */,
- 4CA4DA1B206D105D006A98B0 /* libRNInstabug.a in Frameworks */,
C93242561FE1C68C00FE7099 /* libRCTAnimation.a in Frameworks */,
4C16DE0C1F89508700AA10DB /* JavaScriptCore.framework in Frameworks */,
B2DEA0D01E49E33300FA28D6 /* libRCTHttpServer.a in Frameworks */,
@@ -639,8 +610,6 @@
8E55E6877F950B81C8D711C5 /* libPods-StatusIm.a in Frameworks */,
9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */,
B957A49EB0DE44D9A31CAF2D /* libRNSVG.a in Frameworks */,
- 91446A820DA5E1C15C24D2A7 /* Instabug.framework in Frameworks */,
- 63AE4174241B852A045FAE1F /* InstabugCore.framework in Frameworks */,
AB96C730942E49178F59AE6F /* libRNSecureRandom.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -905,7 +874,6 @@
38E1A2C8D0734EE99E2B16CE /* TcpSockets.xcodeproj */,
439B6B4B407A4E2AACAFE5BE /* RCTStatus.xcodeproj */,
5E5A7625B76441D984EA8C0D /* RCTImageResizer.xcodeproj */,
- F3548417D8DA4362B6796A54 /* RNInstabug.xcodeproj */,
1E74DC52A1E449A2BA858B14 /* RNSVG.xcodeproj */,
AF409BB755B94FB1BBA01927 /* RNSecureRandom.xcodeproj */,
);
@@ -967,14 +935,6 @@
name = Products;
sourceTree = "";
};
- 9E3F1BE31DDAE781005E4779 /* Products */ = {
- isa = PBXGroup;
- children = (
- 9E3F1C121DDAE781005E4779 /* libRNInstabug.a */,
- );
- name = Products;
- sourceTree = "";
- };
9EC0135D1E06FB1900155B5C /* Products */ = {
isa = PBXGroup;
children = (
@@ -1012,8 +972,6 @@
4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
101A4045637A2ADF57D28EF5 /* libPods-StatusIm.a */,
FC1CBCFE6C906043D6CCEEE1 /* libPods-StatusImTests.a */,
- 22D72275B7ADF9FC3304DCE5 /* Instabug.framework */,
- EA36FD18BC2ECACF0A8B83DE /* InstabugCore.framework */,
);
name = Frameworks;
sourceTree = "";
@@ -1064,7 +1022,6 @@
CD48A32459B64E96843BB238 /* libRealmReact.a */,
C2A4E93F6B154AEFA3485B45 /* libTcpSockets.a */,
2BEE3436791D42248F853999 /* libRCTImageResizer.a */,
- 4EC426A98043452BB6F9C134 /* libRNInstabug.a */,
AF2BF381BC7B4EB0887F0091 /* libRNSVG.a */,
7F752F17B1E04216B1337A72 /* libRNFIRMessaging.a */,
1464A9A9E12F45068947C28F /* libRNSecureRandom.a */,
@@ -1114,7 +1071,6 @@
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
E3914A731DF919ED00EBB515 /* Run Script */,
- C5A3444E637B7B715148AD1B /* Embed Instabug Framework */,
D286FF71BA61530E740B7C82 /* Strip Frameworks */,
);
buildRules = (
@@ -1132,7 +1088,7 @@
83CBB9F71A601CBA00E9B192 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 830;
+ LastUpgradeCheck = 0940;
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
00E356ED1AD99517003FC87E = {
@@ -1265,10 +1221,6 @@
ProductGroup = 20B7D1041D3F74CD00B70F14 /* Products */;
ProjectRef = 46E2F6052EB44C698C680894 /* RNI18n.xcodeproj */;
},
- {
- ProductGroup = 9E3F1BE31DDAE781005E4779 /* Products */;
- ProjectRef = F3548417D8DA4362B6796A54 /* RNInstabug.xcodeproj */;
- },
{
ProductGroup = 475D1EEE20B73EE000879A77 /* Products */;
ProjectRef = AF409BB755B94FB1BBA01927 /* RNSecureRandom.xcodeproj */;
@@ -1491,13 +1443,6 @@
remoteRef = 9E3F1C051DDAE781005E4779 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 9E3F1C121DDAE781005E4779 /* libRNInstabug.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libRNInstabug.a;
- remoteRef = 9E3F1C111DDAE781005E4779 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
9EC013791E06FB1900155B5C /* libRCTWKWebView.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
@@ -1767,20 +1712,6 @@
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
};
- D286FF71BA61530E740B7C82 /* Strip Frameworks */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "Strip Frameworks";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "bash \"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/InstabugCore.framework/strip-frameworks.sh\"\n";
- };
E3914A731DF919ED00EBB515 /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
@@ -1943,7 +1874,6 @@
"$(inherited)",
"$(PROJECT_DIR)/Pods/**",
"$(PROJECT_DIR)",
- "../node_modules/instabug-reactnative/ios",
);
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
@@ -1961,7 +1891,6 @@
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
- "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug",
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios",
"$(SRCROOT)/../node_modules/react-native-config/ios/**",
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
@@ -2010,7 +1939,6 @@
"$(inherited)",
"$(PROJECT_DIR)/Pods/**",
"$(PROJECT_DIR)",
- "../node_modules/instabug-reactnative/ios",
);
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
@@ -2028,7 +1956,6 @@
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
- "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug",
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios",
"$(SRCROOT)/../node_modules/react-native-config/ios/**",
"$(SRCROOT)/../node_modules/react-native-svg/ios/**",
@@ -2067,14 +1994,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2118,7 +2053,6 @@
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
- "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug",
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2136,14 +2070,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -2180,7 +2122,6 @@
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
- "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug",
"$(SRCROOT)/../node_modules/react-native-splash-screen/ios/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
diff --git a/ios/StatusIm/Info.plist b/ios/StatusIm/Info.plist
index 61dba06d48..0907cfe531 100644
--- a/ios/StatusIm/Info.plist
+++ b/ios/StatusIm/Info.plist
@@ -60,15 +60,13 @@
NSCameraUsageDescription
- Camera access is required to be able to scan QR codes.
+ Please allow Status to use your phone camera
NSContactsUsageDescription
We need to access your contacts
NSLocationAlwaysUsageDescription
Location access is required for some DApps to function properly.
NSLocationWhenInUseUsageDescription
Location access is required for some DApps to function properly.
- NSMicrophoneUsageDescription
- Microphone access is required for Instabug and Audio Messages
NSPhotoLibraryUsageDescription
Photos access it required to give you ability to choose custom profile pictures.
UIBackgroundModes
@@ -97,10 +95,8 @@
UIViewControllerBasedStatusBarAppearance
ITSAppUsesNonExemptEncryption
-
+
ITSEncryptionExportComplianceCode
1aa92c4d-6194-4d7d-b70a-16b48256b87e
- NSCameraUsageDescription
- Please allow Status to use your phone camera
diff --git a/mobile_files/package-lock.json b/mobile_files/package-lock.json
index 9fe8f126be..c035746c4f 100644
--- a/mobile_files/package-lock.json
+++ b/mobile_files/package-lock.json
@@ -5713,11 +5713,6 @@
}
}
},
- "instabug-reactnative": {
- "version": "2.12.0",
- "resolved": "https://registry.npmjs.org/instabug-reactnative/-/instabug-reactnative-2.12.0.tgz",
- "integrity": "sha512-aD2JLofdXfZWvlcg3t3lEoUM+HN7qLaKry68Ypjuh+cFGCXtblbKz4ozEfEFBw4rvEm31s8BSd1e/aFiHPXBmQ=="
- },
"invariant": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
diff --git a/mobile_files/package.json b/mobile_files/package.json
index a2ea862bf6..fc12437a17 100644
--- a/mobile_files/package.json
+++ b/mobile_files/package.json
@@ -25,7 +25,6 @@
"events": "1.1.1",
"homoglyph-finder": "1.1.1",
"identicon.js": "https://github.com/status-im/identicon.js.git",
- "instabug-reactnative": "2.12.0",
"js-sha3": "^0.8.0",
"level-filesystem": "1.2.0",
"process": "0.11.10",
diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle
index ec0d695973..09baae7a07 100644
--- a/modules/react-native-status/android/build.gradle
+++ b/modules/react-native-status/android/build.gradle
@@ -18,7 +18,6 @@ android {
dependencies {
implementation 'com.facebook.react:react-native:+'
- implementation 'com.instabug.library:instabug:3+'
compile 'com.github.status-im:function:0.0.1'
// WARNING: If you change this, make sure the GitHub release of the .aar exists.
diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
index d050d84e0f..1d896a78e7 100644
--- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
+++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
@@ -30,7 +30,6 @@ import java.util.concurrent.Executors;
import org.json.JSONObject;
import org.json.JSONException;
-import com.instabug.library.Instabug;
import javax.annotation.Nullable;
@@ -133,12 +132,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
logFile.setWritable(true);
Log.d(TAG, "Can write " + logFile.canWrite());
Uri gethLogUri = Uri.fromFile(logFile);
- try {
- Log.d(TAG, "Attach to geth.log to instabug " + gethLogUri.getPath());
- Instabug.setFileAttachment(gethLogUri, gethLogFileName);
- } catch (NullPointerException e) {
- Log.d(TAG, "Instabug is not initialized!");
- }
String gethLogFilePath = logFile.getAbsolutePath();
Log.d(TAG, gethLogFilePath);
diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj b/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj
index b5088210cd..7b8f2a9a00 100644
--- a/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj
+++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
206C9F3E1D474E910063E3E6 /* RCTStatus.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 206C9F3D1D474E910063E3E6 /* RCTStatus.h */; };
206C9F401D474E910063E3E6 /* RCTStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 206C9F3F1D474E910063E3E6 /* RCTStatus.m */; };
- 9806BE77206D044D00548CC4 /* Instabug.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9806BE76206D044D00548CC4 /* Instabug.framework */; };
CE4E31B11D86951A0033ED64 /* Statusgo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B01D86951A0033ED64 /* Statusgo.framework */; };
/* End PBXBuildFile section */
@@ -31,7 +30,6 @@
206C9F3A1D474E910063E3E6 /* libRCTStatus.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTStatus.a; sourceTree = BUILT_PRODUCTS_DIR; };
206C9F3D1D474E910063E3E6 /* RCTStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTStatus.h; sourceTree = ""; };
206C9F3F1D474E910063E3E6 /* RCTStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTStatus.m; sourceTree = ""; };
- 9806BE76206D044D00548CC4 /* Instabug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Instabug.framework; path = "../../../../node_modules/instabug-reactnative/ios/Instabug.framework"; sourceTree = ""; };
CE4E31B01D86951A0033ED64 /* Statusgo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Statusgo.framework; sourceTree = ""; };
/* End PBXFileReference section */
@@ -41,7 +39,6 @@
buildActionMask = 2147483647;
files = (
CE4E31B11D86951A0033ED64 /* Statusgo.framework in Frameworks */,
- 9806BE77206D044D00548CC4 /* Instabug.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -75,14 +72,6 @@
name = Status;
sourceTree = "";
};
- 9E3F8AF11ED2CCBD0016D874 /* Frameworks */ = {
- isa = PBXGroup;
- children = (
- 9806BE76206D044D00548CC4 /* Instabug.framework */,
- );
- name = Frameworks;
- sourceTree = "";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -238,7 +227,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
- "$(PROJECT_DIR)/../../../../ios/Pods/Instabug",
);
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = (
@@ -267,7 +255,6 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
- "$(PROJECT_DIR)/../../../../ios/Pods/Instabug",
);
FRAMEWORK_VERSION = A;
HEADER_SEARCH_PATHS = (
diff --git a/react-native/src/desktop/status_im/react_native/js_dependencies.cljs b/react-native/src/desktop/status_im/react_native/js_dependencies.cljs
index 86fb88c005..1b43ff21d5 100644
--- a/react-native/src/desktop/status_im/react_native/js_dependencies.cljs
+++ b/react-native/src/desktop/status_im/react_native/js_dependencies.cljs
@@ -21,7 +21,6 @@
(def dismiss-keyboard #js {})
(def image-crop-picker #js {})
(def image-resizer #js {})
-(def instabug #js {:IBGLog ( fn [])})
(def nfc #js {})
(def svg #js {})
(def snoopy #js {})
diff --git a/react-native/src/mobile/status_im/react_native/js_dependencies.cljs b/react-native/src/mobile/status_im/react_native/js_dependencies.cljs
index ec2055e95e..a01bb90b5f 100644
--- a/react-native/src/mobile/status_im/react_native/js_dependencies.cljs
+++ b/react-native/src/mobile/status_im/react_native/js_dependencies.cljs
@@ -17,7 +17,6 @@
(def dismiss-keyboard (js/require "dismissKeyboard"))
(def image-crop-picker (js/require "react-native-image-crop-picker"))
(def image-resizer (js/require "react-native-image-resizer"))
-(def instabug (js/require "instabug-reactnative"))
(def svg (js/require "react-native-svg"))
(def react-native-firebase (js/require "react-native-firebase"))
(def nfc-manager (js/require "react-native-nfc-manager"))
diff --git a/src/status_im/browser/core.cljs b/src/status_im/browser/core.cljs
index c58a3751a9..b22bbd6f23 100644
--- a/src/status_im/browser/core.cljs
+++ b/src/status_im/browser/core.cljs
@@ -311,7 +311,7 @@
(fx/defn open-chat-from-browser
[cofx host]
(let [topic (string/lower-case (apply str (map filter-letters-numbers-and-replace-dot-on-dash host)))]
- {:dispatch [:chat.ui/start-public-chat topic true]}))
+ {:dispatch [:chat.ui/start-public-chat topic {:modal? true :navigation-reset? true}]}))
(re-frame/reg-fx
:browser/resolve-ens-multihash
diff --git a/src/status_im/chat/models.cljs b/src/status_im/chat/models.cljs
index 87ec85f00f..0c354d85ec 100644
--- a/src/status_im/chat/models.cljs
+++ b/src/status_im/chat/models.cljs
@@ -197,11 +197,10 @@
(fx/defn start-public-chat
"Starts a new public chat"
- [cofx topic modal?]
+ [cofx topic opts]
(fx/merge cofx
(add-public-chat topic)
- (navigate-to-chat topic {:modal? modal?
- :navigation-reset? true})
+ (navigate-to-chat topic opts)
(public-chat/join-public-chat topic)
(when platform/desktop?
(desktop.events/change-tab :home))))
diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs
index ba19531a0b..95d1370b54 100644
--- a/src/status_im/events.cljs
+++ b/src/status_im/events.cljs
@@ -555,8 +555,8 @@
(handlers/register-handler-fx
:chat.ui/start-public-chat
- (fn [cofx [_ topic modal?]]
- (chat/start-public-chat cofx topic modal?)))
+ (fn [cofx [_ topic opts]]
+ (chat/start-public-chat cofx topic opts)))
(handlers/register-handler-fx
:chat.ui/remove-chat
diff --git a/src/status_im/ios/core.cljs b/src/status_im/ios/core.cljs
index 4df0d11de0..4d800c19c3 100644
--- a/src/status_im/ios/core.cljs
+++ b/src/status_im/ios/core.cljs
@@ -10,7 +10,6 @@
[status-im.ui.components.react :as react]
[status-im.notifications.core :as notifications]
[status-im.core :as core]
- [status-im.utils.instabug :as instabug]
[status-im.utils.snoopy :as snoopy]))
(defn app-state-change-handler [state]
@@ -46,5 +45,4 @@
(defn init []
(core/init app-root)
- (snoopy/subscribe!)
- (instabug/init))
+ (snoopy/subscribe!))
diff --git a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs
index f01bdd3930..84763ba089 100644
--- a/src/status_im/ui/screens/add_new/new_public_chat/view.cljs
+++ b/src/status_im/ui/screens/add_new/new_public_chat/view.cljs
@@ -27,7 +27,7 @@
{:container styles/input-container
:on-change-text #(re-frame/dispatch [:set :public-group-topic %])
:on-submit-editing #(when (db/valid-topic? topic)
- (re-frame/dispatch [:chat.ui/start-public-chat topic]))
+ (re-frame/dispatch [:chat.ui/start-public-chat topic {:navigation-reset? true}]))
:auto-capitalize :none
:auto-focus false
:accessibility-label :chat-name-input
@@ -44,7 +44,9 @@
(first topic)]])
(defn- render-topic [topic]
- [react/touchable-highlight {:on-press #(re-frame/dispatch [:chat.ui/start-public-chat topic])
+ [react/touchable-highlight {:on-press #(re-frame/dispatch [:chat.ui/start-public-chat
+ topic
+ {:navigation-reset? true}])
:accessibility-label :chat-item}
[react/view
[list/item
diff --git a/src/status_im/ui/screens/desktop/main/add_new/views.cljs b/src/status_im/ui/screens/desktop/main/add_new/views.cljs
index 3cc3809e8a..1f737eca5e 100644
--- a/src/status_im/ui/screens/desktop/main/add_new/views.cljs
+++ b/src/status_im/ui/screens/desktop/main/add_new/views.cljs
@@ -105,7 +105,7 @@
show-error-tooltip? topic-error
create-public-chat #(when (public-chat.db/valid-topic? topic)
(re-frame/dispatch [:set :public-group-topic nil])
- (re-frame/dispatch [:chat.ui/start-public-chat topic]))]
+ (re-frame/dispatch [:chat.ui/start-public-chat topic {:navigation-reset? true}]))]
[react/view {:style styles/add-contact-edit-view}
[react/view {:flex 1
:style (styles/add-pub-chat-input show-error-tooltip?)}
diff --git a/src/status_im/ui/screens/desktop/main/chat/views.cljs b/src/status_im/ui/screens/desktop/main/chat/views.cljs
index 628a3e7cb9..e59549d35a 100644
--- a/src/status_im/ui/screens/desktop/main/chat/views.cljs
+++ b/src/status_im/ui/screens/desktop/main/chat/views.cljs
@@ -129,7 +129,7 @@
[react/touchable-highlight {:style {}
:on-press #(case link-tag
:link (.openURL react/linking (http/normalize-url link))
- :tag (re-frame/dispatch [:chat.ui/start-public-chat (subs link 1)]))}
+ :tag (re-frame/dispatch [:chat.ui/start-public-chat (subs link 1) {:navigation-reset? true}]))}
[react/text {:style {:font-size 14
:text-decoration-line :underline
:color (if outgoing colors/white colors/blue)
diff --git a/src/status_im/ui/screens/help_center/views.cljs b/src/status_im/ui/screens/help_center/views.cljs
index 302da9bee6..7b35e3f998 100644
--- a/src/status_im/ui/screens/help_center/views.cljs
+++ b/src/status_im/ui/screens/help_center/views.cljs
@@ -1,12 +1,12 @@
(ns status-im.ui.screens.help-center.views
(:require-macros [status-im.utils.views :as views])
- (:require [status-im.i18n :as i18n]
+ (:require [re-frame.core :as re-frame]
+ [status-im.i18n :as i18n]
[status-im.ui.components.react :as react]
[status-im.ui.components.status-bar.view :as status-bar]
[status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.screens.help-center.styles :as styles]
- [status-im.ui.screens.profile.components.views :as profile.components]
- [status-im.utils.instabug :as instabug]))
+ [status-im.ui.screens.profile.components.views :as profile.components]))
(views/defview help-center []
[react/view styles/wrapper
@@ -20,10 +20,6 @@
:accessibility-label :faq-button
:action-fn #(.openURL react/linking "https://wiki.status.im/Questions_around_beta#firstHeading")}]
[profile.components/settings-item-separator]
- [profile.components/settings-item {:label-kw :t/submit-bug
+ [profile.components/settings-item {:label-kw :t/ask-in-status
:accessibility-label :submit-bug-button
- :action-fn #(instabug/submit-bug)}]
- [profile.components/settings-item-separator]
- [profile.components/settings-item {:label-kw :t/request-feature
- :accessibility-label :request-feature-button
- :action-fn #(instabug/request-feature)}]]]])
+ :action-fn #(re-frame/dispatch [:chat.ui/start-public-chat "status" {:navigation-reset? false}])}]]]])
diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs
index 6242b75e6a..4e82b25721 100644
--- a/src/status_im/utils/config.cljs
+++ b/src/status_im/utils/config.cljs
@@ -37,7 +37,6 @@
string/upper-case))
(def fleet (get-config :FLEET "eth.beta"))
(def default-network (get-config :DEFAULT_NETWORK))
-(def instabug-token (get-config :INSTABUG_TOKEN))
(def pow-target (js/parseFloat (get-config :POW_TARGET "0.002")))
(def pow-time (js/parseInt (get-config :POW_TIME "1")))
(def use-sym-key (enabled? (get-config :USE_SYM_KEY 0)))
diff --git a/src/status_im/utils/handlers.cljs b/src/status_im/utils/handlers.cljs
index 5fe9fa6183..5f1d8fd814 100644
--- a/src/status_im/utils/handlers.cljs
+++ b/src/status_im/utils/handlers.cljs
@@ -3,7 +3,6 @@
[clojure.string :as string]
[re-frame.core :refer [reg-event-db reg-event-fx] :as re-frame]
[re-frame.interceptor :refer [->interceptor get-coeffect get-effect]]
- [status-im.utils.instabug :as instabug]
[status-im.accounts.db :as accounts.db]
[cljs.core.async :as async]
[taoensso.timbre :as log]))
diff --git a/src/status_im/utils/instabug.cljs b/src/status_im/utils/instabug.cljs
deleted file mode 100644
index 03fcb2d53e..0000000000
--- a/src/status_im/utils/instabug.cljs
+++ /dev/null
@@ -1,45 +0,0 @@
-(ns status-im.utils.instabug
- (:require [taoensso.timbre :as log]
- [status-im.utils.config :as config]
- [status-im.react-native.js-dependencies :as rn-dependencies]))
-
-(def instabug rn-dependencies/instabug)
-
-(defn submit-bug []
- (.invokeWithInvocationMode
- instabug
- (.. instabug
- -invocationMode
- -newBug)))
-
-(defn request-feature []
- (.showFeatureRequests
- instabug))
-
-(defn- prepare-event-name [event {:keys [target]}]
- (str event " " target))
-
-(defn log [str]
- (if js/goog.DEBUG
- (log/debug str)
- (.IBGLog rn-dependencies/instabug str)))
-
-(defn instabug-appender []
- {:enabled? true
- :async? false
- :min-level nil
- :rate-limit nil
- :output-fn :inherit
-
- :fn (fn [data]
- (let [{:keys [level ?ns-str ?err output_]} data]
- (log (force output_))))})
-
-(when-not js/goog.DEBUG
- (log/merge-config! {:appenders {:instabug (instabug-appender)}}))
-
-(defn init []
- (.startWithToken rn-dependencies/instabug
- config/instabug-token
- (.. rn-dependencies/instabug -invocationEvent -shake))
- (.setIntroMessageEnabled rn-dependencies/instabug false))
diff --git a/src/status_im/utils/universal_links/core.cljs b/src/status_im/utils/universal_links/core.cljs
index af488328ca..961ec5eea4 100644
--- a/src/status_im/utils/universal_links/core.cljs
+++ b/src/status_im/utils/universal_links/core.cljs
@@ -59,7 +59,7 @@
(fx/defn handle-public-chat [cofx public-chat]
(log/info "universal-links: handling public chat " public-chat)
- (chat/start-public-chat cofx public-chat false))
+ (chat/start-public-chat cofx public-chat {:navigation-reset? true}))
(fx/defn handle-view-profile [{:keys [db] :as cofx} profile-id]
(log/info "universal-links: handling view profile" profile-id)
diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py
index 53fd002b41..7ef92a4427 100644
--- a/test/appium/tests/atomic/account_management/test_profile.py
+++ b/test/appium/tests/atomic/account_management/test_profile.py
@@ -176,16 +176,12 @@ class TestProfileSingleDevice(SingleDeviceTestCase):
sign_in_view.create_user()
profile_view = sign_in_view.profile_button.click()
profile_view.help_button.click()
- profile_view.request_feature_button.click()
- profile_view.find_full_text('Feature Requests')
- profile_view.click_system_back_button()
- profile_view.submit_bug_button.click()
- profile_view.find_full_text('Report a problem')
- profile_view.click_system_back_button()
- profile_view.discard_button.click()
base_web_view = profile_view.faq_button.click()
base_web_view.open_in_webview()
- profile_view.find_text_part('Questions around beta')
+ base_web_view.find_text_part('Questions around beta')
+ base_web_view.click_system_back_button()
+ profile_view.submit_bug_button.click()
+ profile_view.find_full_text('#status')
@marks.testrail_id(5382)
@marks.high
diff --git a/test/appium/views/profile_view.py b/test/appium/views/profile_view.py
index 6286289c48..216a99aab2 100644
--- a/test/appium/views/profile_view.py
+++ b/test/appium/views/profile_view.py
@@ -292,13 +292,6 @@ class HelpButton(BaseButton):
self.locator = self.Locator.accessibility_id("help-button")
-class RequestFeatureButton(BaseButton):
-
- def __init__(self, driver):
- super(RequestFeatureButton, self).__init__(driver)
- self.locator = self.Locator.accessibility_id("request-feature-button")
-
-
class SubmitBugButton(BaseButton):
def __init__(self, driver):
@@ -452,7 +445,6 @@ class ProfileView(BaseView):
self.capture_button = CaptureButton(self.driver)
self.help_button = HelpButton(self.driver)
- self.request_feature_button = RequestFeatureButton(self.driver)
self.submit_bug_button = SubmitBugButton(self.driver)
self.faq_button = FaqButton(self.driver)
diff --git a/test/cljs/status_im/react_native/js_dependencies.cljs b/test/cljs/status_im/react_native/js_dependencies.cljs
index bf95a74bff..3287796f7b 100644
--- a/test/cljs/status_im/react_native/js_dependencies.cljs
+++ b/test/cljs/status_im/react_native/js_dependencies.cljs
@@ -11,7 +11,6 @@
(def i18n #js {:locale "en"})
(def image-crop-picker #js {})
(def image-resizer #js {})
-(def instabug #js {})
(def linear-gradient #js {})
(def nfc #js {})
(def orientation #js {})
diff --git a/translations/en.json b/translations/en.json
index 90309fa410..28d1ba865f 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -12,6 +12,7 @@
"new-transaction": "New Transaction",
"currency-display-name-bbd": "Barbados Dollar",
"amount": "Amount",
+ "ask-in-status": "Ask a question or report a bug",
"open": "Open",
"name-placeholder": "Display name",
"find": "Find",