Fix: logo and community image banner not showing

https://github.com/status-im/status-go/compare/4d705ce1...6b1cac69

VERSION

@@ -1 +1 @@
-1.22.0
+1.21.0

doc/new-guidelines.md

@@ -90,28 +90,6 @@ 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

ios/StatusIm.xcodeproj/project.pbxproj

@@ -417,9 +417,7 @@
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
-						DevelopmentTeam = 8B5X2M6H2Y;
 						LastSwiftMigration = 1140;
-						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -843,9 +841,8 @@
 				BUNDLE_ID_SUFFIX = .debug;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
@@ -898,8 +895,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
-				PROVISIONING_PROFILE = "9da75626-9594-43d9-a827-0f6d43c28f54";
-				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -917,9 +913,8 @@
 				BUNDLE_ID_SUFFIX = "";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CUSTOM_PRODUCT_NAME = Status;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
@@ -964,8 +959,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
-				PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1";
-				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;

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

@@ -149,15 +149,11 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         this.getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("gethEvent", params);
     }
 
-    private File getPublicStorageDirectory() {
+    private File getLogsFile() {
         final Context context = this.getReactApplicationContext();
         // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
         // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
-        return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-
-    }
-    private File getLogsFile() {
-        final File pubDirectory = this.getPublicStorageDirectory();
+        final File pubDirectory = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
         final File logFile = new File(pubDirectory, gethLogFileName);
 
         return logFile;
@@ -1174,8 +1170,8 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
 
 
     @ReactMethod(isBlockingSynchronousMethod = true) 
-    public String logFileDirectory() {
-        return getPublicStorageDirectory().getAbsolutePath();
+    public String logFilePath() {
+        return getLogsFile().getAbsolutePath();
     }
 
     @ReactMethod(isBlockingSynchronousMethod = true)

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

@@ -882,7 +882,7 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(backupDisabledDataDir) {
     return rootUrl.path;
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFileDirectory) {
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(logFilePath) {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSURL *rootUrl =[[fileManager
                       URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask]

src/js/worklets/onboarding_carousel.js

@@ -1,47 +0,0 @@
-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,10 +293,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
     :createNativeWrapper      identity
     :default                  #js {}})
 
-(def react-native-redash
-  #js
-   {:clamp     nil
-    :withPause (fn [])})
+(def react-native-redash #js {:clamp nil})
 
 (def react-native-languages
   (clj->js {:default {:language            "en"
@@ -373,7 +370,6 @@ 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
@@ -411,7 +407,6 @@ 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/components/community/community_card_view.cljs

@@ -16,7 +16,7 @@
                  :height        230
                  :border-radius 20}
       :on-press on-press}
-     [rn/view {:style style/detail-container}
+     [rn/view {:flex 1}
       [rn/view (style/community-cover-container 60)
        [rn/image
         {:source cover
@@ -40,3 +40,4 @@
          {:type :card-view}]]
        [rn/view {:style (style/community-tags-position)}
         [community-view/community-tags tags]]]]]]])
+

src/quo2/components/community/community_list_view.cljs

@@ -46,7 +46,7 @@
     (merge {:style {:height        56
                     :border-radius 16}}
            props)
-    [rn/view {:style style/detail-container}
+    [rn/view {:flex 1}
      [rn/view (style/list-info-container)
       [community-icon/community-icon
        {:images community-icon} 32]

src/quo2/components/community/community_view.cljs

@@ -5,7 +5,6 @@
             [quo2.components.tags.permission-tag :as permission]
             [quo2.components.tags.tag :as tag]
             [quo2.foundations.colors :as colors]
-            [quo.gesture-handler :as gesture-handler] ;;TODO move to quo2
             [react-native.core :as rn]))
 
 (defn community-stats
@@ -42,18 +41,17 @@
 
 (defn community-tags
   [tags]
-  [gesture-handler/scroll-view
-   {:shows-horizontal-scroll-indicator false
-    :horizontal                        true}
+  [rn/view (style/community-tags-container)
    (for [{:keys [name emoji]} tags]
      ^{:key name}
      [rn/view {:margin-right 8}
       [tag/tag
-       {:size      24
-        :label     name
-        :type      :emoji
-        :labelled? true
-        :resource  emoji}]])])
+       {:size        24
+        :label       name
+        :type        :emoji
+        :labelled?   true
+        :scrollable? true
+        :resource    emoji}]])])
 
 (defn community-title
   [{:keys [title description size] :or {size :small}}]

src/quo2/components/community/style.cljs

@@ -22,9 +22,6 @@
                       colors/white
                       colors/neutral-90)})
 
-(def detail-container
-  {:flex 1})
-
 (defn stats-count-container
   []
   {:flex-direction :row
@@ -40,6 +37,10 @@
   {:flex-direction :row
    :align-items    :center})
 
+(defn community-tags-container
+  []
+  {:flex-direction :row})
+
 (defn card-stats-position
   []
   {:position :absolute

src/quo2/components/drawers/drawer_buttons/style.cljs

@@ -1,10 +1,7 @@
 (ns quo2.components.drawers.drawer-buttons.style
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.platform :as platform]))
+  (:require [quo2.foundations.colors :as colors]))
 
-(def outer-container
-  {:height        216
-   :border-radius 20})
+(def outer-container {:height 216})
 
 (def top-card
   {:flex                    1
@@ -12,9 +9,7 @@
    :padding-horizontal      20
    :border-top-left-radius  20
    :border-top-right-radius 20
-   :background-color        (if platform/ios?
-                              colors/neutral-80-opa-80-blur
-                              colors/neutral-80)})
+   :background-color        colors/neutral-80})
 
 (def bottom-card
   {:position                :absolute
@@ -26,7 +21,7 @@
    :padding-horizontal      20
    :border-top-left-radius  20
    :border-top-right-radius 20
-   :background-color        colors/white-opa-5})
+   :background-color        (colors/alpha colors/white 0.05)})
 
 (def bottom-container
   {:flex-direction  :row
@@ -40,14 +35,14 @@
    :width           28
    :justify-content :center
    :align-items     :center
-   :border-color    colors/white-opa-5})
+   :border-color    (colors/alpha colors/white 0.05)})
 
 (def bottom-text
   {:flex  1
-   :color colors/white-70-blur})
+   :color (colors/alpha colors/white 0.7)})
 
 (def top-text
-  {:color colors/white-70-blur})
+  {:color (colors/alpha colors/white 0.7)})
 
 (defn heading-text
   [gap]

src/quo2/components/drawers/drawer_buttons/view.cljs

@@ -3,7 +3,6 @@
             [quo2.components.icon :as icon]
             [quo2.components.markdown.text :as text]
             [quo2.foundations.colors :as colors]
-            [react-native.blur :as blur]
             [quo2.components.drawers.drawer-buttons.style :as style]))
 
 (defn render-bottom
@@ -71,7 +70,7 @@
     child-2           string, keyword or hiccup
    "
   [{:keys [container-style top-card bottom-card]} child-1 child-2]
-  [blur/ios-view
+  [rn/view
    {:style (merge container-style style/outer-container)}
    [card
     (merge {:gap   4

src/quo2/components/inputs/profile_input/view.cljs

@@ -6,7 +6,6 @@
     [quo2.components.inputs.title-input.view :as title-input]
     [quo2.foundations.colors :as colors]
     [react-native.core :as rn]
-    [react-native.platform :as platform]
     [react-native.hole-view :as hole-view]))
 
 (defn profile-input
@@ -19,29 +18,20 @@
     [rn/view
      {:style (style/container customization-color)}
      [rn/view
-      (if platform/ios?
-        [hole-view/hole-view
-         {:holes [{:x            33
-                   :y            23
-                   :width        24
-                   :height       24
-                   :borderRadius 12}]}
-         [user-avatar/user-avatar
-          (assoc image-picker-props
-                 :customization-color customization-color
-                 :full-name           (if (seq full-name)
-                                        full-name
-                                        placeholder)
-                 :status-indicator?   false
-                 :size                :medium)]]
-        [user-avatar/user-avatar
-         (assoc image-picker-props
-                :customization-color customization-color
-                :full-name           (if (seq full-name)
-                                       full-name
-                                       placeholder)
-                :status-indicator?   false
-                :size                :medium)])
+      [hole-view/hole-view
+       {:holes [{:x            33
+                 :y            23
+                 :width        24
+                 :height       24
+                 :borderRadius 12}]}
+       [user-avatar/user-avatar
+        (assoc image-picker-props
+               :customization-color customization-color
+               :full-name           (if (seq full-name)
+                                      full-name
+                                      placeholder)
+               :status-indicator?   false
+               :size                :medium)]]
       [buttons/button
        {:accessibility-label       :select-profile-picture-button
         :type                      :grey
@@ -57,7 +47,6 @@
      [rn/view {:style style/input-container}
       [title-input/title-input
        (merge title-input-props
-              {:blur?               true
-               :override-theme      :dark
+              {:override-theme      :dark
                :placeholder         placeholder
                :customization-color customization-color})]]]))

src/quo2/components/inputs/title_input/style.cljs

@@ -2,35 +2,34 @@
   (:require [quo2.foundations.colors :as colors]))
 
 (defn get-focused-placeholder-color
-  [blur? override-theme]
+  [blur?]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
-    (colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme))
-)
+    (colors/theme-colors colors/neutral-80-opa-20 (colors/alpha colors/white 0.2))
+    (colors/theme-colors colors/neutral-30 colors/neutral-60)))
 
 (defn get-placeholder-color
-  [blur? override-theme]
+  [blur?]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
+    (colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.3))
+    (colors/theme-colors colors/neutral-40 colors/neutral-50)))
 
 (defn- get-disabled-color
-  [blur? override-theme]
+  [blur?]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30)
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
+    (colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.3))
+    (colors/theme-colors colors/neutral-40 colors/neutral-50)))
 
 (defn- get-char-count-color
-  [blur? override-theme]
+  [blur?]
   (if blur?
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-40)
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
+    (colors/theme-colors colors/neutral-80-opa-40 (colors/alpha colors/white 0.4))
+    (colors/theme-colors colors/neutral-40 colors/neutral-50)))
 
 (defn get-selection-color
-  [customization-color blur? override-theme]
+  [customization-color blur?]
   (if blur?
-    (colors/theme-colors colors/neutral-100 colors/white override-theme)
-    (colors/custom-color customization-color (if (or (= :dark override-theme) colors/dark?) 60 50))))
+    (colors/theme-colors colors/neutral-100 colors/white)
+    (colors/custom-color customization-color (if colors/dark? 60 50))))
 
 (def text-input-container {:flex 1})
 
@@ -38,12 +37,12 @@
   [disabled? blur? override-theme]
   {:text-align-vertical :bottom
    :color               (if disabled?
-                          (get-disabled-color blur? override-theme)
+                          (get-disabled-color blur?)
                           (colors/theme-colors colors/neutral-100 colors/white override-theme))})
 
 (defn char-count
-  [blur? override-theme]
-  {:color (get-char-count-color blur? override-theme)})
+  [blur?]
+  {:color (get-char-count-color blur?)})
 
 (def container
   {:flex-direction  :row

src/quo2/components/inputs/title_input/view.cljs

@@ -45,21 +45,21 @@
           :editable (not disabled?)
           :max-length max-length
           :placeholder placeholder
-          :selection-color (style/get-selection-color customization-color blur? override-theme)
+          :selection-color (style/get-selection-color customization-color blur?)
           :placeholder-text-color (if @focused?
-                                    (style/get-focused-placeholder-color blur? override-theme)
-                                    (style/get-placeholder-color blur? override-theme))}]]
+                                    (style/get-focused-placeholder-color blur?)
+                                    (style/get-placeholder-color blur?))}]]
        [rn/view
         {:style style/counter-container}
         [text/text
          [text/text
-          {:style (style/char-count blur? override-theme)
+          {:style (style/char-count blur?)
            :size  :paragraph-2}
           (pad-0
            (str
             (count @value)))]
          [text/text
-          {:style (style/char-count blur? override-theme)
+          {:style (style/char-count blur?)
            :size  :paragraph-2}
           (str "/"
                (pad-0

src/quo2/components/navigation/page_nav.cljs

@@ -203,8 +203,8 @@
       }
    }
   "
-  [{:keys [container-style one-icon-align-left? horizontal-description?
-           align-mid? page-nav-color page-nav-background-uri
+  [{:keys [one-icon-align-left? horizontal-description? align-mid?
+           page-nav-color page-nav-background-uri
            mid-section
            left-section
            right-section-buttons]}]
@@ -222,14 +222,13 @@
          :left-icon               (:left-icon mid-section)
          :avatar                  (:avatar mid-section)}]
     [rn/view
-     {:style (cond-> (merge {:display            :flex
-                             :flex-direction     :row
-                             ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
-                             :align-items        :center
-                             :padding-horizontal 20
-                             :height             56
-                             :justify-content    :space-between}
-                            container-style)
+     {:style (cond-> {:display            :flex
+                      :flex-direction     :row
+                      ;;  iPhone 11 Pro's height in Figma divided by Component height 56/1125
+                      :align-items        :center
+                      :padding-horizontal 20
+                      :height             56
+                      :justify-content    :space-between}
                page-nav-background-uri (assoc :background-color page-nav-color)
                page-nav-color          (assoc :background page-nav-background-uri))}
      [rn/view

src/quo2/foundations/colors.cljs

@@ -117,7 +117,6 @@
 
 ;;;;Blur
 (def white-70-blur (alpha white 0.7))
-(def neutral-80-opa-1-blur (alpha "#192438" 0.1))
 (def neutral-5-opa-70-blur (alpha neutral-5 0.7))
 (def neutral-80-opa-80-blur (alpha "#192438" 0.8))
 (def neutral-90-opa-70-blur (alpha neutral-90 0.7))
@@ -128,7 +127,6 @@
 
 ;;Solid
 (def black "#000000")
-(def onboarding-header-black "#000716")
 
 ;;;;Primary
 

src/react_native/blur.cljs

@@ -1,10 +1,5 @@
 (ns react-native.blur
   (:require ["@react-native-community/blur" :as blur]
-            [react-native.platform :as platform]
-            [reagent.core :as reagent]
-            [react-native.core :as rn]))
+            [reagent.core :as reagent]))
 
 (def view (reagent/adapt-react-class (.-BlurView blur)))
-
-;; blur view is currently not working correctly on Android.
-(def ios-view (if platform/ios? view rn/view))

src/react_native/reanimated.cljs

@@ -9,7 +9,6 @@
                              withDelay
                              withSpring
                              withRepeat
-                             withSequence
                              withDecay
                              Easing
                              Keyframe
@@ -18,8 +17,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)
@@ -60,8 +59,6 @@
 (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/multiaccounts/biometric/core.cljs

@@ -125,28 +125,6 @@
  (fn [[cb options]]
    (authenticate-fx #(cb %) options)))
 
-(re-frame/reg-fx
- :biometric/enable-and-save-password
- (fn [{:keys [key-uid
-              masked-password
-              on-success
-              on-error]}]
-   (-> (keychain/save-user-password!
-        key-uid
-        masked-password)
-       (.then
-        (fn [_]
-          (keychain/save-auth-method!
-           key-uid
-           keychain/auth-method-biometric)))
-       (.then
-        (fn [_]
-          (when on-success
-            (on-success))))
-       (.catch (fn [error]
-                 (when on-error
-                   (on-error error)))))))
-
 (rf/defn update-biometric
   [{db :db :as cofx} biometric-auth?]
   (let [key-uid (or (get-in db [:multiaccount :key-uid])

src/status_im/multiaccounts/core.cljs

@@ -44,7 +44,6 @@
   (let [me? (= (:public-key current-multiaccount) identity)]
     (if me?
       [(or (:preferred-name current-multiaccount)
-           (:primary-name contact)
            (gfycat/generate-gfy identity))]
       [(:primary-name contact) (:secondary-name contact)])))
 

src/status_im/multiaccounts/login/core.cljs

@@ -365,25 +365,6 @@
   [_]
   (status/get-node-config #(re-frame/dispatch [::get-node-config-callback %])))
 
-(rf/defn redirect-to-root
-  "Decides which root should be initialised depending on user and app state"
-  [{:keys [db] :as cofx}]
-  (cond
-    (get db :local-pairing/completed-pairing?)
-    {:dispatch [:syncing/pairing-completed]}
-
-    (get db :onboarding-2/new-account?)
-    {:dispatch [:onboarding-2/finalize-setup]}
-
-    (get db :tos/accepted?)
-    (rf/merge
-     cofx
-     (multiaccounts/switch-theme nil :shell-stack)
-     (navigation/init-root :shell-stack))
-
-    :else
-    {:dispatch [:init-root :tos]}))
-
 (rf/defn get-settings-callback
   {:events [::get-settings-callback]}
   [{:keys [db] :as cofx} settings]
@@ -416,8 +397,7 @@
               (logging/set-log-level (:log-level multiaccount))
               (activity-center/notifications-fetch-pending-contact-requests)
               (activity-center/update-seen-state)
-              (activity-center/notifications-fetch-unread-count)
-              (redirect-to-root))))
+              (activity-center/notifications-fetch-unread-count))))
 
 (re-frame/reg-fx
  ::open-last-chat
@@ -492,6 +472,22 @@
         keychain/auth-method-biometric
         keychain/auth-method-password))))
 
+(defn redirect-to-root
+  "Decides which root should be initialised depending on user and app state"
+  [db]
+  (cond
+    (get db :local-pairing/completed-pairing?)
+    (re-frame/dispatch [:syncing/pairing-completed])
+
+    (get db :onboarding-2/new-account?)
+    (re-frame/dispatch [:navigate-to :enable-notifications])
+
+    (get db :tos/accepted?)
+    (re-frame/dispatch [:init-root :shell-stack])
+
+    :else
+    (re-frame/dispatch [:init-root :tos])))
+
 (rf/defn login-only-events
   [{:keys [db] :as cofx} key-uid password save-password?]
   (let [auth-method     (:auth-method db)
@@ -503,7 +499,8 @@
               {:db (assoc db :chats/loading? true)
                :json-rpc/call
                [{:method     "settings_getSettings"
-                 :on-success #(re-frame/dispatch [::get-settings-callback %])}]}
+                 :on-success #(do (re-frame/dispatch [::get-settings-callback %])
+                                  (redirect-to-root db))}]}
               (notifications/load-notification-preferences)
               (when save-password?
                 (keychain/save-user-password key-uid password))

src/status_im/native_module/core.cljs

@@ -628,6 +628,6 @@
   []
   (.keystoreDir ^js (status)))
 
-(defn log-file-directory
+(defn log-file-path
   []
-  (.logFileDirectory ^js (status)))
+  (.logFilePath ^js (status)))

src/status_im/node/core.cljs

@@ -165,7 +165,7 @@
              :MailserversConfig {:Enabled true}
              :EnableNTPSync true
              :WakuConfig
-             {:Enabled         (not wakuv2-enabled)
+             {:Enabled         true
               :BloomFilterMode waku-bloom-filter-mode
               :LightClient     true
               :MinimumPoW      0.000001}

src/status_im/utils/keychain/core.cljs

@@ -155,36 +155,19 @@
              (callback nil))))
         (callback nil))))))
 
-(defn save-user-password!
-  [key-uid password]
-  (save-credentials
-   key-uid
-   key-uid
-   (security/safe-unmask-data password)
-   #(when-not %
-      (log/error
-       (str "Error while saving password."
-            " "
-            "The app will continue to work normally, "
-            "but you will have to login again next time you launch it.")))))
-
-(defn save-auth-method!
-  [key-uid method]
-  (save-credentials
-   (str key-uid "-auth")
-   key-uid
-   method
-   #(when-not %
-      (log/error
-       (str "Error while saving auth method."
-            " "
-            "The app will continue to work normally, "
-            "but you will have to login again next time you launch it.")))))
-
 (re-frame/reg-fx
  :keychain/save-user-password
- (fn [[key-uid masked-password]]
-   (save-user-password! key-uid masked-password)))
+ (fn [[key-uid password]]
+   (save-credentials
+    key-uid
+    key-uid
+    (security/safe-unmask-data password)
+    #(when-not %
+       (log/error
+        (str "Error while saving password."
+             " "
+             "The app will continue to work normally, "
+             "but you will have to login again next time you launch it."))))))
 
 (re-frame/reg-fx
  :keychain/save-auth-method
@@ -195,7 +178,16 @@
               "method"
               method)
    (when-not (empty? key-uid) ; key-uid may be nil after restore from local pairing
-     (save-auth-method! key-uid method))))
+     (save-credentials
+      (str key-uid "-auth")
+      key-uid
+      method
+      #(when-not %
+         (log/error
+          (str "Error while saving auth method."
+               " "
+               "The app will continue to work normally, "
+               "but you will have to login again next time you launch it.")))))))
 
 (re-frame/reg-fx
  :keychain/save-keycard-keys

src/status_im/utils/money.cljs

@@ -225,8 +225,12 @@
 
 (defn format-members
   [count]
-  (if (> count 1000000)
+  (cond
+    (> count 1000000)
     (str (with-precision (/ count 1000000) 1) (i18n/label :t/M))
-    (if (and (> count 999) (< count 1000000))
-      (str (with-precision (/ count 1000) 1) (i18n/label :t/K))
-      count)))
+
+    (< 999 count 1000000)
+    (str (with-precision (/ count 1000) 1) (i18n/label :t/K))
+
+    :else
+    count))

src/status_im/utils/utils.cljs

@@ -126,11 +126,6 @@
   (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/bottom_sheet/sheets.cljs

@@ -7,7 +7,7 @@
             [status-im.ui.screens.multiaccounts.key-storage.views :as key-storage]
             [status-im.ui.screens.multiaccounts.recover.views :as recover.views]
             [status-im2.common.bottom-sheet.view :as bottom-sheet]
-            [status-im2.contexts.chat.menus.pinned-messages.view :as pinned-messages-menu]
+            [status-im2.contexts.chat.messages.pin.list.view :as pin.list]
             [react-native.core :as rn]))
 
 (defn bottom-sheet
@@ -50,8 +50,7 @@
           (merge key-storage/migrate-account-password)
 
           (= view :pinned-messages-list)
-          (merge {:content                   pinned-messages-menu/pinned-messages
-                  :bottom-safe-area-spacing? false}))]
+          (merge {:content pin.list/pinned-messages-list}))]
     [:f>
      (fn []
        (rn/use-effect (fn []

src/status_im2/common/resources.cljs

@@ -1,15 +1,20 @@
 (ns status-im2.common.resources)
 
 (def ui
-  {: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")})
+  {: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")})
 
 (def mock-images
   {:coinbase             (js/require "../resources/images/mock2/coinbase.png")

src/status_im2/common/scroll_page/view.cljs

@@ -89,7 +89,7 @@
 
 
 (defn display-picture
-  [scroll-height cover]
+  [scroll-height logo]
   (let [input-range (if platform/ios? [-67 10] [0 150])
         y           (reanimated/use-shared-value scroll-height)
         animation   (reanimated/interpolate y
@@ -104,7 +104,7 @@
     [reanimated/view
      {:style (style/display-picture-container animation)}
      [rn/image
-      {:source cover
+      {:source logo
        :style  style/display-picture}]]))
 
 (defn scroll-page
@@ -117,7 +117,7 @@
       [:<>
        [:f> scroll-page-header @scroll-height height name page-nav-right-section-buttons
         logo sticky-header top-nav title-colum navigate-back?]
-       [rn/scroll-view
+       [rn/flat-list
         {:content-container-style         (style/scroll-view-container
                                            (diff-with-max-min @scroll-height 16 0))
          :shows-vertical-scroll-indicator false
@@ -128,21 +128,25 @@
                                                                     event
                                                                     "nativeEvent.contentOffset.y")))
                                             (when on-scroll
-                                              (on-scroll @scroll-height)))}
-        (when cover-image
-          [rn/view {:style {:height 151}}
-           [rn/image
-            {:source cover-image
-             ;; Using negative margin-bottom as a workaround because on Android,
-             ;; ScrollView clips its children despite setting overflow: 'visible'.
-             ;; Related issue: https://github.com/facebook/react-native/issues/31218
-             :style  {:margin-bottom -16
-                      :flex          1}}]])
-        (when children
-          [rn/view
-           {:flex             1
-            :border-radius    (diff-with-max-min @scroll-height 16 0)
-            :background-color background-color}
-           (when cover-image
-             [:f> display-picture @scroll-height logo])
-           children])]])))
+                                              (on-scroll @scroll-height)))
+         :header                          [rn/view
+                                           (when cover-image
+                                             [rn/view {:style {:height 151}}
+                                              [rn/image
+                                               {:source cover-image
+                                                ;; Using negative margin-bottom as a workaround because
+                                                ;; on Android,
+                                                ;; ScrollView clips its children despite setting
+                                                ;; overflow: 'visible'.
+                                                ;; Related issue:
+                                                ;; https://github.com/facebook/react-native/issues/31218
+                                                :style  {:margin-bottom -16
+                                                         :flex          1}}]])
+                                           (when children
+                                             [rn/view
+                                              {:flex             1
+                                               :border-radius    (diff-with-max-min @scroll-height 16 0)
+                                               :background-color background-color}
+                                              (when cover-image
+                                                [:f> display-picture @scroll-height logo])
+                                              children])]}]])))

src/status_im2/config.cljs

@@ -138,12 +138,6 @@
    :url "#"
    :icons ["https://statusnetwork.com/img/press-kit-status-logo.svg"]})
 
-(def default-network-id
-  (get-in default-networks-by-id [default-network :config :NetworkId]))
-
-(def default-network-rpc-url
-  (get-in default-networks-by-id [default-network :config :UpstreamConfig :URL]))
-
 (def wallet-connect-project-id "87815d72a81d739d2a7ce15c2cfdefb3")
 
 (def delete-message-undo-time-limit-ms 4000)

src/status_im2/contexts/activity_center/events.cljs

@@ -552,7 +552,7 @@
                                {:icon       :placeholder
                                 :icon-color colors/primary-50-opa-40
                                 :title      (i18n/label :t/contact-request-accepted-toast
-                                                        {:name (or name (:alias message))})})
+                                                        {:name (:alias message)})})
 
                 :else
                 cofx))

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 (if (number? index) [(nth messages index)] []))
+           data                            (reagent/atom [(nth messages index)])
            scroll-index                    (reagent/atom index)
            transparent?                    (reagent/atom false)
            set-full-height?                (reagent/atom false)

src/status_im2/contexts/chat/lightbox/zoomable_image/constants.cljs

@@ -13,5 +13,3 @@
 (def ^:const velocity-factor 0.5)
 
 (def ^:const default-duration 300)
-
-(def ^:const default-dimension 300)

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

@@ -216,11 +216,10 @@
            curr-orientation                        (or (rf/sub [:lightbox/orientation])
                                                        orientation/portrait)
            portrait?                               (= curr-orientation orientation/portrait)
-           dimensions                              (utils/get-dimensions
-                                                    (or image-width c/default-dimension)
-                                                    (or image-height c/default-duration)
-                                                    curr-orientation
-                                                    args)
+           dimensions                              (utils/get-dimensions image-width
+                                                                         image-height
+                                                                         curr-orientation
+                                                                         args)
            animations                              {:scale         (anim/use-val c/min-scale)
                                                     :saved-scale   (anim/use-val c/min-scale)
                                                     :pan-x-start   (anim/use-val c/init-offset)

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

@@ -1,44 +0,0 @@
-(ns status-im2.contexts.chat.menus.pinned-messages.style
-  (:require [quo2.foundations.colors :as colors]))
-
-(def heading
-  {:margin-horizontal 20})
-
-(def heading-container
-  {:flex-direction    :row
-   :background-color  (colors/theme-colors colors/neutral-10 colors/neutral-80)
-   :border-radius     20
-   :align-items       :center
-   :align-self        :flex-start
-   :margin-horizontal 20
-   :padding           4
-   :margin-top        8})
-
-(def heading-text
-  {:margin-left  6
-   :margin-right 4})
-
-(def chat-name-text
-  {:margin-left  4
-   :margin-right 8})
-
-(defn list-footer
-  [bottom-inset]
-  {:height bottom-inset})
-
-(defn no-pinned-messages-container
-  [bottom-inset]
-  {:justify-content :center
-   :align-items     :center
-   :margin-top      20
-   :margin-bottom   bottom-inset})
-
-(def no-pinned-messages-icon
-  {:width           120
-   :height          120
-   :justify-content :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

@@ -1,73 +0,0 @@
-(ns status-im2.contexts.chat.menus.pinned-messages.view
-  (:require [quo2.core :as quo]
-            [quo2.foundations.colors :as colors]
-            [react-native.core :as rn]
-            [react-native.safe-area :as safe-area]
-            [status-im2.contexts.chat.messages.content.deleted.view :as content.deleted]
-            [status-im2.contexts.chat.messages.content.view :as message]
-            [status-im2.contexts.chat.menus.pinned-messages.style :as style]
-            [utils.i18n :as i18n]
-            [utils.re-frame :as rf]))
-
-(def list-key-fn #(or (:message-id %) (:value %)))
-
-(defn message-render-fn
-  [{:keys [deleted? deleted-for-me?] :as message} _ _ context]
-  ;; TODO (flexsurfer) probably we don't want reactions here
-  (if (or deleted? deleted-for-me?)
-    [content.deleted/deleted-message message context]
-    [message/message-with-reactions message context]))
-
-(defn pinned-messages
-  [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])
-        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]
-       [:f>
-        (fn []
-          (let [{window-height :height} (rn/use-window-dimensions)
-                bottom-inset            (:bottom insets)]
-            [rn/scroll-view
-             {:style               {:max-height (- window-height (:top insets))}
-              :accessibility-label :pinned-messages-menu}
-             [:<>
-              [quo/text
-               {:size   :heading-1
-                :weight :semi-bold
-                :style  style/heading}
-               (i18n/label :t/pinned-messages)]
-              (when community
-                [rn/view
-                 {:style style/heading-container}
-                 [rn/text {:style style/heading-text} (:name community)]
-                 [quo/icon
-                  :i/chevron-right
-                  {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)
-                   :size  12}]
-                 [rn/text
-                  {:style style/chat-name-text}
-                  (str "# " (:chat-name current-chat))]])]
-             (if (pos? (count pinned-messages))
-               [rn/flat-list
-                {:data        pinned-messages
-                 :render-data render-data
-                 :render-fn   message-render-fn
-                 :footer      [rn/view {:style (style/list-footer bottom-inset)}]
-                 :key-fn      list-key-fn
-                 :separator   quo/separator}]
-               [rn/view {:style (style/no-pinned-messages-container bottom-inset)}
-                [rn/view {:style style/no-pinned-messages-icon}
-                 [quo/icon :i/placeholder]]
-                [quo/text
-                 {:weight :semi-bold
-                  :style  style/no-pinned-messages-text}
-                 (i18n/label :t/no-pinned-messages)]
-                [quo/text {:size :paragraph-2}
-                 (i18n/label
-                  (if community
-                    :t/no-pinned-messages-community-desc
-                    :t/no-pinned-messages-desc))]])]))])]))

src/status_im2/contexts/chat/messages/composer/controls/view.cljs

@@ -46,7 +46,8 @@
    {:on-press (fn []
                 (permissions/request-permissions
                  {:permissions [:read-external-storage :write-external-storage]
-                  :on-allowed  #(rf/dispatch [:open-modal :photo-selector {:insets insets}])
+                  :on-allowed  #(rf/dispatch
+                                 [:open-modal :photo-selector {:insets insets}])
                   :on-denied   (fn []
                                  (background-timer/set-timeout
                                   #(utils-old/show-popup (i18n/label :t/error)

src/status_im2/contexts/chat/messages/content/text/view.cljs

@@ -13,7 +13,7 @@
   [units {:keys [type literal destination]} chat-id]
   (case (keyword type)
     :code
-    (conj units [quo/text {:style (merge style/block (style/code)) :weight :code} literal])
+    (conj units [rn/view {:style (merge style/block (style/code))} [quo/text {:weight :code} literal]])
 
     :emph
     (conj units [quo/text {:style {:font-style :italic}} literal])

src/status_im2/contexts/chat/messages/pin/list/view.cljs

@@ -0,0 +1,77 @@
+(ns status-im2.contexts.chat.messages.pin.list.view
+  (:require [quo2.core :as quo]
+            [quo2.foundations.colors :as colors]
+            [react-native.core :as rn]
+            [status-im2.contexts.chat.messages.content.deleted.view :as content.deleted]
+            [status-im2.contexts.chat.messages.content.view :as message]
+            [utils.i18n :as i18n]
+            [utils.re-frame :as rf]))
+
+(def list-key-fn #(or (:message-id %) (:value %)))
+
+(defn message-render-fn
+  [{:keys [deleted? deleted-for-me?] :as message} _ _ context]
+  ;; TODO (flexsurfer) probably we don't want reactions here
+  (if (or deleted? deleted-for-me?)
+    [content.deleted/deleted-message message context]
+    [message/message-with-reactions message context]))
+
+(defn pinned-messages-list
+  [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])
+        current-chat           (rf/sub [:chat-by-id chat-id])
+        {:keys [community-id]} current-chat
+        community              (rf/sub [:communities/community community-id])]
+    [rn/view {:accessibility-label :pinned-messages-list}
+     ;; TODO (flexsurfer) this should be a component in quo2
+     ;; https://github.com/status-im/status-mobile/issues/14529
+     [:<>
+      [quo/text
+       {:size   :heading-1
+        :weight :semi-bold
+        :style  {:margin-horizontal 20}}
+       (i18n/label :t/pinned-messages)]
+      (when community
+        [rn/view
+         {:style {:flex-direction    :row
+                  :background-color  (colors/theme-colors colors/neutral-10 colors/neutral-80)
+                  :border-radius     20
+                  :align-items       :center
+                  :align-self        :flex-start
+                  :margin-horizontal 20
+                  :padding           4
+                  :margin-top        8}}
+         [rn/text {:style {:margin-left 6 :margin-right 4}} (:name community)]
+         [quo/icon
+          :i/chevron-right
+          {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)
+           :size  12}]
+         [rn/text
+          {:style {:margin-left  4
+                   :margin-right 8}}
+          (str "# " (:chat-name current-chat))]])]
+     (if (pos? (count pinned-messages))
+       [rn/flat-list
+        {:data        pinned-messages
+         :render-data render-data
+         :render-fn   message-render-fn
+         :key-fn      list-key-fn
+         :separator   quo/separator}]
+       [rn/view
+        {:style {:justify-content :center
+                 :align-items     :center
+                 :margin-top      20}}
+        [rn/view
+         {:style {:width           120
+                  :height          120
+                  :justify-content :center
+                  :align-items     :center
+                  :border-width    1}} [quo/icon :i/placeholder]]
+        [quo/text
+         {:weight :semi-bold
+          :style  {:margin-top 20}}
+         (i18n/label :t/no-pinned-messages)]
+        [quo/text {:size :paragraph-2}
+         (i18n/label
+          (if community :t/no-pinned-messages-community-desc :t/no-pinned-messages-desc))]])]))

src/status_im2/contexts/chat/photo_selector/style.cljs

@@ -3,10 +3,10 @@
             [react-native.platform :as platform]))
 
 (defn gradient-container
-  [bottom-inset]
+  [insets]
   {:left     0
    :right    0
-   :height   (+ bottom-inset (if platform/ios? 65 85))
+   :height   (+ (:bottom insets) (if platform/ios? 65 85))
    :position :absolute
    :bottom   0})
 

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

@@ -31,7 +31,7 @@
      {:colors [:black :transparent]
       :start  {:x 0 :y 1}
       :end    {:x 0 :y 0}
-      :style  (style/gradient-container (:bottom insets))}
+      :style  (style/gradient-container insets)}
      [quo/button
       {:style               {:align-self        :stretch
                              :margin-horizontal 20

src/status_im2/contexts/communities/discover/view.cljs

@@ -4,12 +4,11 @@
             [quo2.core :as quo]
             [quo2.foundations.colors :as colors]
             [react-native.core :as rn]
-            [react-native.platform :as platform]
             [reagent.core :as reagent]
             [status-im2.common.resources :as resources]
             [status-im2.contexts.communities.menus.community-options.view :as options]
-            [status-im.ui.screens.communities.community :as community]
             [status-im.ui.components.react :as react]
+            [react-native.platform :as platform]
             [status-im2.common.scroll-page.view :as scroll-page]
             [status-im2.contexts.communities.discover.style :as style]
             [utils.re-frame :as rf]))
@@ -23,22 +22,27 @@
                                       :token-icon (resources/get-mock-image :status-logo)}]}]}})
 
 (defn community-list-item
-  [community-item _ _ {:keys [width view-type]}]
-  (let [item  (merge community-item
-                     (get mock-community-item-data :data))
-        cover {:uri (get-in (:images item) [:banner :uri])}]
+  [{:keys [id] :as community} _ _ {:keys [width view-type]}]
+  (let [community-item (merge
+                        community
+                        (get mock-community-item-data :data))
+        cover          {:uri (get-in (:images community) [:banner :uri])}]
     (if (= view-type :card-view)
-      [quo/community-card-view-item (assoc item :width width :cover cover)
-       #(rf/dispatch [:navigate-to :community-overview (:id item)])]
+      [quo/community-card-view-item (assoc community-item :width width :cover cover)
+       #(rf/dispatch [:navigate-to :community-overview (:id community)])]
       [quo/communities-list-view-item
        {:on-press      (fn []
-                         (rf/dispatch [:communities/load-category-states (:id item)])
+                         (rf/dispatch [:communities/load-category-states id])
                          (rf/dispatch [:dismiss-keyboard])
+<<<<<<< HEAD
                          (rf/dispatch [:navigate-to :community-overview (:id item)]))
+=======
+                         (rf/dispatch [:navigate-to :community {:community-id id}]))
+>>>>>>> 1675fef63 (Fix: community data not displayed)
         :on-long-press #(rf/dispatch
                          [:bottom-sheet/show-sheet
                           {:content (fn []
-                                      [options/community-options-bottom-sheet (:id item)])}])}])))
+                                      [options/community-options-bottom-sheet id])}])}])))
 
 (defn screen-title
   []
@@ -89,7 +93,6 @@
                        :label               (i18n/label :t/gated)
                        :accessibility-label :gated-communities-tab}]}]])
 
-
 (defn featured-list
   [communities view-type]
   (let [view-size (reagent/atom 0)]
@@ -105,13 +108,24 @@
            :horizontal                        true
            :keyboard-should-persist-taps      :always
            :shows-horizontal-scroll-indicator false
-           :nestedScrollEnabled               true
            :separator                         [rn/view {:width 12}]
            :data                              communities
            :render-fn                         community-list-item
            :render-data                       {:width     @view-size
                                                :view-type view-type}
-           :content-container-style           style/flat-list-container}])])))
+           :contentContainerStyle             style/flat-list-container}])])))
+
+(defn other-communities-list
+  [{:keys [communities view-type]}]
+  [rn/view style/other-communities-container
+   [rn/flat-list
+    {:key-fn                       :id
+     :keyboard-should-persist-taps :always
+     :separator                    [rn/view {:height 16}]
+     :data                         communities
+     :render-fn                    community-list-item
+     :contentContainerStyle        style/flat-list-container
+     :render-data                  {:view-type view-type}}]])
 
 (defn discover-communities-header
   [{:keys [featured-communities-count
@@ -122,41 +136,10 @@
    [screen-title]
    [featured-communities-header featured-communities-count]
    [featured-list featured-communities view-type]
-   [quo/separator {:style {:margin-horizontal 20}}]
+   [rn/view {:style {:margin-horizontal 20}}
+    [quo/separator]]
    [discover-communities-segments selected-tab false]])
 
-(defn other-communities-list
-  [{:keys [communities communities-ids view-type]}]
-  [rn/view {:style style/other-communities-container}
-   (map-indexed
-    (fn [inner-index item]
-      (let [community-id (when communities-ids item)
-            community    (if communities
-                           item
-                           (rf/sub [:communities/home-item community-id]))
-            cover        {:uri (get-in (:images item) [:banner :uri])}]
-        [rn/view
-         {:key           (str inner-index (:id community))
-          :margin-bottom 16}
-         (if (= view-type :card-view)
-           [quo/community-card-view-item
-            (merge community
-                   (get mock-community-item-data :data)
-                   {:cover cover})
-            #(rf/dispatch [:navigate-to :community-overview (:id community)])]
-           [quo/communities-list-view-item
-            {:on-press      (fn []
-                              (rf/dispatch [:communities/load-category-states (:id community)])
-                              (rf/dispatch [:dismiss-keyboard])
-                              (rf/dispatch [:navigate-to :community-overview (:id community)]))
-             :on-long-press #(rf/dispatch [:bottom-sheet/show-sheet
-                                           {:content (fn []
-                                                       ;; TODO implement with quo2
-                                                       [community/community-actions community])}])}
-            (merge community
-                   (get mock-community-item-data :data))])]))
-    (if communities communities communities-ids))])
-
 (defn communities-lists
   [selected-tab view-type]
   [rn/view {:style {:flex 1}}

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

@@ -5,12 +5,20 @@
   {: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,22 +1,26 @@
 (ns status-im2.contexts.onboarding.common.background.view
   (:require [react-native.core :as rn]
-            [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]))
+            [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]))
 
 (defn view
   [dark-overlay?]
-  [:f>
-   (fn []
-     (carousel.animation/initialize-animation)
+  [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?
      [rn/view
-      {: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}])])])
+      {:style style/background-blur-overlay}])])

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

@@ -1,50 +0,0 @@
-(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

@@ -1,73 +0,0 @@
-(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

@@ -1,95 +0,0 @@
-(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/style.cljs

@@ -1,10 +1,10 @@
-(ns status-im2.contexts.onboarding.intro.style
+(ns status-im2.contexts.onboarding.common.intro.style
   (:require
     [react-native.platform :as platform]
     [quo2.foundations.colors :as colors]))
 
 (def progress-bar-container
-  {:background-color :transparent
+  {:background-color colors/neutral-100
    :flex-direction   :row
    :margin-vertical  16})
 
@@ -26,12 +26,12 @@
    :left               0
    :right              0
    :z-index            2
-   :background-color   :transparent
+   :background-color   colors/neutral-100
    :padding-vertical   12
    :padding-horizontal 20})
 
 (def carousel-text
-  {:background-color :transparent
+  {:background-color colors/neutral-100
    :color            colors/white})
 
 (def page-container
@@ -39,13 +39,14 @@
    :justify-content :flex-end})
 
 (def page-image
-  {:position     :absolute
-   :top          0
-   :bottom       0
-   :left         0
-   :right        0
-   :width        "100%"
-   :aspect-ratio 1})
+  {:position         :absolute
+   :background-color colors/neutral-100
+   :top              0
+   :bottom           0
+   :left             0
+   :right            0
+   :width            "100%"
+   :aspect-ratio     1})
 
 (def text-container
   {:flex      1

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

@@ -0,0 +1,88 @@
+(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/create_profile/style.cljs

@@ -1,59 +1,25 @@
 (ns status-im2.contexts.onboarding.create-profile.style
-  (:require [react-native.platform :as platform]
-            [quo2.foundations.colors :as colors]))
+  (:require [quo2.foundations.colors :as colors]
+            [react-native.platform :as platform]))
 
 (def continue-button
-  {:width        "100%"
-   :margin-left  :auto
-   :margin-top   (if platform/android? :auto 0)
-   :margin-right :auto})
-
-(def button-container
   {:width         "100%"
-   :padding-left  20
-   :padding-right 20
-   :padding-top   (if platform/android? 0 12)
-   :align-self    :flex-end
-   :height        64})
-
-(def blur-button-container
-  (merge button-container
-         {:background-color colors/neutral-80-opa-1-blur}))
-
-(def view-button-container
-  (merge button-container {:margin-bottom 24}))
+   :margin-top    :auto
+   :margin-bottom 72
+   :margin-left   :auto
+   :margin-right  :auto
+   :align-self    :flex-end})
 
 (def page-container
-  {:position :absolute
-   :top      0
-   :bottom   0
-   :left     0
-   :right    0})
+  {: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 info-message
   {:margin-top 8})
-
-(def title
-  {:color         colors/white
-   :margin-top    12
-   :margin-bottom 20})
-
-(def color-title
-  {:color         colors/white-70-blur
-   :margin-top    20
-   :margin-bottom 16})
-
-(def content-container
-  {:flex               1
-   :padding-horizontal 20})
-
-(def input-container
-  {:flex          1
-   :align-items   :flex-start
-   :margin-bottom 24})
-
-(def profile-input-container
-  {:flex-direction  :row
-   :justify-content :center})

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

@@ -9,21 +9,18 @@
             [status-im2.contexts.onboarding.common.background.view :as background]
             [status-im2.contexts.onboarding.select-photo.method-menu.view :as method-menu]
             [utils.re-frame :as rf]
-            [oops.core :as oops]
-            [react-native.blur :as blur]
             [status-im2.constants :as c]))
 
 (defn navigation-bar
   []
   [rn/view {:style style/navigation-bar}
    [quo/page-nav
-    {:container-style {:padding-horizontal 0}
-     :align-mid?      true
-     :mid-section     {:type :text-only :main-text ""}
-     :left-section    {:type                :blur-bg
-                       :icon                :i/arrow-left
-                       :icon-override-theme :dark
-                       :on-press            #(rf/dispatch [:navigate-back])}}]])
+    {:align-mid?   true
+     :mid-section  {:type :text-only :main-text ""}
+     :left-section {:type                :blur-bg
+                    :icon                :i/arrow-left
+                    :icon-override-theme :dark
+                    :on-press            #(rf/dispatch [:navigate-back])}}]])
 
 (def emoji-regex
   (new
@@ -33,131 +30,96 @@
 (defn has-emojis [s] (re-find emoji-regex s))
 (def common-names ["Ethereum" "Bitcoin"])
 (defn has-common-names [s] (pos? (count (filter #(string/includes? s %) common-names))))
-(def special-characters-regex (new js/RegExp #"[^a-zA-Z\d\s-._]" "i"))
+(def special-characters-regex (new js/RegExp #"[^a-zA-Z\d\s-]" "i"))
 (defn has-special-characters [s] (re-find special-characters-regex s))
-(def min-length 5)
-(defn length-not-valid [s] (< (count (string/trim s)) min-length))
-(def valid-regex (new js/RegExp #"^[\w-\s]{5,24}$" "i"))
-(defn valid-name [s] (re-find valid-regex s))
 
 (defn validation-message
   [s]
   (cond
     (or (= s nil) (= s ""))      nil
+    (has-emojis s)               (i18n/label :t/are-not-allowed {:check (i18n/label :t/emojis)})
     (has-special-characters s)   (i18n/label :t/are-not-allowed
                                              {:check (i18n/label :t/special-characters)})
     (string/ends-with? s "-eth") (i18n/label :t/ending-not-allowed {:ending "-eth"})
-    (string/ends-with? s "_eth") (i18n/label :t/ending-not-allowed {:ending "_eth"})
-    (string/ends-with? s ".eth") (i18n/label :t/ending-not-allowed {:ending ".eth"})
     (has-common-names s)         (i18n/label :t/are-not-allowed {:check (i18n/label :t/common-names)})
-    (has-emojis s)               (i18n/label :t/are-not-allowed {:check (i18n/label :t/emojis)})
-    (length-not-valid s)         (i18n/label :t/name-must-have-at-least-characters
-                                             {:min-chars min-length})
-    (not (valid-name s))         (i18n/label :t/name-is-not-valid)
     :else                        nil))
 
-(defn button-container
-  [keyboard-shown? children]
-  (if keyboard-shown?
-    [blur/ios-view
-     {:style style/blur-button-container}
-     children]
-    [rn/view {:style style/view-button-container}
-     children]))
-
 (defn page
   [{:keys [image-path display-name color]}]
-  [:f>
-   (fn []
-     (let [full-name             (reagent/atom display-name)
-           keyboard-shown?       (reagent/atom false)
-           validation-msg        (reagent/atom (validation-message @full-name))
-           on-change-text        (fn [s]
-                                   (reset! validation-msg (validation-message s))
-                                   (reset! full-name (string/trim s)))
-           custom-color          (reagent/atom (or color c/profile-default-color))
-           profile-pic           (reagent/atom image-path)
-           on-change-profile-pic #(reset! profile-pic %)
-           on-change             #(reset! custom-color %)]
-       (fn []
-         (rn/use-effect
-          (let [will-show-listener (oops/ocall rn/keyboard
-                                               "addListener"
-                                               "keyboardWillShow"
-                                               #(swap! keyboard-shown? (fn [] true)))
-                will-hide-listener (oops/ocall rn/keyboard
-                                               "addListener"
-                                               "keyboardWillHide"
-                                               #(swap! keyboard-shown? (fn [] false)))]
-            (fn []
-              (fn []
-                (oops/ocall will-show-listener "remove")
-                (oops/ocall will-hide-listener "remove"))))
-          [])
-         [rn/view {:style style/page-container}
-          [rn/scroll-view
-           {:keyboard-should-persist-taps :always
-            :content-container-style      {:flex-grow 1}}
-           [rn/view {:style style/page-container}
-            [rn/view
-             {:style style/content-container}
-             [navigation-bar]
-             [quo/text
-              {:size   :heading-1
-               :weight :semi-bold
-               :style  style/title} (i18n/label :t/create-profile)]
-             [rn/view
-              {:style style/input-container}
-              [rn/view
-               {:style style/profile-input-container}
-               [quo/profile-input
-                {:customization-color @custom-color
-                 :placeholder         (i18n/label :t/your-name)
-                 :on-press            #(rf/dispatch
-                                        [:bottom-sheet/show-sheet
-                                         {:override-theme :dark
-                                          :content
-                                          (fn []
-                                            [method-menu/view on-change-profile-pic])}])
-                 :image-picker-props  {:profile-picture @profile-pic
-                                       :full-name       @full-name}
-                 :title-input-props   {:default-value  @full-name
-                                       :max-length     c/profile-name-max-length
-                                       :on-change-text on-change-text}}]]
-              (when @validation-msg
-                [quo/info-message
-                 {:type  :error
-                  :size  :default
-                  :icon  :i/info
-                  :style style/info-message}
-                 @validation-msg])
-              [quo/text
-               {:size  :paragraph-2
-                :style style/color-title}
-               (i18n/label :t/accent-colour)]
-              [quo/color-picker
-               {:blur?             true
-                :default-selected? :blue
-                :selected          @custom-color
-                :on-change         on-change}]]]]]
-          [rn/keyboard-avoiding-view {}
-           [button-container @keyboard-shown?
-            [quo/button
-             {:accessibility-label       :submit-create-profile-button
-              :type                      :primary
-              :override-background-color (colors/custom-color @custom-color 60)
-              :on-press                  (fn []
-                                           (rf/dispatch [:onboarding-2/profile-data-set
-                                                         {:image-path   @profile-pic
-                                                          :display-name @full-name
-                                                          :color        @custom-color}]))
-              :style                     style/continue-button
-              :disabled                  (or (not (seq @full-name)) @validation-msg)}
-             (i18n/label :t/continue)]]]])))])
+  (let [full-name             (reagent/atom display-name)
+        validation-msg        (reagent/atom (validation-message @full-name))
+        on-change-text        (fn [s]
+                                (reset! validation-msg (validation-message s))
+
+                                (reset! full-name s))
+        custom-color          (reagent/atom (or color c/profile-default-color))
+        profile-pic           (reagent/atom image-path)
+        on-change-profile-pic #(reset! profile-pic %)
+        on-change             #(reset! custom-color %)]
+    (fn []
+      [rn/view {:style style/page-container}
+       [navigation-bar]
+       [rn/view
+        {:style {:flex               1
+                 :padding-horizontal 20}}
+        [quo/text
+         {:size   :heading-1
+          :weight :semi-bold
+          :style  {:color         colors/white
+                   :margin-top    12
+                   :margin-bottom 20}} (i18n/label :t/create-profile)]
+        [rn/view
+         {:flex        1
+          :align-items :flex-start}
+
+         [rn/view
+          {:flex-direction  :row
+           :justify-content :center}
+          [quo/profile-input
+           {:customization-color @custom-color
+            :placeholder         (i18n/label :t/your-name)
+            :on-press            #(rf/dispatch
+                                   [:bottom-sheet/show-sheet
+                                    {:override-theme :dark
+                                     :content
+                                     (fn []
+                                       [method-menu/view on-change-profile-pic])}])
+            :image-picker-props  {:profile-picture @profile-pic
+                                  :full-name       @full-name}
+            :title-input-props   {:max-length     c/profile-name-max-length
+                                  :on-change-text on-change-text}}]]
+         (when @validation-msg
+           [quo/info-message
+            {:type  :error
+             :size  :default
+             :icon  :i/info
+             :style style/info-message}
+            @validation-msg])
+         [quo/text
+          {:size  :paragraph-2
+           :style {:color         colors/white-70-blur
+                   :margin-top    20
+                   :margin-bottom 16}} (i18n/label :t/accent-colour)]
+         [quo/color-picker
+          {:blur?             true
+           :default-selected? :blue
+           :selected          @custom-color
+           :on-change         on-change}]]
+        [quo/button
+         {:accessibility-label       :submit-create-profile-button
+          :type                      :primary
+          :override-background-color (colors/custom-color @custom-color 60)
+          :on-press                  #(rf/dispatch [:onboarding-2/profile-data-set
+                                                    {:image-path   @profile-pic
+                                                     :display-name @full-name
+                                                     :color        @custom-color}])
+          :style                     style/continue-button
+          :disabled                  (and (not (seq @full-name)) (not @validation-msg))}
+         (i18n/label :t/continue)]]])))
 
 (defn create-profile
   []
-  (let [onboarding-profile-data (rf/sub [:onboarding-2/profile])]
-    [:<>
+  [rn/view {:style {:flex 1}}
+   (let [onboarding-profile-data (rf/sub [:onboarding-2/profile])]
      [background/view true]
-     [page onboarding-profile-data]]))
+     [page onboarding-profile-data])])

src/status_im2/contexts/onboarding/events.cljs

@@ -1,17 +1,15 @@
 (ns status-im2.contexts.onboarding.events
   (:require
     [utils.re-frame :as rf]
-    [taoensso.timbre :as log]
     [re-frame.core :as re-frame]
     [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]
-    [status-im2.contexts.onboarding.profiles.view :as profiles.view]))
+    [utils.i18n :as i18n]))
 
 (re-frame/reg-fx
  :multiaccount/create-account-and-login
@@ -24,10 +22,10 @@
    (status/validate-mnemonic
     (security/safe-unmask-data mnemonic)
     (fn [result]
-      (let [{:keys [error keyUID]} (types/json->clj result)]
+      (let [{:keys [error]} (types/json->clj result)]
         (if (seq error)
           (when on-error (on-error error))
-          (on-success mnemonic keyUID)))))))
+          (on-success mnemonic)))))))
 
 (re-frame/reg-fx
  :multiaccount/restore-account-and-login
@@ -93,19 +91,18 @@
                          :wakuV2Nameserver         "1.1.1.1"
                          :logLevel                 (when log-enabled? config/log-level)
                          :logEnabled               log-enabled?
-                         :logFilePath              (status/log-file-directory)
+                         :logFilePath              (status/log-file-path)
                          :openseaAPIKey            config/opensea-api-key
                          :verifyTransactionURL     config/verify-transaction-url
                          :verifyENSURL             config/verify-ens-url
                          :verifyENSContractAddress config/verify-ens-contract-address
                          :verifyTransactionChainID config/verify-transaction-chain-id
-                         :upstreamConfig           config/default-network-rpc-url
-                         :networkId                config/default-network-id
-                         :currentNetwork           config/default-network
                          :previewPrivacy           config/blank-preview?}]
     {effect    request
      :dispatch [:navigate-to :generating-keys]
-     :db       (assoc db :onboarding-2/new-account? true)}))
+     :db       (-> db
+                   (dissoc :onboarding-2/profile)
+                   (assoc :onboarding-2/new-account? true))}))
 
 (rf/defn on-delete-profile-success
   {:events [:onboarding-2/on-delete-profile-success]}
@@ -124,28 +121,15 @@
   {:events [:onboarding-2/seed-phrase-entered]}
   [_ seed-phrase on-error]
   {:multiaccount/validate-mnemonic [seed-phrase
-                                    (fn [mnemonic key-uid]
-                                      (re-frame/dispatch [:onboarding-2/seed-phrase-validated
-                                                          mnemonic key-uid]))
+                                    #(re-frame/dispatch [:onboarding-2/seed-phrase-validated
+                                                         seed-phrase])
                                     on-error]})
 
 (rf/defn seed-phrase-validated
   {:events [:onboarding-2/seed-phrase-validated]}
-  [{: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]}))
+  [{:keys [db]} seed-phrase]
+  {: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]}
@@ -153,23 +137,3 @@
   ;; Restart the flow
   {:db       (dissoc db :onboarding-2/profile)
    :dispatch [:navigate-to :create-profile]})
-
-(rf/defn onboarding-new-account-finalize-setup
-  {:events [:onboarding-2/finalize-setup]}
-  [{:keys [db]}]
-  (let [masked-password    (get-in db [:onboarding-2/profile :password])
-        key-uid            (get-in db [:multiaccount :key-uid])
-        biometric-enabled? (=
-                            constants/auth-method-biometric
-                            (get-in db [:onboarding-2/profile :auth-method]))]
-
-    (cond-> {:db       (dissoc db :onboarding-2/profile)
-             :dispatch [:navigate-to :enable-notifications]}
-      biometric-enabled?
-      (assoc :biometric/enable-and-save-password
-             {:key-uid         key-uid
-              :masked-password masked-password
-              :on-success      #(log/debug "successfully saved biometric")
-              :on-error        #(log/error "failed to save biometrics"
-                                           {:key-uid key-uid
-                                            :error   %})}))))

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

@@ -1,37 +0,0 @@
-(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,13 +4,20 @@
 
 (def full-screen {:flex 1})
 
-(def content-container
-  {:padding-top (if platform/ios? 44 0)
-   :position    :absolute
-   :top         0
-   :bottom      0
-   :left        0
-   :right       0})
+(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 options-container
   {:padding-top        12

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

@@ -3,13 +3,20 @@
     [quo2.core :as quo]
     [react-native.core :as rn]
     [status-im.keycard.recovery :as keycard]
+    [status-im.multiaccounts.recover.core :as multiaccounts.recover]
     [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])]
@@ -39,6 +46,21 @@
        (i18n/label :t/experienced-web3)]]
 
      [rn/view {:style style/suboptions}
+      [quo/small-option-card
+       {:variant             :icon
+        :title               "Temporary (old) generate keys flow"
+        :subtitle            "generate keys"
+        :image               (resources/get-image :use-keycard)
+        :accessibility-label :generate-old-key
+        :on-press            #(rf/dispatch [:generate-and-derive-addresses])}]
+      [rn/view {:style style/space-between-suboptions}]
+      [quo/small-option-card
+       {:variant  :icon
+        :title    "Temporary (old) recover phrase flow"
+        :subtitle (i18n/label :t/use-recovery-phrase-subtitle)
+        :image    (resources/get-image :ethereum-address)
+        :on-press #(rf/dispatch [::multiaccounts.recover/enter-phrase-pressed])}]
+      [rn/view {:style style/space-between-suboptions}]
       [quo/small-option-card
        {:variant  :icon
         :title    (i18n/label :t/use-recovery-phrase)
@@ -56,7 +78,7 @@
 (defn new-to-status
   []
   [rn/view {:style style/full-screen}
-   [background/view true]
-   [rn/view {:style style/content-container}
+   [background-image]
+   [rn/view {:style style/layer-background}
     [navigation-bar/navigation-bar {:on-press-info #(js/alert "Info pressed")}]
     [sign-in-options]]])

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

@@ -5,7 +5,7 @@
             [taoensso.timbre :as log]
             [reagent.core :as reagent]
             [react-native.core :as rn]
-            [utils.transforms :as types]
+            [status-im.utils.types :as types]
             [utils.security.core :as security]
             [status-im.native-module.core :as status]
             [status-im2.contexts.onboarding.profiles.style :as style]
@@ -31,7 +31,7 @@
       :label               (i18n/label :t/add-existing-status-profile)
       :on-press            #(do
                               (rf/dispatch [:bottom-sheet/hide])
-                              (rf/dispatch [:navigate-to :sign-in]))
+                              (rf/dispatch [:navigate-to :new-to-status]))
       :accessibility-label :multi-profile}]]])
 
 (defn show-new-account-options
@@ -181,7 +181,7 @@
        :accessibility-label :forget-password-button
        :override-theme      :dark
        :style               style/forget-password-button}
-      (i18n/label :t/forgot-password)]
+      (i18n/label :t/forget-password)]
      [quo/button
       {:size                40
        :type                :primary
@@ -202,4 +202,4 @@
      [background/view true]
      (if @show-profiles?
        [profiles-section]
-       [login-section])]))
+       [login-section show-profiles?])]))

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,7 +216,9 @@
               :camera-options {:zoomMode :off}
               :scan-barcode   true
               :on-read-code   on-read-code}]
-            [background/view true])
+            [rn/image
+             {:style  (merge style/absolute-fill {:height height :width width})
+              :source (resources/get-image :intro-4)}])
           (conj hole-view-wrapper
                 [blur/view
                  {:style         style/absolute-fill

src/status_im2/contexts/quo_preview/tags/tag.cljs

@@ -83,7 +83,7 @@
                                 (:labelled? @state))
                    :resource  (if (= :emoji (:type @state))
                                 (resources/get-image :music)
-                                :i/placeholder)})]]]]])))
+                                :main-icons2/placeholder)})]]]]])))
 (defn preview-tag
   []
   [rn/view

src/status_im2/contexts/syncing/events.cljs

@@ -8,8 +8,7 @@
             [status-im.node.core :as node]
             [re-frame.core :as re-frame]
             [status-im.data-store.settings :as data-store.settings]
-            [status-im.utils.platform :as utils.platform]
-            [status-im2.constants :as constants]))
+            [status-im.utils.platform :as utils.platform]))
 
 (rf/defn local-pairing-completed
   {:events [:syncing/pairing-completed]}
@@ -55,25 +54,19 @@
 (rf/defn preparations-for-connection-string
   {:events [:syncing/get-connection-string-for-bootstrapping-another-device]}
   [{:keys [db]} entered-password]
-  (let [valid-password? (>= (count entered-password) constants/min-password-length)
-        show-sheet      (fn [connection-string]
-                          (rf/dispatch
-                           [:bottom-sheet/show-sheet
-                            {:show-handle? false
-                             :content      (fn []
-                                             [sheet/qr-code-view-with-connection-string
-                                              connection-string])}]))]
-    (if valid-password?
-      (let [sha3-pwd   (status/sha3 (str (security/safe-unmask-data entered-password)))
-            key-uid    (get-in db [:multiaccount :key-uid])
-            config-map (.stringify js/JSON
-                                   (clj->js {:senderConfig {:keyUID       key-uid
-                                                            :keystorePath ""
-                                                            :password     sha3-pwd
-                                                            :deviceType   utils.platform/os}
-                                             :serverConfig {:timeout 0}}))]
-        (status/get-connection-string-for-bootstrapping-another-device
-         config-map
-         #(show-sheet %)))
-      (show-sheet ""))))
-
+  (let [sha3-pwd   (status/sha3 (str (security/safe-unmask-data entered-password)))
+        key-uid    (get-in db [:multiaccount :key-uid])
+        config-map (.stringify js/JSON
+                               (clj->js {:senderConfig {:keyUID       key-uid
+                                                        :keystorePath ""
+                                                        :password     sha3-pwd
+                                                        :deviceType   utils.platform/os}
+                                         :serverConfig {:timeout 0}}))]
+    (status/get-connection-string-for-bootstrapping-another-device
+     config-map
+     (fn [connection-string]
+       (rf/dispatch
+        [:bottom-sheet/show-sheet
+         {:show-handle? false
+          :content      (fn []
+                          [sheet/qr-code-view-with-connection-string connection-string])}])))))

src/status_im2/navigation/roots.cljs

@@ -6,16 +6,16 @@
             [status-im2.navigation.state :as state]))
 
 (defn status-bar-options
-  [& [status-bar-theme]]
+  []
   ;; dark-mode? = After login we are going to use theme as per user's choice (colors/dark?)
   ;; but before login we only have dark mode (dark-mode? = true)
   (let [dark-mode? (if (= @state/root-id :shell-stack) (colors/dark?) true)]
     (if platform/android?
       {:navigationBar {:backgroundColor colors/neutral-100}
        :statusBar     {:backgroundColor :transparent
-                       :style           (or status-bar-theme (if dark-mode? :light :dark))
+                       :style           (if dark-mode? :light :dark)
                        :drawBehind      true}}
-      {:statusBar {:style (or status-bar-theme (if dark-mode? :light :dark))}})))
+      {:statusBar {:style (if dark-mode? :light :dark)}})))
 
 (defn topbar-options
   []
@@ -155,8 +155,7 @@
            {:stack {:id       :shell-stack
                     :children [{:component {:name    :shell-stack
                                             :id      :shell-stack
-                                            :options (merge (status-bar-options
-                                                             (if (colors/dark?) :light :dark))
+                                            :options (merge (status-bar-options)
                                                             {:topBar {:visible false}})}}]}}}
           :profiles
           {:root

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.intro.view :as intro]
+    [status-im2.contexts.onboarding.common.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]
-            [status-im.utils.currency :as currency]
-            [status-im.utils.money :as money]
+            [utils.i18n :as i18n]
             [status-im2.config :as config]
-            [utils.i18n :as i18n]))
+            [status-im.utils.currency :as currency]
+            [status-im.utils.money :as money]))
 
 (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 :usd))))
+   (get currency/currencies currency-id)))
 
 (defn filter-recipient-favs
   [search-filter {:keys [name]}]

src/utils/worklets/onboarding_carousel.cljs

@@ -1,11 +0,0 @@
-(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.142.5",
-    "commit-sha1": "7c2b5a39b370ceb9276a01b53cf9fb966bfe9d5b",
-    "src-sha256": "0rppkkkhhjzq6sykv34r3y3sslv821jjzd319f9bh3lybqqy5jp3"
+    "version": "v0.141.1",
+    "commit-sha1": "458f28178ca15732df8e6c806ef5326fad44427c",
+    "src-sha256": "1hhfswn17dja62rxkb572afd6fsx86wfxs4j666lhscdz7zzs4gx"
 }

test/appium/tests/__init__.py

@@ -50,7 +50,7 @@ pytest_config_global = dict()
 test_suite_data = TestSuiteData()
 appium_container = AppiumContainer()
 
-common_password = 'qwerty1234'
+common_password = 'qwerty'
 unique_password = 'unique' + get_current_time()
 pin = '121212'
 puk = '000000000000'

test/appium/tests/conftest.py

@@ -212,7 +212,7 @@ def pytest_configure(config):
                                 sauce.storage.upload(file_path)
                                 os.remove(file_path)
                                 break
-                            except (ConnectionError, RemoteDisconnected):
+                            except ConnectionError:
                                 sleep(10)
                     else:
                         sauce.storage.upload(config.getoption('apk'))

test/appium/tests/critical/chats/test_group_chat.py

@@ -154,8 +154,8 @@ class TestGroupChatMultipleDeviceMergedNewUI(MultipleSharedDeviceTestCase):
             run_in_parallel(
                 (
                     (sign_in_views[0].create_user, {'enable_notifications': True}),
-                    (sign_in_views[1].create_user, {'enable_notifications': True, 'username': "test user1"}),
-                    (sign_in_views[2].create_user, {'enable_notifications': True, 'username': "test user2"})
+                    (sign_in_views[1].create_user, {'enable_notifications': True}),
+                    (sign_in_views[2].create_user, {'enable_notifications': True})
                 )
             )
         )

test/appium/tests/critical/test_public_chat_browsing.py

@@ -494,12 +494,7 @@ class TestCommunityMultipleDeviceMerged(MultipleSharedDeviceTestCase):
                         'yotube_full': {
                             'url': 'https://www.youtube.com/watch?v=XN-SVmuJH2g&list=PLbrz7IuP1hrgNtYe9g6YHwHO6F3OqNMao',
                             'txt': 'Status & Keycard – Hardware-Enforced Security',
-                            'subtitle': 'YouTube'},
-                        'yotube_mobile': {
-                            'url': 'https://m.youtube.com/watch?v=Je7yErjEVt4',
-                            'txt': 'Status, your gateway to Ethereum',
-                            'subtitle': 'YouTube'},
-
+                            'subtitle': 'YouTube'}
                         # twitter link is temporary removed from check as current xpath locator in message.preview_title is not applicable for this type of links
                         # 'twitter': {
                         #     'url': 'https://twitter.com/ethdotorg/status/1445161651771162627?s=20',

test/appium/tests/medium/test_activity_center.py

@@ -95,7 +95,6 @@ class TestActivityCenterContactRequestMultipleDevicePR(MultipleSharedDeviceTestC
         [home.chats_tab.click() for home in [self.home_1, self.home_2]]
 
     @marks.testrail_id(702850)
-    @marks.xfail(reason="Blocked by 15500")
     def test_activity_center_contact_request_decline(self):
         self.device_1.put_app_to_background()
         self.device_2.just_fyi('Device2 sends a contact request to Device1 via Paste button and check user details')
@@ -184,8 +183,8 @@ class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase):
         self.drivers, self.loop = create_shared_drivers(2)
         self.device_1, self.device_2 = SignInView(self.drivers[0]), SignInView(self.drivers[1])
         self.loop.run_until_complete(
-            run_in_parallel(((self.device_1.create_user, {'username': 'user1'}),
-                             (self.device_2.create_user, {'username': 'user2'}))))
+            run_in_parallel(((self.device_1.create_user, ),
+                             (self.device_2.create_user,))))
         self.home_1, self.home_2 = self.device_1.get_home_view(), self.device_2.get_home_view()
         self.profile_1, self.profile_2 = self.home_1.get_profile_view(), self.home_2.get_profile_view()
         users = self.loop.run_until_complete(run_in_parallel(
@@ -332,7 +331,6 @@ class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
     @marks.testrail_id(702957)
-    @marks.xfail(reason="Blocked by 15500")
     def test_activity_center_mentions(self):
         self.home_1.jump_to_communities_home()
         self.home_2.jump_to_card_by_text('# %s' % self.channel_name)
@@ -367,7 +365,6 @@ class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase):
         self.errors.verify_no_errors()
 
     @marks.testrail_id(702958)
-    @marks.xfail(reason="Blocked by 15500")
     def test_activity_center_admin_notification_accept_swipe(self):
         self.home_2.just_fyi("Clearing history")
         self.home_2.jump_to_messages_home()
@@ -383,7 +380,7 @@ class TestActivityMultipleDevicePR(MultipleSharedDeviceTestCase):
         community_element = self.home_1.get_chat(community_name, community=True)
         self.community_1.share_community(community_element, self.default_username_2)
 
-        self.home_2.just_fyi("Request access to community")
+        self.home_1.just_fyi("Request access to community")
         self.home_2.jump_to_messages_home()
         self.chat_2 = self.home_2.get_chat(self.default_username_1).click()
         self.chat_2.element_by_text_part('View').click()

test/appium/views/base_view.py

@@ -595,11 +595,11 @@ class BaseView(object):
 
     def jump_to_messages_home(self):
         self.jump_to_button.click()
-        self.chats_tab.click_until_presence_of_element(self.jump_to_button)
+        self.chats_tab.click()
 
     def jump_to_communities_home(self):
         self.jump_to_button.click()
-        self.communities_tab.click_until_presence_of_element(self.jump_to_button)
+        self.communities_tab.click()
 
     def jump_to_card_by_text(self, text: str):
         self.jump_to_button.click()

test/appium/views/chat_view.py

@@ -637,7 +637,7 @@ class UnpinMessagePopUp(BaseElement):
 
 class PinnedMessagesList(BaseElement):
     def __init__(self, driver):
-        super().__init__(driver, xpath="//*[@content-desc='pinned-messages-menu']")
+        super().__init__(driver, xpath="//*[@content-desc='pinned-messages-list']")
 
     def get_pinned_messages_number(self):
         self.driver.info("Getting number of pinned messages inside pinned messages list element")

test/appium/views/sign_in_view.py

@@ -140,8 +140,11 @@ class SignInView(BaseView):
                                              xpath="(//android.widget.EditText[@content-desc='password-input'])[1]")
         self.confirm_your_password_input = EditBox(self.driver,
                                                    xpath="(//android.widget.EditText[@content-desc='password-input'])[2]")
+        self.enable_notifications_button = Button(self.driver, accessibility_id="enable-notifications-button")
+        self.maybe_later_button = Button(self.driver, accessibility_id="enable-notifications-later-button")
         self.privacy_policy_link = PrivacyPolicyLink(self.driver)
         self.terms_of_use_link = TermsOfUseLink(self.driver)
+        self.start_button = Button(self.driver, accessibility_id="welcome-button")
         self.keycard_storage_button = KeycardKeyStorageButton(self.driver)
         self.first_username_on_choose_chat_name = Text(self.driver,
                                                        xpath="//*[@content-desc='select-account-button-0']//android.widget.TextView[1]")
@@ -174,81 +177,60 @@ class SignInView(BaseView):
         self.continue_custom_seed_phrase_button = Button(self.driver, accessibility_id="continue-custom-seed-phrase")
         self.cancel_custom_seed_phrase_button = Button(self.driver, accessibility_id="cancel-custom-seed-phrase")
 
-        # New onboarding
-        self.generate_keys_button = Button(self.driver, translation_id="create-multiaccount")
-        self.profile_your_name_edit_box = EditBox(self.driver, accessibility_id="profile-title-input")
-        self.profile_continue_button = Button(self.driver, accessibility_id="submit-create-profile-button")
-        self.profile_password_edit_box = EditBox(self.driver, translation_id="password-creation-placeholder-1")
-        self.profile_repeat_password_edit_box = EditBox(self.driver, translation_id="password-creation-placeholder-2")
-        self.profile_confirm_password_button = Button(self.driver, translation_id="password-creation-confirm")
-        self.enable_biometric_maybe_later_button = Button(self.driver, translation_id="maybe-later")
-        self.enable_notifications_button = Button(self.driver, accessibility_id="enable-notifications-button")
-        self.maybe_later_button = Button(self.driver, accessibility_id="enable-notifications-later-button")
-        self.start_button = Button(self.driver, accessibility_id="welcome-button")
-        self.use_recovery_phrase_button = Button(self.driver, translation_id="use-recovery-phrase")
-        self.passphrase_edit_box = EditBox(self.driver, accessibility_id="use-recovery-phrase")
-
-    def set_password(self, password: str):
-        self.profile_password_edit_box.set_value(password)
-        self.profile_repeat_password_edit_box.click()
-        self.profile_repeat_password_edit_box.send_keys(password)
-        self.checkbox_button.scroll_to_element()
-        self.checkbox_button.double_click()
-        self.profile_confirm_password_button.click()
-
-    def set_profile(self, username: str, set_image=False):
-        self.profile_your_name_edit_box.set_value(username)
-        self.profile_continue_button.click_until_presence_of_element(self.profile_password_edit_box)
-        if set_image:
-            pass
-
-    def create_user(self, password=common_password, keycard=False, enable_notifications=False, second_user=False,
-                    username="test user"):
+    def create_user(self, password=common_password, keycard=False, enable_notifications=False, second_user=False):
         self.driver.info("## Creating new multiaccount (password:'%s', keycard:'%s', enable_notification: '%s')" %
                          (password, str(keycard), str(enable_notifications)), device=False)
         if not second_user:
-            self.i_m_new_in_status_button.click_until_presence_of_element(self.generate_keys_button)
-            self.generate_keys_button.click_until_presence_of_element(self.profile_your_name_edit_box)
-        self.set_profile(username)
-        self.set_password(password)
-        self.enable_biometric_maybe_later_button.wait_and_click(30)
-        # self.next_button.click_until_absense_of_element(self.element_by_translation_id("intro-wizard-title2"))
-        # if keycard:
-        #     keycard_flow = self.keycard_storage_button.click()
-        #     keycard_flow.confirm_pin_and_proceed()
-        #     keycard_flow.backup_seed_phrase()
-        # else:
-        #     self.next_button.click()
-        #     self.create_password_input.set_value(password)
-        #     self.confirm_your_password_input.set_value(password)
-        #     self.next_button.click()
+            self.i_m_new_in_status_button.click_until_presence_of_element(self.generate_key_button)
+            self.generate_key_button.click()
+
+        self.next_button.click_until_absense_of_element(self.element_by_translation_id("intro-wizard-title2"))
+        if keycard:
+            keycard_flow = self.keycard_storage_button.click()
+            keycard_flow.confirm_pin_and_proceed()
+            keycard_flow.backup_seed_phrase()
+        else:
+            self.next_button.click()
+            self.create_password_input.set_value(password)
+            self.confirm_your_password_input.set_value(password)
+            self.next_button.click()
         if enable_notifications:
             self.enable_notifications_button.click_until_presence_of_element(self.start_button)
         else:
             self.maybe_later_button.click_until_presence_of_element(self.start_button)
         self.start_button.click()
         self.chats_tab.wait_for_visibility_of_element(30)
+
         self.driver.info("## New multiaccount is created successfully!", device=False)
         return self.get_home_view()
 
-    def recover_access(self, passphrase: str, password: str = common_password+'1234', keycard=False,
-                       enable_notifications=False, second_user=False, username='Restore user', set_image=False):
+    def recover_access(self, passphrase: str, password: str = common_password, keycard=False,
+                       enable_notifications=False, second_user=False):
         self.driver.info("## Recover access(password:%s, keycard:%s)" % (password, str(keycard)), device=False)
-
         if not second_user:
-            self.i_m_new_in_status_button.click_until_presence_of_element(self.generate_keys_button)
-        self.use_recovery_phrase_button.click()
-        self.passphrase_edit_box.set_value(passphrase)
-        self.continue_button.click_until_presence_of_element(self.profile_your_name_edit_box)
-        self.set_profile(username, set_image)
-        self.set_password(password)
-        self.enable_biometric_maybe_later_button.wait_and_click(30)
+            self.accept_tos_checkbox.enable()
+        self.get_started_button.click_until_presence_of_element(self.access_key_button)
+        self.access_key_button.click()
+        self.enter_seed_phrase_button.click()
+        self.seedphrase_input.click()
+        self.seedphrase_input.set_value(passphrase)
+        self.next_button.click()
+        self.reencrypt_your_key_button.click()
+        if keycard:
+            keycard_flow = self.keycard_storage_button.click()
+            keycard_flow.confirm_pin_and_proceed()
+        else:
+            self.next_button.click()
+            self.create_password_input.set_value(password)
+            self.confirm_your_password_input.set_value(password)
+            self.next_button.click_until_presence_of_element(self.maybe_later_button)
+        self.maybe_later_button.wait_for_element(30)
         if enable_notifications:
             self.enable_notifications_button.click_until_presence_of_element(self.start_button)
         else:
             self.maybe_later_button.click_until_presence_of_element(self.start_button)
         self.start_button.click()
-        self.chats_tab.wait_for_visibility_of_element(30)
+        self.profile_button.wait_for_visibility_of_element(30)
         self.driver.info("## Multiaccount is recovered successfully!", device=False)
         return self.get_home_view()
 

translations/en.json

@@ -2030,7 +2030,7 @@
     "logged-in": "Logged in",
     "profiles-on-device": "Profiles on device",
     "profile-password": "Profile password",
-    "forgot-password": "Forgot password?",
+    "forget-password": "Forgot password?",
     "log-in": "Log in",
     "type-your-password": "Type your password",
     "oops-wrong-password": "Oops, wrong password!",
@@ -2054,7 +2054,5 @@
     "error-syncing-connection-failed": "Oops! Connection failed. Try again",
     "camera-permission-denied": "Permission denied",
     "enable-biometrics": "Enable biometrics",
-    "use-biometrics": "Use biometrics to fill in your password",
-    "name-must-have-at-least-characters": "Name must have at least {{min-chars}} characters",
-    "name-is-not-valid": "Name is not valid"
+    "use-biometrics": "Use biometrics to fill in your password"
 }