feat: join community request with mvds

https://github.com/status-im/status-go/compare/83aa01c7...44c58ccd

android/app/src/main/AndroidManifest.xml

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

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

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

src/status_im/common/metrics_confirmation_modal/style.cljs

@@ -4,7 +4,7 @@
   {:margin-top        11
    :margin-horizontal 20
    :gap               21
-   :margin-bottom     15})
+   :margin-bottom     8})
 
 (def item-text
   {:margin-top  10
@@ -12,3 +12,9 @@
 
 (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,6 +1,7 @@
 (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]
@@ -52,14 +53,36 @@
   (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]])
-     :shell?  true}]))
+    {: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)]]])
 
 (defn view
   [{:keys [settings?]}]
@@ -79,22 +102,18 @@
       [quo/text
        {:size  :paragraph-2
         :style style/info-text}
-       (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)]]
+       (i18n/label :t/usage-data-shared-from-all-profiles)]
       [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 (if settings? :t/do-not-share :t/not-now))
+     :button-two-label (i18n/label :t/not-now)
      :button-two-props {:type     :grey
-                        :on-press on-do-not-share}}]])
+                        :on-press on-do-not-share}}]
+   [privacy-policy-text settings?]])

src/status_im/contexts/onboarding/intro/style.cljs

@@ -10,12 +10,13 @@
   {:flex           1
    :flex-direction :row
    :flex-wrap      :wrap
-   :align-self     :center})
+   :align-self     :flex-start})
 
 (def terms-privacy-container
-  {:gap                8
+  {:flex-direction     :row
    :padding-horizontal 20
-   :padding-vertical   8})
+   :padding-vertical   8
+   :gap                8})
 
 (def plain-text
   {:color colors/white-opa-70})

src/status_im/contexts/onboarding/intro/view.cljs

@@ -21,8 +21,7 @@
        :actions              :two-vertical-actions
        :description          :top
        :description-top-text [rn/view
-                              {:style          style/terms-privacy-container
-                               :flex-direction :row}
+                              {:style style/terms-privacy-container}
                               [rn/view
                                {:accessibility-label :terms-privacy-checkbox-container}
                                [quo/selectors
@@ -30,32 +29,31 @@
                                  :blur?     true
                                  :checked?  terms-accepted?
                                  :on-change #(set-terms-accepted? not)}]]
-                              [rn/view {:style {:flex 1}}
-                               [rn/view {:style style/text-container}
-                                [quo/text
-                                 {:style style/plain-text
-                                  :size  :paragraph-2}
-                                 (str (i18n/label :t/accept-status-tos-prefix) " ")]
-                                [quo/text
-                                 {:on-press #(rf/dispatch [:show-bottom-sheet
-                                                           {:content terms/terms-of-use
-                                                            :shell?  true}])
-                                  :style    style/highlighted-text
-                                  :size     :paragraph-2
-                                  :weight   :medium}
-                                 (i18n/label :t/terms-of-service)]
-                                [quo/text
-                                 {:style style/plain-text
-                                  :size  :paragraph-2}
-                                 " & "]
-                                [quo/text
-                                 {:on-press #(rf/dispatch [:show-bottom-sheet
-                                                           {:content privacy/privacy-statement
-                                                            :shell?  true}])
-                                  :style    style/highlighted-text
-                                  :size     :paragraph-2
-                                  :weight   :medium}
-                                 (i18n/label :t/intro-privacy-statement)]]]]
+                              [rn/view {:style style/text-container}
+                               [quo/text
+                                {:style style/plain-text
+                                 :size  :paragraph-2}
+                                (str (i18n/label :t/accept-status-tos-prefix) " ")]
+                               [quo/text
+                                {:on-press #(rf/dispatch [:show-bottom-sheet
+                                                          {:content terms/terms-of-use
+                                                           :shell?  true}])
+                                 :style    style/highlighted-text
+                                 :size     :paragraph-2
+                                 :weight   :medium}
+                                (i18n/label :t/terms-of-service)]
+                               [quo/text
+                                {:style style/plain-text
+                                 :size  :paragraph-2}
+                                " " (i18n/label :t/and) " "]
+                               [quo/text
+                                {:on-press #(rf/dispatch [:show-bottom-sheet
+                                                          {:content privacy/privacy-statement
+                                                           :shell?  true}])
+                                 :style    style/highlighted-text
+                                 :size     :paragraph-2
+                                 :weight   :medium}
+                                (i18n/label :t/intro-privacy-policy)]]]
        :button-one-label     (i18n/label :t/sync-or-recover-profile)
        :button-one-props     {:type                :dark-grey
                               :disabled?           (not terms-accepted?)

src/status_im/contexts/wallet/send/events.cljs

@@ -731,8 +731,8 @@
                                                                :route         route
                                                                :token-address token-address
                                                                :token-id      (if collectible
-                                                                                (money/to-hex
-                                                                                 (js/parseInt token-id))
+                                                                                (utils.hex/number-to-hex
+                                                                                 token-id)
                                                                                 token-id)
                                                                :data          data
                                                                :eth-transfer? eth-transfer?})]

src/utils/hex.cljs

@@ -1,6 +1,7 @@
 (ns utils.hex
   (:require
     [clojure.string :as string]
+    [native-module.core :as native-module]
     [schema.core :as schema]))
 
 (defn normalize-hex
@@ -25,3 +26,14 @@
   [:=>
    [:cat :string]
    :string])
+
+(defn number-to-hex
+  [value]
+  (->> value
+       native-module/number-to-hex
+       prefix-hex))
+
+(schema/=> number-to-hex
+  [:=>
+   [:cat [:or :string :int]]
+   :string])

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.184.47",
-    "commit-sha1": "83aa01c7daf69d518e624fc584ea22ca27b34b73",
-    "src-sha256": "07gqijx652ap0lf0kvcpd0lxx5x58air19pxgjawwymq2b8kly16"
+    "version": "44c58ccd324be4a7501deb3a2fefab90bef28b7a",
+    "commit-sha1": "44c58ccd324be4a7501deb3a2fefab90bef28b7a",
+    "src-sha256": "0rpxl38k19rdz9ax9aafxv4ni2id4c00rqv6pidhh8s5afr0v6i4"
 }

translations/en.json

@@ -1174,6 +1174,7 @@
   "instruction-after-qr-generated": "On your other device, navigate to the Syncing screen and select “Scan sync”",
   "insufficient-balance-to-cover-fee": "not enough balance to cover transaction fee",
   "intro-message1": "Welcome to Status!\nTap this message to set your password and get started.",
+  "intro-privacy-policy": "Privacy Policy",
   "intro-privacy-policy-note1": "Status does not collect or profit from your personal data. By continuing, you agree with the ",
   "intro-privacy-policy-note2": "privacy policy",
   "intro-privacy-statement": "Privacy Statement",