fix_: account address derivation in mobile user upgrade

This reverts commit a6688fb866.

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

@@ -7,15 +7,19 @@
    :justify-content :flex-end})
 
 (def text-container
-  {:flex           1
-   :flex-direction :row
-   :flex-wrap      :wrap
-   :align-self     :center})
+  {:flex-direction :row
+   :flex-wrap      :wrap})
+
+(def text-aligner
+  {:flex            1
+   :flex-direction  :row
+   :justify-content :center})
 
 (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,7 +29,7 @@
                                  :blur?     true
                                  :checked?  terms-accepted?
                                  :on-change #(set-terms-accepted? not)}]]
-                              [rn/view {:style {:flex 1}}
+                              [rn/view {:style style/text-aligner}
                                [rn/view {:style style/text-container}
                                 [quo/text
                                  {:style style/plain-text
@@ -47,7 +46,7 @@
                                 [quo/text
                                  {:style style/plain-text
                                   :size  :paragraph-2}
-                                 " & "]
+                                 " " (i18n/label :t/and) " "]
                                 [quo/text
                                  {:on-press #(rf/dispatch [:show-bottom-sheet
                                                            {:content (fn [] [privacy/privacy-statement])

src/status_im/contexts/profile/config.cljs

@@ -12,10 +12,10 @@
    :wakuV2Nameserver              "8.8.8.8"
    :statusProxyEnabled            config/status-proxy-enabled?
    :statusProxyStageName          config/status-proxy-stage-name
-   :statusProxyMarketUser         "test"
-   :statusProxyMarketPassword     "test"
-   :statusProxyBlockchainUser     "test"
-   :statusProxyBlockchainPassword "test"
+   :statusProxyMarketUser         config/STATUS_BUILD_PROXY_USER
+   :statusProxyMarketPassword     config/STATUS_BUILD_PROXY_PASSWORD
+   :statusProxyBlockchainUser     config/STATUS_BUILD_PROXY_USER
+   :statusProxyBlockchainPassword config/STATUS_BUILD_PROXY_PASSWORD
    :openseaAPIKey                 config/opensea-api-key
    :poktToken                     config/POKT_TOKEN
    :infuraToken                   config/INFURA_TOKEN

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

@@ -518,8 +518,8 @@
 
 (rf/reg-event-fx
  :wallet/handle-suggested-routes
- (fn [_ data]
-   (if-let [{:keys [code details]} (-> data :ErrorResponse first)]
+ (fn [_ [data]]
+   (if-let [{:keys [code details]} (-> data :ErrorResponse)]
      (let [error-message (if (= code "0") "An error occurred" details)]
        (log/error "failed to get suggested routes (async)"
                   {:event :wallet/handle-suggested-routes
@@ -531,7 +531,6 @@
            candidates-fix  (comp ->old-route-paths
                                  remove-invalid-bonder-fees-routes)
            routes          (-> data
-                               (first)
                                (data-store/rpc->suggested-routes)
                                (update :best best-routes-fix)
                                (update :candidates candidates-fix))]

src/status_im/subs/wallet/wallet_connect.cljs

@@ -133,8 +133,7 @@
            max-fees-fiat           (wallet-utils/calculate-token-fiat-value {:currency currency
                                                                              :balance  max-fees-ether
                                                                              :token    eth-token})
-           max-fees-fiat-formatted (-> max-fees-ether
-                                       (wallet-utils/get-standard-crypto-format eth-token)
+           max-fees-fiat-formatted (-> (wallet-utils/get-standard-crypto-format eth-token max-fees-ether)
                                        (wallet-utils/get-standard-fiat-format currency-symbol
                                                                               max-fees-fiat))
            balance                 (-> eth-token

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "release/0.182.x",
-    "commit-sha1": "89662aa3007a045321aab5a53f19272a484d025e",
-    "src-sha256": "0bvi1j904q2nm1ry9snxli1xyp2fll1wsxm1i0nik8nb4rwib7dd"
+    "version": "fix/generate_account2",
+    "commit-sha1": "58ee4f0461740f5b74f9655ea47275410bd05135",
+    "src-sha256": "032badg45ibya6h7ahg6hdb1z90363hq043va3cf5cvhjakbw8l2"
 }