Merge branch 'develop' into 15378

* image index fix

doc/new-guidelines.md

@@ -90,6 +90,28 @@ their styles in the top-level of the properties map, prefer to add them inside t
  ]
 ```
 
+### Always apply animated styles in the style file
+
+When implementing styles for reanimated views, we should always define
+them in the style file and apply animations with reanimated/apply-animations-to-style
+in the style definition.
+
+```clojure
+;; bad
+(defn circle
+  []
+  (let [opacity (reanimated/use-shared-value 1)]
+    [reanimated/view {:style (reanimated/apply-animations-to-style
+                              {:opacity opacity}
+                              style/circle-container)}]))
+
+;; good
+(defn circle
+  []
+  (let [opacity (reanimated/use-shared-value 1)]
+    [reanimated/view {:style (style/circle-container opacity)}]))
+```
+
 ### Don't use percents to define width/height
 
 In ReactNative, all layouts use the [flexbox

src/js/worklets/onboarding_carousel.js

@@ -0,0 +1,47 @@
+import { useDerivedValue, withTiming, Easing } from 'react-native-reanimated';
+
+const slideAnimationDuration = 300;
+
+const easeOut = {
+  duration: slideAnimationDuration,
+  easing: Easing.bezier(0, 0, 0.58, 1),
+}
+
+// Derived Values
+export function dynamicProgressBarWidth(staticProgressBarWidth, progress) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      return staticProgressBarWidth * (progress.value || 0) / 100;
+    }
+  );
+}
+
+export function carouselLeftPosition(windowWidth, progress) {
+  return useDerivedValue(
+    function () {
+      'worklet'
+      const progressValue = progress.value;
+      switch (true) {
+      case (progressValue < 25):
+	return 0;
+      case (progressValue === 25):
+	return withTiming(-windowWidth, easeOut);
+      case (progressValue < 50):
+	return -windowWidth;
+      case (progressValue === 50):
+	return withTiming(-2 * windowWidth, easeOut);
+      case (progressValue < 75):
+	return -2 * windowWidth;
+      case (progressValue === 75):
+	return withTiming(-3 * windowWidth, easeOut);
+      case (progressValue < 100):
+	return -3 * windowWidth;
+      case (progressValue === 100):
+	return withTiming(-4 * windowWidth, easeOut);
+      default:
+	return 0;
+      }
+    });
+}
+

src/mocks/js_dependencies.cljs

@@ -293,7 +293,10 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     :createNativeWrapper      identity
     :default                  #js {}})
 
-(def react-native-redash #js {:clamp nil})
+(def react-native-redash
+  #js
+   {:clamp     nil
+    :withPause (fn [])})
 
 (def react-native-languages
   (clj->js {:default {:language            "en"
@@ -370,6 +373,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     "react-native-screens"                          (clj->js {})
     "react-native-reanimated"                       react-native-reanimated
     "react-native-redash/lib/module/v1"             react-native-redash
+    "react-native-redash"                           react-native-redash
     "react-native-fetch-polyfill"                   fetch
     "react-native-status-keycard"                   status-keycard
     "react-native-keychain"                         keychain
@@ -407,6 +411,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     "../src/js/worklets/bottom_sheet.js"            #js {}
     "../src/js/worklets/record_audio.js"            #js {}
     "../src/js/worklets/scroll_view.js"             #js {}
+    "../src/js/worklets/onboarding_carousel.js"     #js {}
     "../src/js/worklets/lightbox.js"                #js {}
     "./fleets.js"                                   default-fleets
     "@walletconnect/client"                         wallet-connect-client

src/quo2/foundations/colors.cljs

@@ -127,6 +127,7 @@
 
 ;;Solid
 (def black "#000000")
+(def onboarding-header-black "#000716")
 
 ;;;;Primary
 

src/react_native/reanimated.cljs

@@ -9,6 +9,7 @@
                              withDelay
                              withSpring
                              withRepeat
+                             withSequence
                              withDecay
                              Easing
                              Keyframe
@@ -17,8 +18,8 @@
                              SlideOutUp
                              LinearTransition)]
             [reagent.core :as reagent]
+            ["react-native-redash" :refer (withPause)]
             [react-native.flat-list :as rn-flat-list]
-            [utils.collection]
             [utils.worklets.core :as worklets.core]))
 
 (def ^:const default-duration 300)
@@ -59,6 +60,8 @@
 (def with-decay withDecay)
 (def key-frame Keyframe)
 (def with-repeat withRepeat)
+(def with-sequence withSequence)
+(def with-pause withPause)
 (def cancel-animation cancelAnimation)
 
 ;; Easings

src/status_im/ui/screens/profile/contact/views.cljs

@@ -88,14 +88,14 @@
 
 (defn valid-nickname?
   [nickname]
-  (not (string/blank? nickname)))
+  (not (string/blank? (string/trim (or nickname "")))))
 
 (defn- nickname-input
   [nickname entered-nickname public-key]
   [quo/text-input
    {:on-change-text      #(reset! entered-nickname %)
     :on-submit-editing   #(when (valid-nickname? @entered-nickname)
-                            (save-nickname public-key @entered-nickname))
+                            (save-nickname public-key (string/trim (or @entered-nickname ""))))
     :auto-capitalize     :none
     :auto-focus          false
     :max-length          32
@@ -131,7 +131,9 @@
          :center
          [quo/button
           {:type     :secondary
-           :on-press #(save-nickname public-key @entered-nickname)}
+           :disabled (not (valid-nickname? @entered-nickname))
+           :on-press #(when (valid-nickname? @entered-nickname)
+                        (save-nickname public-key (string/trim (or @entered-nickname ""))))}
           (i18n/label :t/done)]}]])))
 
 (defn button-item

src/status_im/utils/utils.cljs

@@ -126,6 +126,11 @@
   (when (string? s)
     (string/replace s m r)))
 
+(defn safe-nth
+  [coll index]
+  (when (number? index)
+    (nth coll index)))
+
 (defn svg?
   [some-string]
   (string/ends-with? some-string ".svg"))

src/status_im2/common/resources.cljs

@@ -1,20 +1,15 @@
 (ns status-im2.common.resources)
 
 (def ui
-  {:add-new-contact    (js/require "../resources/images/ui2/add-contact.png")
-   :intro-1            (js/require "../resources/images/ui2/intro-1.png")
-   :intro-2            (js/require "../resources/images/ui2/intro-2.png")
-   :intro-3            (js/require "../resources/images/ui2/intro-3.png")
-   :intro-4            (js/require "../resources/images/ui2/intro-4.png")
-   :lifestyle          (js/require "../resources/images/ui2/lifestyle.png")
-   :music              (js/require "../resources/images/ui2/music.png")
-   :podcasts           (js/require "../resources/images/ui2/podcasts.png")
-   :sync-device        (js/require "../resources/images/ui2/sync-new-device-cover-background.png")
-   :onboarding-bg-1    (js/require "../resources/images/ui2/onboarding-bg-1.png")
-   :onboarding-blur-bg (js/require "../resources/images/ui2/onboarding_blur_bg.png")
-   :generate-keys      (js/require "../resources/images/ui2/generate_keys.png")
-   :ethereum-address   (js/require "../resources/images/ui2/ethereum_address.png")
-   :use-keycard        (js/require "../resources/images/ui2/keycard.png")})
+  {:add-new-contact         (js/require "../resources/images/ui2/add-contact.png")
+   :lifestyle               (js/require "../resources/images/ui2/lifestyle.png")
+   :music                   (js/require "../resources/images/ui2/music.png")
+   :podcasts                (js/require "../resources/images/ui2/podcasts.png")
+   :sync-device             (js/require "../resources/images/ui2/sync-new-device-cover-background.png")
+   :generate-keys           (js/require "../resources/images/ui2/generate_keys.png")
+   :ethereum-address        (js/require "../resources/images/ui2/ethereum_address.png")
+   :use-keycard             (js/require "../resources/images/ui2/keycard.png")
+   :onboarding-illustration (js/require "../resources/images/ui2/onboarding_illustration.png")})
 
 (def mock-images
   {:coinbase             (js/require "../resources/images/mock2/coinbase.png")

src/status_im2/contexts/chat/lightbox/view.cljs

@@ -130,7 +130,7 @@
            ;; The initial value of data is the image that was pressed (and not the whole album) in order
            ;; for the transition animation to execute properly, otherwise it would animate towards
            ;; outside the screen (even if we have `initialScrollIndex` set).
-           data                            (reagent/atom [(nth messages index)])
+           data                            (reagent/atom (if (number? index) [(nth messages index)] []))
            scroll-index                    (reagent/atom index)
            transparent?                    (reagent/atom false)
            set-full-height?                (reagent/atom false)

src/status_im2/contexts/chat/menus/pinned_messages/style.cljs

@@ -37,7 +37,8 @@
   {:width           120
    :height          120
    :justify-content :center
-   :align-items     :center})
+   :align-items     :center
+   :border-width    1})
 
 (def no-pinned-messages-text
   {:margin-top 20})

src/status_im2/contexts/chat/menus/pinned_messages/view.cljs

@@ -22,7 +22,8 @@
   [chat-id]
   (let [pinned-messages        (rf/sub [:chats/pinned-sorted-list chat-id])
         render-data            (rf/sub [:chats/current-chat-message-list-view-context :in-pinned-view])
-        {:keys [community-id]} (rf/sub [:chat-by-id chat-id])
+        current-chat           (rf/sub [:chat-by-id chat-id])
+        {:keys [community-id]} current-chat
         community              (rf/sub [:communities/community community-id])]
     [safe-area/consumer
      (fn [insets]

src/status_im2/contexts/onboarding/common/background/style.cljs

@@ -5,20 +5,12 @@
   {:background-color colors/neutral-95
    :flex-direction   :row
    :position         :absolute
+   :overflow         :hidden
    :top              0
    :bottom           0
    :left             0
    :right            0})
 
-(defn background-gradient-overlay
-  [dark-overlay?]
-  {:position :absolute
-   :height   (if dark-overlay? 240 136)
-   :top      0
-   :left     0
-   :right    0
-   :bottom   0})
-
 (def background-blur-overlay
   {:position         :absolute
    :left             0

src/status_im2/contexts/onboarding/common/background/view.cljs

@@ -1,26 +1,22 @@
 (ns status-im2.contexts.onboarding.common.background.view
   (:require [react-native.core :as rn]
-            [quo2.foundations.colors :as colors]
-            [status-im2.common.resources :as resources]
-            [react-native.linear-gradient :as linear-gradient]
-            [status-im2.contexts.onboarding.common.background.style :as style]))
+            [react-native.blur :as blur]
+            [status-im2.contexts.onboarding.common.carousel.view :as carousel]
+            [status-im2.contexts.onboarding.common.background.style :as style]
+            [status-im2.contexts.onboarding.common.carousel.animation :as carousel.animation]))
 
 (defn view
   [dark-overlay?]
-  [rn/view
-   {:style style/background-container}
-   [rn/image
-    {:blur-radius (if dark-overlay? 13 0)
-     :style       {:height "100%"
-                   :width  "100%"}
-     ;; Todo - get background image from sub using carousel index on landing page
-     :source      (resources/get-image :onboarding-bg-1)}]
-   [linear-gradient/linear-gradient
-    {:colors [(if dark-overlay? (colors/custom-color :yin 50) "#000716")
-              (if dark-overlay? (colors/custom-color :yin 50 0) "#000716")]
-     :start  {:x 0 :y 0}
-     :end    {:x 0 :y 1}
-     :style  (style/background-gradient-overlay dark-overlay?)}]
-   (when dark-overlay?
+  [:f>
+   (fn []
+     (carousel.animation/initialize-animation)
      [rn/view
-      {:style style/background-blur-overlay}])])
+      {:style style/background-container}
+      [carousel/view dark-overlay?]
+      (when dark-overlay?
+        [blur/view
+         {:style         style/background-blur-overlay
+          :blur-amount   30
+          :blur-radius   25
+          :blur-type     :transparent
+          :overlay-color :transparent}])])])

src/status_im2/contexts/onboarding/common/carousel/animation.cljs

@@ -0,0 +1,50 @@
+(ns status-im2.contexts.onboarding.common.carousel.animation
+  (:require
+    [react-native.reanimated :as reanimated]
+    [utils.worklets.onboarding-carousel :as worklets.onboarding-carousel]))
+
+(def progress (atom nil))
+(def paused (atom nil))
+
+(def ^:const progress-bar-animation-delay 300)
+(def ^:const progress-bar-animation-duration 4000)
+
+(defn slide-animation
+  [progress-percentage & [delay duration]]
+  (reanimated/with-delay
+   (or delay progress-bar-animation-delay)
+   (reanimated/with-timing
+    progress-percentage
+    (js-obj "duration" (or duration progress-bar-animation-duration)
+            "easing"   (:linear reanimated/easings)))))
+
+(defn animate-progress
+  [progress paused]
+  (reanimated/set-shared-value
+   progress
+   (reanimated/with-pause
+    (reanimated/with-repeat
+     (reanimated/with-sequence
+      (slide-animation 25)
+      (slide-animation 50)
+      (slide-animation 75)
+      (slide-animation 100)
+      (slide-animation 0 300 0))
+     -1)
+    paused)))
+
+(defn initialize-animation
+  []
+  (when-not @progress
+    (reset! progress (reanimated/use-shared-value 0))
+    (reset! paused (reanimated/use-shared-value false))
+    (animate-progress @progress @paused)))
+
+;; Derived Values
+(defn carousel-left-position
+  [window-width]
+  (worklets.onboarding-carousel/carousel-left-position window-width @progress))
+
+(defn dynamic-progress-bar-width
+  [progress-bar-width]
+  (worklets.onboarding-carousel/dynamic-progress-bar-width progress-bar-width @progress))

src/status_im2/contexts/onboarding/common/carousel/style.cljs

@@ -0,0 +1,73 @@
+(ns status-im2.contexts.onboarding.common.carousel.style
+  (:require
+    [quo2.foundations.colors :as colors]
+    [react-native.reanimated :as reanimated]))
+
+(defn header-container
+  [status-bar-height content-width index]
+  {:position         :absolute
+   :top              0
+   :left             (* content-width index)
+   :padding-top      (+ 30 status-bar-height)
+   :width            content-width
+   :height           (+ 96 status-bar-height)
+   :flex-direction   :row
+   :background-color colors/onboarding-header-black})
+
+(defn header-text-view
+  [window-width]
+  {:flex-direction :column
+   :width          window-width
+   :padding-left   20})
+
+(def carousel-text
+  {:color colors/white})
+
+(def carousel-sub-text
+  {:color      colors/white
+   :margin-top 2})
+
+(defn background-image
+  [content-width]
+  {:resize-mode :stretch
+   :width       content-width})
+
+(defn progress-bar-item
+  [static? end?]
+  {:height           2
+   :flex             1
+   :background-color (if static? colors/white-opa-10 colors/white)
+   :margin-right     (if end? 0 8)
+   :border-radius    4})
+
+(defn progress-bar
+  [width]
+  {:position       :absolute
+   :top            0
+   :width          width
+   :flex-direction :row})
+
+(defn dynamic-progress-bar
+  [width]
+  (reanimated/apply-animations-to-style
+   {:width width}
+   {:height        2
+    :border-radius 4
+    :overflow      :hidden}))
+
+(defn progress-bar-container
+  [progress-bar-width status-bar-height]
+  {:position    :absolute
+   :width       progress-bar-width
+   :margin-left 20
+   :top         (+ 12 status-bar-height)})
+
+(defn carousel-container
+  [left]
+  (reanimated/apply-animations-to-style
+   {:left left}
+   {:position       :absolute
+    :right          0
+    :top            0
+    :bottom         0
+    :flex-direction :row}))

src/status_im2/contexts/onboarding/common/carousel/view.cljs

@@ -0,0 +1,95 @@
+(ns status-im2.contexts.onboarding.common.carousel.view
+  (:require [quo2.core :as quo]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]
+            [react-native.core :as rn]
+            [react-native.navigation :as navigation]
+            [react-native.reanimated :as reanimated]
+            [status-im2.common.resources :as resources]
+            [status-im2.contexts.onboarding.common.carousel.style :as style]
+            [status-im2.contexts.onboarding.common.carousel.animation :as animation]))
+
+(def header-text
+  [{:text     (i18n/label :t/join-decentralised-communities)
+    :sub-text (i18n/label :t/participate-in-the-metaverse)}
+   {:text     (i18n/label :t/chat-with-friends)
+    :sub-text (i18n/label :t/with-full-encryption)}
+   {:text     (i18n/label :t/own-your-crypto)
+    :sub-text (i18n/label :t/use-the-multichain-wallet)}
+   {:text     (i18n/label :t/discover-web3)
+    :sub-text (i18n/label :t/explore-the-decentralized-web)}])
+
+(defn header-text-view
+  [index window-width]
+  [rn/view {:style (style/header-text-view window-width)}
+   [quo/text
+    {:style  style/carousel-text
+     :weight :semi-bold
+     :size   :heading-2}
+    (get-in header-text [index :text])]
+   [quo/text
+    {:style style/carousel-sub-text
+     :size  :paragraph-1}
+    (get-in header-text [index :sub-text])]])
+
+(defn content-view
+  [{:keys [window-width status-bar-height index]}]
+  (let [content-width (* 4 window-width)]
+    [:<>
+     [rn/image
+      {:style  (style/background-image content-width)
+       :source (resources/get-image :onboarding-illustration)}]
+     [rn/view {:style (style/header-container status-bar-height content-width index)}
+      (for [index (range 4)]
+        ^{:key index}
+        [header-text-view index window-width])]]))
+
+(defn progress-bar
+  [{:keys [static? progress-bar-width]}]
+  [rn/view
+   {:style (style/progress-bar progress-bar-width)}
+   [rn/view {:style (style/progress-bar-item static? false)}]
+   [rn/view {:style (style/progress-bar-item static? false)}]
+   [rn/view {:style (style/progress-bar-item static? false)}]
+   [rn/view {:style (style/progress-bar-item static? true)}]])
+
+(defn dynamic-progress-bar
+  [progress-bar-width]
+  [:f>
+   (fn []
+     (let [width (animation/dynamic-progress-bar-width progress-bar-width)]
+       [reanimated/view {:style (style/dynamic-progress-bar width)}
+        [progress-bar
+         {:static?            false
+          :progress-bar-width progress-bar-width}]]))])
+
+(defn view
+  []
+  [:f>
+   (fn []
+     (let [window-width       (rf/sub [:dimensions/window-width])
+           view-id            (rf/sub [:view-id])
+           status-bar-height  (:status-bar-height @navigation/constants)
+           progress-bar-width (- window-width 40)
+           carousel-left      (animation/carousel-left-position window-width)]
+       (rn/use-effect
+        (fn []
+          (reanimated/set-shared-value @animation/paused (not= view-id :intro)))
+        [view-id])
+       [:<>
+        [reanimated/view {:style (style/carousel-container carousel-left)}
+         (for [index (range 2)]
+           ^{:key index}
+           [content-view
+            {:window-width      window-width
+             :status-bar-height status-bar-height
+             :index             index}])]
+        [rn/view
+         {:style (style/progress-bar-container
+                  progress-bar-width
+                  status-bar-height)}
+         [progress-bar
+          {:static?            true
+           :progress-bar-width progress-bar-width}]
+         [dynamic-progress-bar progress-bar-width]]]))])
+

src/status_im2/contexts/onboarding/common/intro/view.cljs

@@ -1,88 +0,0 @@
-(ns status-im2.contexts.onboarding.common.intro.view
-  (:require [utils.i18n :as i18n]
-            [quo2.core :as quo]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]
-            [utils.re-frame :as rf]
-            [status-im2.contexts.onboarding.common.intro.style :as style]
-            [status-im2.common.resources :as resources]))
-
-(def carousels
-  [{:image    (resources/get-image :intro-1)
-    :text     (i18n/label :t/join-decentralised-communities)
-    :sub-text (i18n/label :t/participate-in-the-metaverse)}
-   {:image    (resources/get-image :intro-2)
-    :text     (i18n/label :t/chat-with-friends)
-    :sub-text (i18n/label :t/with-full-encryption)}
-   {:image    (resources/get-image :intro-3)
-    :text     (i18n/label :t/own-your-crypto)
-    :sub-text (i18n/label :t/use-the-multichain-wallet)}
-   {:image    (resources/get-image :intro-4)
-    :text     (i18n/label :t/discover-web3)
-    :sub-text (i18n/label :t/explore-the-decentralized-web)}])
-
-(defn progress-bar
-  [index]
-  [rn/view style/progress-bar-container
-   [rn/view {:style (style/progress-bar-item index 0 false)}]
-   [rn/view {:style (style/progress-bar-item index 1 false)}]
-   [rn/view {:style (style/progress-bar-item index 2 false)}]
-   [rn/view {:style (style/progress-bar-item index 3 true)}]])
-
-;; TODO: carousel component is to be correctly implemented as quo2 component with animations etc in:
-;; https://github.com/status-im/status-mobile/issues/15012
-(defn carousel
-  [index]
-  [rn/view {:style style/carousel}
-   [progress-bar index]
-   [quo/text
-    {:style  style/carousel-text
-     :weight :semi-bold
-     :size   :heading-2}
-    (get-in carousels [index :text])]
-   [quo/text
-    {:style style/carousel-text
-     :size  :paragraph-1}
-    (get-in carousels [index :sub-text])]])
-
-(defn set-index
-  [old-index]
-  (mod (inc old-index) 4))
-
-(defn view
-  []
-  (reagent/with-let [carousel-index (reagent/atom 0)
-                     interval-id    (js/setInterval #(swap! carousel-index set-index)
-                                                    1500)]
-    [rn/view {:style style/page-container}
-     [carousel @carousel-index]
-     [rn/image
-      {:style  style/page-image
-       :source (get-in carousels [@carousel-index :image])}]
-     [quo/drawer-buttons
-      {:top-card    {:on-press            (fn []
-                                            (rf/dispatch [:navigate-to :sign-in])
-                                            (rf/dispatch [:hide-terms-of-services-opt-in-screen]))
-                     :heading             (i18n/label :t/sign-in)
-                     :accessibility-label :already-use-status-button}
-       :bottom-card {:on-press            (fn []
-                                            (rf/dispatch [:navigate-to :new-to-status])
-                                            (rf/dispatch [:hide-terms-of-services-opt-in-screen]))
-                     :heading             (i18n/label :t/new-to-status)
-                     :accessibility-label :new-to-status-button}}
-      (i18n/label :t/you-already-use-status)
-      [quo/text
-       {:style style/text-container}
-       [quo/text
-        {:size   :paragraph-2
-         :style  style/plain-text
-         :weight :semi-bold}
-        (i18n/label :t/by-continuing-you-accept)]
-       [quo/text
-        {:on-press #(rf/dispatch [:open-modal :privacy-policy])
-         :size     :paragraph-2
-         :style    style/highlighted-text
-         :weight   :semi-bold}
-        (i18n/label :t/terms-of-service)]]]]
-    (finally
-     (js/clearInterval interval-id))))

src/status_im2/contexts/onboarding/events.cljs

@@ -5,11 +5,12 @@
     [status-im.utils.types :as types]
     [status-im2.config :as config]
     [clojure.string :as string]
+    [utils.i18n :as i18n]
     [utils.security.core :as security]
     [status-im.native-module.core :as status]
     [status-im.ethereum.core :as ethereum]
     [status-im2.constants :as constants]
-    [utils.i18n :as i18n]))
+    [status-im2.contexts.onboarding.profiles.view :as profiles.view]))
 
 (re-frame/reg-fx
  :multiaccount/create-account-and-login
@@ -22,10 +23,10 @@
    (status/validate-mnemonic
     (security/safe-unmask-data mnemonic)
     (fn [result]
-      (let [{:keys [error]} (types/json->clj result)]
+      (let [{:keys [error keyUID]} (types/json->clj result)]
         (if (seq error)
           (when on-error (on-error error))
-          (on-success mnemonic)))))))
+          (on-success mnemonic keyUID)))))))
 
 (re-frame/reg-fx
  :multiaccount/restore-account-and-login
@@ -121,15 +122,28 @@
   {:events [:onboarding-2/seed-phrase-entered]}
   [_ seed-phrase on-error]
   {:multiaccount/validate-mnemonic [seed-phrase
-                                    #(re-frame/dispatch [:onboarding-2/seed-phrase-validated
-                                                         seed-phrase])
+                                    (fn [mnemonic key-uid]
+                                      (re-frame/dispatch [:onboarding-2/seed-phrase-validated
+                                                          mnemonic key-uid]))
                                     on-error]})
 
 (rf/defn seed-phrase-validated
   {:events [:onboarding-2/seed-phrase-validated]}
-  [{:keys [db]} seed-phrase]
-  {:db       (assoc-in db [:onboarding-2/profile :seed-phrase] seed-phrase)
-   :dispatch [:navigate-to :create-profile]})
+  [{:keys [db]} seed-phrase key-uid]
+  (if (contains? (:multiaccounts/multiaccounts db) key-uid)
+    {:utils/show-confirmation
+     {:title               (i18n/label :t/multiaccount-exists-title)
+      :content             (i18n/label :t/multiaccount-exists-content)
+      :confirm-button-text (i18n/label :t/unlock)
+      :on-accept           #(do
+                              (re-frame/dispatch [:pop-to-root :profiles])
+                              ;; FIXME(rasom): obviously not cool
+                              (reset! profiles.view/show-profiles? false)
+                              (re-frame/dispatch
+                               [:multiaccounts.login.ui/multiaccount-selected key-uid]))
+      :on-cancel           #(re-frame/dispatch [:pop-to-root :multiaccounts])}}
+    {:db       (assoc-in db [:onboarding-2/profile :seed-phrase] seed-phrase)
+     :dispatch [:navigate-to :create-profile]}))
 
 (rf/defn navigate-to-create-profile
   {:events [:onboarding-2/navigate-to-create-profile]}

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

@@ -1,4 +1,4 @@
-(ns status-im2.contexts.onboarding.common.intro.style
+(ns status-im2.contexts.onboarding.intro.style
   (:require
     [react-native.platform :as platform]
     [quo2.foundations.colors :as colors]))

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

@@ -0,0 +1,37 @@
+(ns status-im2.contexts.onboarding.intro.view
+  (:require [quo2.core :as quo]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]
+            [react-native.core :as rn]
+            [status-im2.contexts.onboarding.intro.style :as style]
+            [status-im2.contexts.onboarding.common.background.view :as background]))
+
+(defn view
+  []
+  [rn/view {:style style/page-container}
+   [background/view false]
+   [quo/drawer-buttons
+    {:top-card    {:on-press            (fn []
+                                          (rf/dispatch [:navigate-to :sign-in])
+                                          (rf/dispatch [:hide-terms-of-services-opt-in-screen]))
+                   :heading             (i18n/label :t/sign-in)
+                   :accessibility-label :already-use-status-button}
+     :bottom-card {:on-press            (fn []
+                                          (rf/dispatch [:navigate-to :new-to-status])
+                                          (rf/dispatch [:hide-terms-of-services-opt-in-screen]))
+                   :heading             (i18n/label :t/new-to-status)
+                   :accessibility-label :new-to-status-button}}
+    (i18n/label :t/you-already-use-status)
+    [quo/text
+     {:style style/text-container}
+     [quo/text
+      {:size   :paragraph-2
+       :style  style/plain-text
+       :weight :semi-bold}
+      (i18n/label :t/by-continuing-you-accept)]
+     [quo/text
+      {:on-press #(rf/dispatch [:open-modal :privacy-policy])
+       :size     :paragraph-2
+       :style    style/highlighted-text
+       :weight   :semi-bold}
+      (i18n/label :t/terms-of-service)]]]])

src/status_im2/contexts/onboarding/new_to_status/style.cljs

@@ -4,20 +4,13 @@
 
 (def full-screen {:flex 1})
 
-(def image-background
-  {:height "100%"
-   :width  "100%"})
-
-(def layer-background
-  {:padding-top      (if platform/ios? 44 0)
-   :position         :absolute
-   :top              0
-   :bottom           0
-   :left             0
-   :right            0
-   :background-color colors/neutral-80-opa-80-blur})
-
-(def navigation-bar {:height 56})
+(def content-container
+  {:padding-top (if platform/ios? 44 0)
+   :position    :absolute
+   :top         0
+   :bottom      0
+   :left        0
+   :right       0})
 
 (def options-container
   {:padding-top        12

src/status_im2/contexts/onboarding/new_to_status/view.cljs

@@ -7,16 +7,10 @@
     [status-im2.common.resources :as resources]
     [status-im2.contexts.onboarding.new-to-status.style :as style]
     [status-im2.contexts.onboarding.common.navigation-bar.view :as navigation-bar]
+    [status-im2.contexts.onboarding.common.background.view :as background]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(defn background-image
-  []
-  [rn/image
-   {:style       style/image-background
-    :blur-radius 13
-    :source      (resources/get-image :onboarding-blur-bg)}])
-
 (defn sign-in-options
   []
   (let [window (rf/sub [:dimensions/window])]
@@ -78,7 +72,7 @@
 (defn new-to-status
   []
   [rn/view {:style style/full-screen}
-   [background-image]
-   [rn/view {:style style/layer-background}
+   [background/view true]
+   [rn/view {:style style/content-container}
     [navigation-bar/navigation-bar {:on-press-info #(js/alert "Info pressed")}]
     [sign-in-options]]])

src/status_im2/contexts/onboarding/profiles/view.cljs

@@ -31,7 +31,7 @@
       :label               (i18n/label :t/add-existing-status-profile)
       :on-press            #(do
                               (rf/dispatch [:bottom-sheet/hide])
-                              (rf/dispatch [:navigate-to :new-to-status]))
+                              (rf/dispatch [:navigate-to :sign-in]))
       :accessibility-label :multi-profile}]]])
 
 (defn show-new-account-options
@@ -202,4 +202,4 @@
      [background/view true]
      (if @show-profiles?
        [profiles-section]
-       [login-section show-profiles?])]))
+       [login-section])]))

src/status_im2/contexts/onboarding/sign_in/view.cljs

@@ -11,8 +11,8 @@
             [react-native.platform :as platform]
             [react-native.safe-area :as safe-area]
             [reagent.core :as reagent]
-            [status-im2.common.resources :as resources]
             [status-im2.constants :as constants]
+            [status-im2.contexts.onboarding.common.background.view :as background]
             [status-im2.contexts.onboarding.sign-in.style :as style]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
@@ -216,9 +216,7 @@
               :camera-options {:zoomMode :off}
               :scan-barcode   true
               :on-read-code   on-read-code}]
-            [rn/image
-             {:style  (merge style/absolute-fill {:height height :width width})
-              :source (resources/get-image :intro-4)}])
+            [background/view true])
           (conj hole-view-wrapper
                 [blur/view
                  {:style         style/absolute-fill

src/status_im2/navigation/screens.cljs

@@ -13,7 +13,7 @@
     [status-im2.contexts.chat.photo-selector.view :as photo-selector]
     [status-im2.contexts.communities.discover.view :as communities.discover]
     [status-im2.contexts.communities.overview.view :as communities.overview]
-    [status-im2.contexts.onboarding.common.intro.view :as intro]
+    [status-im2.contexts.onboarding.intro.view :as intro]
     [status-im2.contexts.onboarding.create-password.view :as create-password]
     [status-im2.contexts.onboarding.create-profile.view :as create-profile]
     [status-im2.contexts.onboarding.enable-biometrics.view :as enable-biometrics]

src/status_im2/subs/wallet/wallet.cljs

@@ -3,10 +3,10 @@
             [re-frame.core :as re-frame]
             [status-im.ethereum.core :as ethereum]
             [status-im.ethereum.tokens :as tokens]
-            [utils.i18n :as i18n]
-            [status-im2.config :as config]
             [status-im.utils.currency :as currency]
-            [status-im.utils.money :as money]))
+            [status-im.utils.money :as money]
+            [status-im2.config :as config]
+            [utils.i18n :as i18n]))
 
 (re-frame/reg-sub
  :balance
@@ -253,7 +253,7 @@
  :wallet/currency
  :<- [:wallet.settings/currency]
  (fn [currency-id]
-   (get currency/currencies currency-id)))
+   (get currency/currencies currency-id (get currency/currencies :usd))))
 
 (defn filter-recipient-favs
   [search-filter {:keys [name]}]

src/utils/worklets/onboarding_carousel.cljs

@@ -0,0 +1,11 @@
+(ns utils.worklets.onboarding-carousel)
+
+(def worklets (js/require "../src/js/worklets/onboarding_carousel.js"))
+
+(defn dynamic-progress-bar-width
+  [static-progress-bar-width progress]
+  (.dynamicProgressBarWidth ^js worklets static-progress-bar-width progress))
+
+(defn carousel-left-position
+  [window-width progress]
+  (.carouselLeftPosition ^js worklets window-width progress))

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.141.1",
-    "commit-sha1": "458f28178ca15732df8e6c806ef5326fad44427c",
-    "src-sha256": "1hhfswn17dja62rxkb572afd6fsx86wfxs4j666lhscdz7zzs4gx"
+    "version": "v0.141.2",
+    "commit-sha1": "91c6949cd25449d5459581a21f2c8b929290ced0",
+    "src-sha256": "0d4x1y9jhdxy5jn9kqp5avx157iqz4ma7903c3ys0njmnxhmjyf8"
 }