chore_: update status-go to reduce the interval for batch subscriptions in waku filter

android/app/src/main/AndroidManifest.xml

@@ -36,7 +36,6 @@
             android:allowBackup="false"
             android:label="@string/app_name"
             android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher_round"
             android:theme="@style/Theme.AppSplash"
             android:name=".MainApplication"
             android:largeHeap="true"

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_background"/>
     <foreground android:drawable="@mipmap/ic_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
-</adaptive-icon>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_background"/>
     <foreground android:drawable="@mipmap/ic_foreground"/>
-    <monochrome android:drawable="@mipmap/ic_launcher_monochrome" />
-</adaptive-icon>
+</adaptive-icon>

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.combined

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 import groovy.json.JsonBuilder
 

ci/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
   agent { label 'macos' }

ci/tools/Jenkinsfile.nix-cache

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
   agent { label 'linux' }

ci/tools/Jenkinsfile.xcode-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.8'
+library 'status-jenkins-lib@v1.9.4'
 
 pipeline {
   agent {

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

@@ -253,11 +253,6 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
         utils.executeRunnableStatusGoMethod({ Statusgo.initializeApplication(request) }, callback)
     }
 
-    @ReactMethod
-    private fun acceptTerms(callback: Callback) {
-        Log.d(TAG, "acceptTerms")
-        utils.executeRunnableStatusGoMethod({ Statusgo.acceptTerms() }, callback)
-    }
 
     @ReactMethod
     fun logout() {

modules/react-native-status/ios/RCTStatus/AccountManager.m

@@ -204,14 +204,6 @@ RCT_EXPORT_METHOD(initializeApplication:(NSString *)request
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(acceptTerms:(RCTResponseSenderBlock)callback) {
-#if DEBUG
-    NSLog(@"acceptTerms() method called");
-#endif
-    NSString *result = StatusgoAcceptTerms();
-    callback(@[result]);
-}
-
 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"OpenAccounts() method called");

modules/react-native-status/nodejs/status.cpp

@@ -761,26 +761,6 @@ void _Logout(const FunctionCallbackInfo<Value>& args) {
 
 }
 
-void _AcceptTerms(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-
-	if (args.Length() != 0) {
-		// Throw an Error that is passed back to JavaScript
-		isolate->ThrowException(Exception::TypeError(
-			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for AcceptTerms")));
-		return;
-	}
-
-	// Check the argument types
-
-	// Call exported Go function, which returns a C string
-	char *c = AcceptTerms();
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-}
-
 void _HashMessage(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -2018,7 +1998,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
 	NODE_SET_METHOD(exports, "initializeApplication", _InitializeApplication);
-	NODE_SET_METHOD(exports, "acceptTerms", _AcceptTerms);
 	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);

src/native_module/core.cljs

@@ -79,12 +79,6 @@
                           (types/clj->json request)
                           #(callback (types/json->clj %))))
 
-(defn accept-terms
-  ([]
-   (native-utils/promisify-native-module-call accept-terms))
-  ([callback]
-   (.acceptTerms ^js (account-manager) callback)))
-
 (defn prepare-dir-and-update-config
   [key-uid config callback]
   (log/debug "[native-module] prepare-dir-and-update-config")

src/quo/components/calendar/calendar/component_spec.cljs

@@ -4,7 +4,7 @@
     [quo.components.calendar.calendar.view :as calendar]
     [test-helpers.component :as h]))
 
-(def start-date (time/date-time (time/year (time/now)) (time/month (time/now)) 8))
+(def start-date (time/date-time (time/year (time/now)) (time/month (time/now)) 5))
 (def end-date (time/date-time (time/plus start-date (time/days 2))))
 
 (h/describe "calendar component"
@@ -23,7 +23,7 @@
         {:start-date nil
          :end-date   nil
          :on-change  on-change}])
-      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
       (h/was-called-with on-change {:start-date start-date :end-date nil})))
 
   (h/test "should call on-change with start and end date on second click"
@@ -31,7 +31,7 @@
       (h/render
        [calendar/view
         {:start-date start-date :end-date nil :on-change on-change}])
-      (h/fire-event :press (h/query-first-by-text (str (time/day end-date))))
+      (h/fire-event :press (h/query-by-text (str (time/day end-date))))
       (h/was-called-with on-change {:start-date start-date :end-date end-date})))
 
   (h/test "should reset the dates on third click"
@@ -41,7 +41,7 @@
         {:start-date start-date
          :end-date   end-date
          :on-change  on-change}])
-      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
       (h/was-called-with on-change {:start-date start-date :end-date nil})))
 
   (h/test "should reset dates when start date is clicked again"
@@ -51,7 +51,7 @@
         {:start-date start-date
          :end-date   nil
          :on-change  on-change}])
-      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
       (h/was-called-with on-change {:start-date nil :end-date nil})))
 
   (h/test "should assign start and end date correctly when upper range selected first"
@@ -61,5 +61,5 @@
         {:start-date end-date
          :end-date   nil
          :on-change  on-change}])
-      (h/fire-event :press (h/query-first-by-text (str (time/day start-date))))
+      (h/fire-event :press (h/query-by-text (str (time/day start-date))))
       (h/was-called-with on-change {:start-date start-date :end-date end-date}))))

src/status_im/common/metrics_confirmation_modal/style.cljs

@@ -4,7 +4,7 @@
   {:margin-top        11
    :margin-horizontal 20
    :gap               21
-   :margin-bottom     8})
+   :margin-bottom     15})
 
 (def item-text
   {:margin-top  10
@@ -12,9 +12,3 @@
 
 (def info-text
   {:margin-top -5})
-
-(def privacy-policy
-  {:margin-top        4
-   :margin-horizontal 20
-   :margin-bottom     20
-   :align-items       :center})

src/status_im/common/metrics_confirmation_modal/view.cljs

@@ -1,7 +1,6 @@
 (ns status-im.common.metrics-confirmation-modal.view
   (:require
     [quo.core :as quo]
-    [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
     [status-im.common.metrics-confirmation-modal.style :as style]
@@ -53,36 +52,14 @@
   (toggle-metrics false)
   (hide-bottom-sheet))
 
-(declare view)
-
 (defn- on-privacy-policy-press
-  [settings?]
+  []
   (rf/dispatch
    [:show-bottom-sheet
-    {:content  (fn []
-                 [quo.theme/provider :dark
-                  [privacy/privacy-statement]])
-     :on-close (fn []
-                 (rf/dispatch [:show-bottom-sheet
-                               {:content (fn []
-                                           [quo.theme/provider :dark
-                                            [view {:settings? settings?}]])
-                                :shell?  true}]))
-     :shell?   true}]))
-
-(defn- privacy-policy-text
-  [settings?]
-  [rn/view {:style style/privacy-policy}
-   [quo/text
-    [quo/text
-     {:style {:color colors/white-opa-50}
-      :size  :paragraph-2}
-     (i18n/label :t/more-details-in-privacy-policy-1)]
-    [quo/text
-     {:size     :paragraph-2
-      :weight   :bold
-      :on-press #(on-privacy-policy-press settings?)}
-     (i18n/label :t/more-details-in-privacy-policy-2)]]])
+    {:content (fn []
+                [quo.theme/provider :dark
+                 [privacy/privacy-statement]])
+     :shell?  true}]))
 
 (defn view
   [{:keys [settings?]}]
@@ -102,18 +79,22 @@
       [quo/text
        {:size  :paragraph-2
         :style style/info-text}
-       (i18n/label :t/usage-data-shared-from-all-profiles)]
+       (i18n/label :t/usage-data-shared-from-all-profiles)
+       (i18n/label :t/more-details-in-privacy-policy-1)
+       [quo/text
+        {:size     :paragraph-2
+         :weight   :bold
+         :on-press on-privacy-policy-press}
+        (i18n/label :t/more-details-in-privacy-policy-2)]]
       [quo/text
        {:size  :paragraph-2
         :style style/info-text}
-       (i18n/label :t/usage-data-shared-from-all-profiles)
        (i18n/label :t/sharing-usage-data-can-be-turned-off)])]
    [quo/bottom-actions
     {:actions          :two-actions
      :blur?            true
      :button-one-label (i18n/label :t/share-usage-data)
      :button-one-props {:on-press on-share-usage}
-     :button-two-label (i18n/label :t/not-now)
+     :button-two-label (i18n/label (if settings? :t/do-not-share :t/not-now))
      :button-two-props {:type     :grey
-                        :on-press on-do-not-share}}]
-   [privacy-policy-text settings?]])
+                        :on-press on-do-not-share}}]])