Merge branch 'develop' into bug/swap-bridge-improvements

Author: alwx

.env

@@ -38,3 +38,4 @@ FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
 SENTRY_ENABLED=0
 SENTRY_ENVIRONMENT=ci-main
+USE_PUBLIC_LOG_DIR=0

.env.e2e

@@ -42,3 +42,5 @@ MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0
 API_LOGGING_ENABLED=1
 SENTRY_ENABLED=0
 SENTRY_ENVIRONMENT=ci-main
+USE_PUBLIC_LOG_DIR=1
+VIEW_ID_TRACKER=1

.env.jenkins

@@ -39,3 +39,5 @@ FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
 SENTRY_ENABLED=0
 SENTRY_ENVIRONMENT=ci-main
+USE_PUBLIC_LOG_DIR=0
+VIEW_ID_TRACKER=1

.env.nightly

@@ -26,3 +26,4 @@ FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
 SENTRY_ENABLED=1
 SENTRY_ENVIRONMENT=ci-nightly
+USE_PUBLIC_LOG_DIR=0

.env.release

@@ -23,3 +23,4 @@ FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=0
 SENTRY_ENABLED=1
 SENTRY_ENVIRONMENT=production
+USE_PUBLIC_LOG_DIR=0

ios/Podfile

@@ -57,6 +57,8 @@ abstract_target 'Status' do
   pod 'react-native-config', :path => '../node_modules/react-native-config'
 
   pod 'SSZipArchive', '2.4.3'
+  # to fix [!] [!] CocoaPods could not find compatible versions for pod "libwebp"
+  pod 'libwebp', '1.0.0'
   # to fix [!] CocoaPods could not find compatible versions for pod "CryptoSwift"
   pod 'CryptoSwift', git: "https://github.com/krzyzanowskim/CryptoSwift", tag: '1.8.0'
   pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard"

ios/Podfile.lock

@@ -23,18 +23,33 @@ PODS:
     - secp256k1
     - SSZipArchive
   - libevent (2.1.12)
-  - libwebp (1.3.2):
-    - libwebp/demux (= 1.3.2)
-    - libwebp/mux (= 1.3.2)
-    - libwebp/sharpyuv (= 1.3.2)
-    - libwebp/webp (= 1.3.2)
-  - libwebp/demux (1.3.2):
+  - libwebp (1.0.0):
+    - libwebp/core (= 1.0.0)
+    - libwebp/dec (= 1.0.0)
+    - libwebp/demux (= 1.0.0)
+    - libwebp/dsp (= 1.0.0)
+    - libwebp/enc (= 1.0.0)
+    - libwebp/mux (= 1.0.0)
+    - libwebp/utils (= 1.0.0)
+    - libwebp/webp (= 1.0.0)
+  - libwebp/core (1.0.0):
     - libwebp/webp
-  - libwebp/mux (1.3.2):
-    - libwebp/demux
-  - libwebp/sharpyuv (1.3.2)
-  - libwebp/webp (1.3.2):
-    - libwebp/sharpyuv
+  - libwebp/dec (1.0.0):
+    - libwebp/core
+  - libwebp/demux (1.0.0):
+    - libwebp/core
+  - libwebp/dsp (1.0.0):
+    - libwebp/core
+  - libwebp/enc (1.0.0):
+    - libwebp/core
+  - libwebp/mux (1.0.0):
+    - libwebp/core
+  - libwebp/utils (1.0.0):
+    - libwebp/core
+  - libwebp/webp (1.0.0)
+  - MMKV (2.1.0):
+    - MMKVCore (~> 2.1.0)
+  - MMKVCore (2.1.1)
   - RCT-Folly (2022.05.16.00):
     - boost
     - DoubleConversion
@@ -936,6 +951,11 @@ PODS:
     - React
   - react-native-lottie-splash-screen (1.1.2):
     - React
+  - react-native-mmkv (2.12.2):
+    - glog
+    - MMKV (>= 1.3.3)
+    - RCT-Folly (= 2022.05.16.00)
+    - React-Core
   - react-native-netinfo (4.7.0):
     - React
   - react-native-orientation-locker (1.5.0):
@@ -1205,6 +1225,7 @@ DEPENDENCIES:
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
   - Keycard (from `https://github.com/status-im/Keycard.swift.git`, tag `3.1.1`)
   - libevent (~> 2.1.12)
+  - libwebp (= 1.0.0)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
@@ -1239,6 +1260,7 @@ DEPENDENCIES:
   - react-native-hole-view (from `../node_modules/react-native-hole-view`)
   - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
   - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
+  - react-native-mmkv (from `../node_modules/react-native-mmkv`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
   - react-native-pdf (from `../node_modules/react-native-pdf`)
@@ -1296,6 +1318,8 @@ SPEC REPOS:
     - HMSegmentedControl
     - libevent
     - libwebp
+    - MMKV
+    - MMKVCore
     - SDWebImage
     - SDWebImageWebPCoder
     - SocketRocket
@@ -1386,6 +1410,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-image-resizer"
   react-native-lottie-splash-screen:
     :path: "../node_modules/react-native-lottie-splash-screen"
+  react-native-mmkv:
+    :path: "../node_modules/react-native-mmkv"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
   react-native-orientation-locker:
@@ -1509,7 +1535,9 @@ SPEC CHECKSUMS:
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: 3bd24405b9a875b3b3cf1ab1be69b5c30c5f28bc
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
+  libwebp: d7e0c95fe97245c97e08101eba10702ebb0f6101
+  MMKV: ce484c1ac40bf76d5f09a0195d2ec5b3d3840d55
+  MMKVCore: 1eb661c6c498ab88e3df9ce5d8ff94d05fcc0567
   RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
   RCTRequired: 2544c0f1081a5fa12e108bb8cb40e5f4581ccd87
   RCTTypeSafety: 50efabe2b115c11ed03fbf3fd79e2f163ddb5d7c
@@ -1542,6 +1570,7 @@ SPEC CHECKSUMS:
   react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
   react-native-lottie-splash-screen: 4e1b1fd9d6633f9cd2106d6877eb5ba0147f3e2b
+  react-native-mmkv: 1fdc81aa70c1aba09370718e6a63a09cbbbac8d2
   react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
   react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
   react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c
@@ -1596,6 +1625,6 @@ SPEC CHECKSUMS:
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
   Yoga: a716eea57d0d3430219c0a5a233e1e93ee931eb7
 
-PODFILE CHECKSUM: 56d9f695324306d6db368d1172d211dfab55b7cb
+PODFILE CHECKSUM: 1a15018a9c864c8f0a1cdec9a6e195e1ab0b1d0d
 
 COCOAPODS: 1.15.2

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

@@ -120,14 +120,10 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
     @ReactMethod
     private fun initializeApplication(request: String, callback: Callback) {
         Log.d(TAG, "initializeApplication")
-        val jsonParams = JSONObject(request)
-        // for ios, the log dir will be the same as the root data dir, status-go will default to root data dir if logDir is not provided
-        jsonParams.put("logDir", utils.getLogDirectory()?.absolutePath)
-        val jsonString = jsonParams.toString()
         StatusBackendClient.executeStatusGoRequestWithCallback(
             "InitializeApplication",
-            jsonString,
-            { Statusgo.initializeApplication(jsonString) },
+            request,
+            { Statusgo.initializeApplication(request) },
             callback
         )
     }

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

@@ -95,14 +95,14 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
     }
 
     @ReactMethod
-    fun sendLogs(dbJson: String, jsLogs: String, callback: Callback) {
+    fun sendLogs(dbJson: String, jsLogs: String, usePublicLogDir: Boolean, callback: Callback) {
         Log.d(TAG, "sendLogs")
         if (!utils.checkAvailability()) {
             return
         }
 
         val context = reactApplicationContext
-        val logsTempDir = File(context.cacheDir, "logs") // This path needs to be in sync with android/app/src/main/res/xml/file_provider_paths.xml
+        val logsTempDir = File(context.cacheDir, Utils.LOGS_DIRECTORY_NAME) // This path needs to be in sync with android/app/src/main/res/xml/file_provider_paths.xml
         logsTempDir.mkdir()
 
         val dbFile = File(logsTempDir, "db.json")
@@ -135,7 +135,7 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
             val filesToZip = mutableListOf<File>(dbFile, statusLogFile)
 
             // Get all files from the log directory
-            val logDirectory = utils.getLogDirectory()
+            val logDirectory = utils.getLogDirectory(usePublicLogDir)
             if (logDirectory != null && logDirectory.exists()) {
                 val logFiles = logDirectory.listFiles()
                 if (logFiles != null) {
@@ -192,29 +192,52 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
-    fun logFileDirectory(): String? {
-        return utils.getLogDirectory()?.absolutePath
+    fun logFileDirectory(usePublicLogDir: Boolean): String? {
+        Log.d(TAG, "logFileDirectory: usePublicLogDir=$usePublicLogDir")
+        return utils.getLogDirectory(usePublicLogDir)?.absolutePath
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
-    fun setLogLevel(setLogLevelRequest: String): String {
-        Log.d(TAG, "setLogLevel: $setLogLevelRequest")
+    fun setProfileLogLevel(setProfileLogLevelRequest: String): String {
+        Log.d(TAG, "setProfileLogLevel: $setProfileLogLevelRequest")
 
         return StatusBackendClient.executeStatusGoRequestWithResult(
-            endpoint = "SetLogLevel",
-            requestBody = setLogLevelRequest,
-            statusgoFunction = { Statusgo.setLogLevel(setLogLevelRequest) }
+            endpoint = "SetProfileLogLevel",
+            requestBody = setProfileLogLevelRequest,
+            statusgoFunction = { Statusgo.setProfileLogLevel(setProfileLogLevelRequest) }
         )
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)
-    fun setLogEnabled(setLogEnabledRequest: String): String {
-        Log.d(TAG, "setLogEnabled: $setLogEnabledRequest")
+    fun setProfileLogEnabled(setProfileLogEnabledRequest: String): String {
+        Log.d(TAG, "setProfileLogEnabled: $setProfileLogEnabledRequest")
 
         return StatusBackendClient.executeStatusGoRequestWithResult(
             endpoint = "SetLogEnabled",
-            requestBody = setLogEnabledRequest,
-            statusgoFunction = { Statusgo.setLogEnabled(setLogEnabledRequest) }
+            requestBody = setProfileLogEnabledRequest,
+            statusgoFunction = { Statusgo.setProfileLogEnabled(setProfileLogEnabledRequest) }
+        )
+    }
+
+    @ReactMethod
+    fun setPreLoginLogLevel(setPreLoginLogLevelRequest: String) {
+        Log.d(TAG, "setPreLoginLogLevel: $setPreLoginLogLevelRequest")
+
+        StatusBackendClient.executeStatusGoRequest(
+            endpoint = "SetPreLoginLogLevel",
+            requestBody = setPreLoginLogLevelRequest,
+            statusgoFunction = { Statusgo.setPreLoginLogLevel(setPreLoginLogLevelRequest) }
+        )
+    }
+
+    @ReactMethod
+    fun setPreLoginLogEnabled(setPreLoginLogEnabledRequest: String) {
+        Log.d(TAG, "setPreLoginLogEnabled: $setPreLoginLogEnabledRequest")
+
+        StatusBackendClient.executeStatusGoRequest(
+            endpoint = "SetPreLoginLogEnabled",
+            requestBody = setPreLoginLogEnabledRequest,
+            statusgoFunction = { Statusgo.setPreLoginLogEnabled(setPreLoginLogEnabledRequest) }
         )
     }
 

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

@@ -18,6 +18,7 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
 
     companion object {
         private const val TAG = "Utils"
+        const val LOGS_DIRECTORY_NAME = "logs"
     }
 
     override fun getName(): String {
@@ -38,8 +39,22 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
         return getNoBackupDirectory()
     }
 
-    fun getLogDirectory(): File? {
-        return File(getNoBackupDirectory(), "logs")
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun getMMKVStoragePath(): String {
+        return pathCombine(reactContext.noBackupFilesDir.absolutePath, "/mmkv")
+    }
+
+    fun getLogDirectory(usePublicLogDir: Boolean): File? {
+        return if (usePublicLogDir) {
+            StatusBackendClient.getInstance()?.let { client ->
+                if (client.serverEnabled && client.rootDataDir != null) {
+                    return File(client.rootDataDir!!, LOGS_DIRECTORY_NAME)
+                }
+            }
+            reactContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+        } else {
+            File(getNoBackupDirectory(), LOGS_DIRECTORY_NAME)
+        }
     }
 
     fun getKeyUID(json: String): String {