Merge branch 'develop' into milad/19372-fix-amount-input-error

doc/pipeline_process.md

@@ -8,7 +8,7 @@ The generally accepted requirements for its use are described below:
 - Once a PR is created, it moves to the ```REVIEW``` column where a review will be requested automatically.
 - You can also request a review inside the PR from a particular person if needed.
 - When creating a PR, do not forget to assign it to yourself.
-- Also in case the PR adds new functionality, a short description would be appreciated.
+- Also in case the PR adds new functionality, a description **MUST** be added.
 
 ### What if the work is still in progress?
 
@@ -28,26 +28,11 @@ Ready for testing, a PR should meet the following criteria:
 4. Has the label: `request-manual-qa` or `skip-manual-qa`.
 5. PRs **MUST** identify what area is affected and should have a description.
 
-**NOTE:** Make sure that QAs are OK with that
-
-### Adding `skip-manual-qa`
-
-- Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
-- The PR MUST have a proper reasoning why manual QA is skipped.
-- The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
-**From the perspective of a developer it means that once work on PR is finished:**
-
-1. It should be rebased to the latest `develop`. If there are conflicts - they should be resolved if possible.
-2. If the PR was in the `Contributor` column - it should be moved to `Review` column.
-3. Wait for the review.
-4. Make sure that after review and before requesting manual QA your PR is rebased to current develop.
-5. The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
-That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
-
-6. After that - PR will be taken into manual testing by the QA team.
 
 ### E2E tests and analyzing the results
 
+The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
+That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
 This step cannot be skipped. So, at least one comment from the `status-im-auto` bot with results is a prerequisite for moving forward.
 Information on how to analyze tests can be found [here](https://github.com/status-im/status-mobile/blob/develop/doc/how-to-launch-e2e.md).
 Tests might be flaky, as they depend on infrastructure - SauceLabs and Waku.
@@ -59,6 +44,20 @@ Please, respect this rule.**
 
 ## Testing PR
 
+### Adding `skip-manual-qa`
+
+**Do not hesitate to use a `skip-manual-qa`** if you're sure that it is a simple flow and you checked it. 
+- Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
+- The PR MUST have a proper reasoning why manual QA is skipped.
+- The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
+
+**NOTE:** Make sure that QAs are OK with that;
+
+Before merging PRs, please make sure that information is added about how you tested the PRs, that e2s have been passed and their results have been reviewed. 
+
+The QA team appreciates your help!
+
+
 ### Manual testing
 
 #### Prerequisites for manual testing
@@ -99,7 +98,7 @@ There are three possible scenarios when the design review is completed:
 ---
 **Notes:**
 - If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
-- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
+- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality (see `skip-manual-qa` label)
 ---        
 
 #### Why my PR is in `Contributor` column?

scripts/lint/re-frame-in-quo-components.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env sh
 
-INVALID_CHANGES=$(grep -E -r '(re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.)' --include '*.cljs' --include '*.clj' './src/quo')
+INVALID_CHANGES=$(grep -E -r '(/atom|re-frame/dispatch|rf/dispatch|re-frame/subscribe|rf/subscribe|rf/sub|<sub|>evt|status-im\.)' --include '*.cljs' --include '*.clj' './src/quo')
 
 if test -n "$INVALID_CHANGES"; then
-    echo "WARNING: re-frame, status-im are not allowed in quo components"
+    echo "WARNING: re-frame, status-im, reagent atoms are not allowed in quo components"
     echo ''
     echo "$INVALID_CHANGES"
     exit 1

src/legacy/status_im/bottom_sheet/sheets.cljs

@@ -3,7 +3,7 @@
     [legacy.status-im.bottom-sheet.view :as bottom-sheet]
     [legacy.status-im.ui.screens.about-app.views :as about-app]
     [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
-    [quo.theme :as theme]
+    [quo.theme]
     [react-native.core :as rn]
     [utils.re-frame :as rf]))
 
@@ -23,16 +23,15 @@
           (merge mobile-network-settings/offline-sheet)
 
           (= view :learn-more)
-          (merge about-app/learn-more))
-        page-theme (:theme options)]
+          (merge about-app/learn-more))]
 
     [:f>
      (fn []
        (rn/use-mount (fn []
                        (rn/hw-back-add-listener dismiss-bottom-sheet-callback)
                        (fn []
                          (rn/hw-back-remove-listener dismiss-bottom-sheet-callback))))
-       [theme/provider {:theme (or page-theme (theme/get-theme))}
+       [quo.theme/provider (or (:theme options))
         [bottom-sheet/bottom-sheet opts
          (when content
            [content (when options options)])]])]))

src/legacy/status_im/events.cljs

@@ -189,8 +189,8 @@
                :db                        (assoc db :screens/was-focused-once? true)}
 
               (not (get db :screens/was-focused-once?))
-              {:db (assoc db :screens/was-focused-once? true)})
-  ))
+              {:db (assoc db :screens/was-focused-once? true)})))
+
 
 ;;TODO :replace by named events
 (rf/defn set-event

src/legacy/status_im/ui/components/chat_icon/screen.cljs

@@ -8,7 +8,7 @@
     [legacy.status-im.ui.screens.profile.visibility-status.utils :as visibility-status-utils]
     [quo.components.avatars.user-avatar.style :as user-avatar.style]
     [quo.core :as quo]
-    [quo.theme :as theme]
+    [quo.theme]
     [re-frame.core :as re-frame.core]
     [react-native.core :as rn]
     [status-im.contexts.profile.utils :as profile.utils]
@@ -52,7 +52,8 @@
 
 (defn profile-photo-plus-dot-view
   [{:keys [public-key full-name customization-color photo-container photo-path community?]}]
-  (let [photo-container         (if (nil? photo-container)
+  (let [theme                   @(re-frame.core/subscribe [:theme])
+        photo-container         (if (nil? photo-container)
                                   styles/container-chat-list
                                   photo-container)
         size                    (:width photo-container)
@@ -71,8 +72,7 @@
                {:size             size
                 :full-name        full-name
                 :font-size        (get text-style :font-size)
-                :background-color (user-avatar.style/customization-color customization-color
-                                                                         (theme/get-theme))
+                :background-color (user-avatar.style/customization-color customization-color theme)
                 :indicator-size   0
                 :indicator-border 0
                 :indicator-color  "#000000"

src/legacy/status_im/ui/components/topbar.cljs

@@ -2,6 +2,7 @@
   (:require
     [legacy.status-im.ui.components.core :as quo]
     [quo.foundations.colors :as quo.colors]
+    [quo.theme]
     [re-frame.core :as re-frame]
     [react-native.safe-area :as safe-area]))
 
@@ -32,7 +33,8 @@
     :or   {border-bottom? true
            new-ui?        false}
     :as   props}]
-  (let [navigation (if (= navigation :none)
+  (let [theme      (quo.theme/use-theme)
+        navigation (if (= navigation :none)
                      nil
                      [(default-navigation modal? navigation)])]
     [quo/header
@@ -47,4 +49,5 @@
               {:right-accessories right-accessories})
             (when new-ui?
               {:background (quo.colors/theme-colors quo.colors/neutral-5
-                                                    quo.colors/neutral-95)}))]))
+                                                    quo.colors/neutral-95
+                                                    theme)}))]))

src/legacy/status_im/ui/screens/chat/message/legacy_style.cljs

@@ -46,22 +46,22 @@
    :color      colors/gray})
 
 (defn message-default-style
-  []
+  [theme]
   {:font-family    "Inter-Regular"
-   :color          (quo.colors/theme-colors quo.colors/neutral-100 quo.colors/white)
+   :color          (quo.colors/theme-colors quo.colors/neutral-100 quo.colors/white theme)
    :font-size      15
    :line-height    21.75
    :letter-spacing -0.135})
 
 ;; Markdown styles
 (defn default-text-style
-  []
+  [theme]
   {:max-font-size-multiplier react/max-font-size-multiplier
-   :style                    (message-default-style)})
+   :style                    (message-default-style theme)})
 
 (defn system-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style       assoc
           :color       colors/gray
           :line-height 20
@@ -70,65 +70,65 @@
           :font-weight "400"))
 
 (defn text-style
-  [content-type in-popover?]
+  [content-type in-popover? theme]
   (merge
    (when in-popover? {:number-of-lines 2})
    (cond
-     (= content-type constants/content-type-system-text)           (system-text-style)
-     (= content-type constants/content-type-system-pinned-message) (system-text-style)
-     :else                                                         (default-text-style))))
+     (= content-type constants/content-type-system-text)           (system-text-style theme)
+     (= content-type constants/content-type-system-pinned-message) (system-text-style theme)
+     :else                                                         (default-text-style theme))))
 
 (defn emph-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style
           assoc
           :font-style :italic))
 
 (defn emph-style
-  []
-  (emph-text-style))
+  [theme]
+  (emph-text-style theme))
 
 (defn strong-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style
           assoc
           :font-weight "700"))
 
 (defn outgoing-strong-text-style
-  []
-  (update (strong-text-style)
+  [theme]
+  (update (strong-text-style theme)
           :style
           assoc
           :color colors/white-persist))
 
 (defn strong-style
-  []
-  (outgoing-strong-text-style)
-  (strong-text-style))
+  [theme]
+  (outgoing-strong-text-style theme)
+  (strong-text-style theme))
 
 (defn strong-emph-style
-  []
-  (update (strong-style)
+  [theme]
+  (update (strong-style theme)
           :style
           assoc
           :font-style :italic))
 
 (defn strikethrough-style
-  []
-  (cond-> (update (default-text-style)
+  [theme]
+  (cond-> (update (default-text-style theme)
                   :style
                   assoc
                   :text-decoration-line :line-through)))
 
 (defn edited-style
-  []
+  [theme]
   (cond->
-    (update (default-text-style)
+    (update (default-text-style theme)
             :style
             assoc
-            :color (quo.colors/theme-colors quo.colors/neutral-40 quo.colors/neutral-50)
+            :color (quo.colors/theme-colors quo.colors/neutral-40 quo.colors/neutral-50 theme)
             :font-size 13
             :line-height 18.2
             :letter-spacing (typography/tracking 13))))
@@ -149,25 +149,25 @@
   (default-blockquote-style))
 
 (defn default-blockquote-text-style
-  []
-  (update (default-text-style)
+  [theme]
+  (update (default-text-style theme)
           :style
           assoc
           :line-height 19
           :font-size 14
           :color colors/black-transparent-50))
 
 (defn outgoing-blockquote-text-style
-  []
-  (update (default-blockquote-text-style)
+  [theme]
+  (update (default-blockquote-text-style theme)
           :style
           assoc
           :color colors/white-transparent-70-persist))
 
 (defn blockquote-text-style
-  []
-  (outgoing-blockquote-text-style)
-  (default-blockquote-text-style))
+  [theme]
+  (outgoing-blockquote-text-style theme)
+  (default-blockquote-text-style theme))
 
 (defn community-verified
   []