Bump version to 1.12.2

Updated status-go version from branch to tag
Updated status-go version
2021-03-26 08:22:10 +01:00 · 2021-03-25 16:24:37 +00:00 · 2021-03-25 16:09:28 +00:00 · 2021-03-25 16:07:04 +00:00 · 2021-03-15 18:50:22 +01:00 · 2021-03-15 15:55:41 +01:00
13 changed files with 117 additions and 88 deletions
@@ -1 +1 @@
-1.12.0
+1.12.2
@@ -189,9 +189,12 @@
                :name                           topic
                :chat-name                      (str "#" topic)
                :group-chat                     true
-                :chat-type                      (if timeline?
-                                                  constants/timeline-chat-type
-                                                  constants/public-chat-type)
+                :chat-type                      (cond timeline?
+                                                      constants/timeline-chat-type
+                                                      profile-public-key
+                                                      constants/profile-chat-type
+                                                      :else
+                                                      constants/public-chat-type)
                :contacts                       #{}
                :public?                        true
                :might-have-join-time-messages? (get-in cofx [:db :multiaccount :use-mailservers?])
@@ -16,6 +16,17 @@
               (disj (get multiaccount :link-previews-enabled-sites #{}) site))
             {})))

+(fx/defn enable-all
+  {:events [::enable-all]}
+  [{{:keys [multiaccount]} :db :as cofx} link-previews-whitelist enabled?]
+  (fx/merge cofx
+            (multiaccounts.update/multiaccount-update
+             :link-previews-enabled-sites
+             (if enabled?
+               (into #{} (map :title link-previews-whitelist))
+               #{})
+             {})))
+
 (fx/defn load-link-preview-data
  {:events [::load-link-preview-data]}
  [cofx link]
@@ -61,7 +61,10 @@
  {:events [::recover-with-keycard-pressed]}
  [{:keys [db] :as cofx}]
  (fx/merge cofx
-            {:db                           (assoc-in db [:keycard :flow] :import)
+            {:db
+             (-> db
+                 (assoc-in [:keycard :flow] :import)
+                 (assoc :recovered-account? true))
             :keycard/check-nfc-enabled nil}
            (bottom-sheet/hide-bottom-sheet)
            (navigation/navigate-to-cofx :keycard-recovery-intro nil)))
@@ -272,7 +275,7 @@
   {:db (update-in db [:keycard :multiaccount]
                   (fn [multiacc]
                     (assoc multiacc
-                            :recovered true
+                            :recovered (get db :recovered-account?)
                            :name whisper-name
                            :identicon identicon)))}
   (create-keycard-multiaccount)))
@@ -95,7 +95,9 @@
  {:events [:multiaccounts.create.ui/intro-wizard]}
  [{:keys [db] :as cofx}]
  (fx/merge cofx
-            {:db (update db :keycard dissoc :flow)}
+            {:db (-> db
+                     (update :keycard dissoc :flow)
+                     (dissoc :restored-account?))}
            (prepare-intro-wizard)
            (navigation/navigate-to-cofx :create-multiaccount-generate-key nil)))

@@ -107,14 +109,21 @@
            (bottom-sheet/hide-bottom-sheet)
            (navigation/navigate-to-cofx :create-multiaccount-generate-key nil)))

+(fx/defn remove-recovery-flag [{:keys [db]}]
+  {:db (dissoc db :recovered-account?)})
+
 (fx/defn dec-step
  {:events [:intro-wizard/dec-step]}
  [{:keys [db] :as cofx}]
  (let  [step (get-in db [:intro-wizard :step])]
    (fx/merge cofx
-              (if (or (= step :enter-phrase) (= :generate-key step))
-                #(prepare-intro-wizard %)
-                {:db (assoc-in db [:intro-wizard :step] (decrement-step step))}))))
+              (when (= step :enter-phrase)
+                remove-recovery-flag)
+              (if (or (= step :enter-phrase)
+                      (= :generate-key step))
+                prepare-intro-wizard
+                (fn [_]
+                  {:db (assoc-in db [:intro-wizard :step] (decrement-step step))})))))

 (fx/defn intro-step-back
  {:events [:intro-wizard/navigate-back]}
@@ -131,14 +140,10 @@

 (fx/defn exit-wizard
  [{:keys [db] :as cofx}]
-  (let [recovered-account? (get-in db [:intro-wizard :recovering?])]
-    (log/info "exit-wizard" "recovered-account?" recovered-account?)
-    (fx/merge
-     cofx
-     {:db (-> db
-              (dissoc :intro-wizard)
-              (assoc :recovered-account? recovered-account?))}
-     (navigation/navigate-to-cofx :notifications-onboarding nil))))
+  (fx/merge
+   cofx
+   {:db (dissoc db :intro-wizard)}
+   (navigation/navigate-to-cofx :notifications-onboarding nil)))

 (fx/defn init-key-generation
  [{:keys [db] :as cofx}]
@@ -31,8 +31,11 @@
 (fx/defn enter-seed-pressed
  "User is logged out and probably wants to move multiaccount to Keycard. Navigate to enter seed phrase screen"
  {:events [::enter-seed-pressed]}
-  [cofx]
-  (navigation/navigate-to-cofx cofx :key-storage-stack {:screen :seed-phrase}))
+  [{:keys [db] :as cofx}]
+  (fx/merge
+   cofx
+   {:db (assoc db :recovered-account? true)}
+   (navigation/navigate-to-cofx :key-storage-stack {:screen :seed-phrase})))

 (fx/defn seed-phrase-input-changed
  {:events [::seed-phrase-input-changed]}
@@ -504,7 +504,7 @@
    (fx/merge
     cofx
     {:db (-> db
-              (dissoc :intro-wizard)
+              (dissoc :intro-wizard :recovered-account?)
              (update :keycard dissoc :application-info))}
     (open-login (select-keys multiaccount [:key-uid :name :public-key :identicon :images])))))

@@ -149,7 +149,8 @@
                    :weak-password?         true
                    :encrypt-with-password? true
                    :back-action            :intro-wizard/navigate-back
-                    :forward-action         :multiaccounts.recover/enter-phrase-next-pressed})
+                    :forward-action         :multiaccounts.recover/enter-phrase-next-pressed}
+                   :recovered-account? true)
            (update :keycard dissoc :flow))}
   (bottom-sheet/hide-bottom-sheet)
   (navigation/navigate-to-cofx :recover-multiaccount-enter-phrase nil)))
@@ -42,17 +42,18 @@
  [{:keys [title message icon user-info channel-id type]
    :as   notification
    :or   {channel-id "status-im-notifications"}}]
-  (pn-android/present-local-notification
-   (merge {:channelId channel-id
-           :title     title
-           :message   message
-           :showBadge false}
-          (when user-info
-            {:userInfo (bean/->js user-info)})
-          (when icon
-            {:largeIconUrl (:uri (react/resolve-asset-source icon))})
-          (when (= type "message")
-            notification))))
+  (when notification
+    (pn-android/present-local-notification
+     (merge {:channelId channel-id
+             :title     title
+             :message   message
+             :showBadge false}
+            (when user-info
+              {:userInfo (bean/->js user-info)})
+            (when icon
+              {:largeIconUrl (:uri (react/resolve-asset-source icon))})
+            (when (= type "message")
+              notification)))))

 (defn handle-notification-press [{{deep-link :deepLink} :userInfo
                                  interaction           :userInteraction}]
@@ -136,32 +137,33 @@
     {:keys [chat-type chat-id] :as chat} :chat
     {:keys [identicon]} :contact
     contact-id :contact-id}]
-   (let [contact-name @(re-frame/subscribe
-                        [:contacts/contact-name-by-identity contact-id])
-         group-chat?  (not= chat-type constants/one-to-one-chat-type)
-         title        (clojure.string/join
-                       " "
-                       (cond-> [contact-name]
-                         group-chat?
-                         (conj
-                          ;; TODO(rasom): to be translated
-                          "in")
+   (when (and chat-type chat-id)
+     (let [contact-name @(re-frame/subscribe
+                          [:contacts/contact-name-by-identity contact-id])
+           group-chat?  (not= chat-type constants/one-to-one-chat-type)
+           title        (clojure.string/join
+                         " "
+                         (cond-> [contact-name]
+                           group-chat?
+                           (conj
+                            ;; TODO(rasom): to be translated
+                            "in")

-                         group-chat?
-                         (conj
-                          (str (when (contains? #{constants/public-chat-type
-                                                  constants/community-chat-type}
-                                                chat-type)
-                                 "#")
-                               (get chat :name)))))]
-     {:type             "message"
-      :chatType         (str chat-type)
-      :from             title
-      :chatId           chat-id
-      :alias            title
-      :identicon        (or identicon (identicon/identicon contact-id))
-      :whisperTimestamp (get message :whisperTimestamp)
-      :text             (reply/get-quoted-text-with-mentions (:parsedText message))})))
+                           group-chat?
+                           (conj
+                            (str (when (contains? #{constants/public-chat-type
+                                                    constants/community-chat-type}
+                                                  chat-type)
+                                   "#")
+                                 (get chat :name)))))]
+       {:type             "message"
+        :chatType         (str chat-type)
+        :from             title
+        :chatId           chat-id
+        :alias            title
+        :identicon        (or identicon (identicon/identicon contact-id))
+        :whisperTimestamp (get message :whisperTimestamp)
+        :text             (reply/get-quoted-text-with-mentions (:parsedText message))}))))

 (defn create-notification
  ([notification]
@@ -24,28 +24,30 @@
 (views/defview link-previews-settings []
  (views/letsubs [link-previews-whitelist [:link-preview/whitelist]
                  link-previews-enabled-sites [:link-preview/enabled-sites]]
-    [react/view {:flex 1}
-     [topbar/topbar {:title (i18n/label :t/chat-link-previews)}]
-     [react/image {:source      (resources/get-theme-image :unfurl)
-                   :style       styles/link-preview-settings-image}]
-     [quo/text {:style {:margin 16}}
-      (i18n/label :t/you-can-choose-preview-websites)]
-     [quo/separator {:style {:margin-vertical  8}}]
+    (let [all-enabled (= (count link-previews-whitelist) (count link-previews-enabled-sites))]
+      [react/view {:flex 1}
+       [topbar/topbar {:title (i18n/label :t/chat-link-previews)}]
+       [react/image {:source      (resources/get-theme-image :unfurl)
+                     :style       styles/link-preview-settings-image}]
+       [quo/text {:style {:margin 16}}
+        (i18n/label :t/you-can-choose-preview-websites)]
+       [quo/separator {:style {:margin-vertical  8}}]

-     [react/view styles/whitelist-container
-      [quo/list-header (i18n/label :t/websites)]
+       [react/view styles/whitelist-container
+        [quo/list-header (i18n/label :t/websites)]

-      (when (> (count link-previews-whitelist) 1)
-        [quo/button {:on-press #(doseq [site (map :title link-previews-whitelist)]
-                                  (re-frame/dispatch
-                                   [::link-preview/enable site true]))
-                     :type     :secondary
-                     :style styles/enable-all}
-         (i18n/label :t/enable-all)])]
-
-     [list/flat-list
-      {:data      (vec (map (prepare-urls-items-data link-previews-enabled-sites) link-previews-whitelist))
-       :key-fn    (fn [_ i] (str i))
-       :render-fn quo/list-item
-       :footer [quo/text {:color :secondary
-                          :style {:margin 16}} (i18n/label :t/previewing-may-share-metadata)]}]]))
+        (when (> (count link-previews-whitelist) 1)
+          [quo/button {:on-press #(re-frame/dispatch [::link-preview/enable-all
+                                                      link-previews-whitelist
+                                                      (not all-enabled)])
+                       :type     :secondary
+                       :style styles/enable-all}
+           (if all-enabled
+             (i18n/label :t/disable-all)
+             (i18n/label :t/enable-all))])]
+       [list/flat-list
+        {:data      (vec (map (prepare-urls-items-data link-previews-enabled-sites) link-previews-whitelist))
+         :key-fn    (fn [_ i] (str i))
+         :render-fn quo/list-item
+         :footer [quo/text {:color :secondary
+                            :style {:margin 16}} (i18n/label :t/previewing-may-share-metadata)]}]])))
@@ -17,7 +17,7 @@
 (defn on-buy-crypto-pressed []
  (re-frame/dispatch [:navigate-to :buy-crypto]))

-(defn render-on-ramp [{:keys [name fees region logo-url description] :as on-ramp}]
+(defn render-on-ramp [{:keys [name fees logo-url description] :as on-ramp}]
  [react/touchable-highlight {:on-press #(re-frame/dispatch [:navigate-to :buy-crypto-website on-ramp])
                              :style {:flex 1}}
   [quo/list-item
@@ -28,9 +28,7 @@
                      [quo/text {} description]]
     :subtitle       [react/view {:style {:flex 1}}
                      [quo/text {:size :small
-                                 :color :secondary} fees]
-                      [quo/text {:size :small
-                                 :color :secondary} region]]
+                                 :color :secondary} fees]]
     :icon           [photos/photo logo-url {:size 40}]
     :left-side-alignment :flex-start
     :accessory      :text}]])
@@ -2,7 +2,7 @@
    "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
    "owner": "status-im",
    "repo": "status-go",
-    "version": "v0.73.1",
-    "commit-sha1": "d21cd6aba1521ba30b79cfe71cf89088a35322fc",
-    "src-sha256": "1if60j0kyw2llzia5xqqfk30iji8kvg5k7fq88q84nwx4pdpc04b"
+    "version": "v0.73.2+hotfix.2",
+    "commit-sha1": "27c8fbb35606cf8326a187efed3b55a5b1a57b0d",
+    "src-sha256": "1isvm9iv4ckviw44zhiyk4kj4p5ligl5q5mfx5n059gbbvprpdb4"
 }
@@ -1410,6 +1410,7 @@
    "previewing-may-share-metadata" : "Previewing links from these websites may share your metadata with their owners",
    "websites" : "Websites",
    "enable-all" : "Enable all",
+    "disable-all" : "Disable all",
    "warning-sending-to-contract-descr": "The address you entered is a smart contract, sending funds to this address may result in loss of funds. To interact with a DApp, open the DApp in the Status DApp Browser.",
    "dont-ask": "Don't ask me again",
    "enable-link-previews": "Enable link previews in chat?",
Author	SHA1	Message	Date
Andrea Maria Piana	4e8bb68f38	Bump version to 1.12.2	2021-03-26 08:22:10 +01:00
Samuel Hawksby-Robinson	43fc6498c2	Updated status-go version from branch to tag	2021-03-25 16:24:37 +00:00
Samuel Hawksby-Robinson	0b5dd66a1a	Updated status-go version	2021-03-25 16:09:28 +00:00
Samuel Hawksby-Robinson	a71dc8406e	Removed region from on-ramping we don't want it (#11920 ) * Removed region from on-ramping we don't want it * Updated status-go version * revert change make ios made to keycard version * Updated status-go version * Updated status-go version * Updated status-go version	2021-03-25 16:07:04 +00:00
Andrea Maria Piana	cd7b7ec9b7	Bump version to 1.12.1	2021-03-15 18:50:22 +01:00
Andrea Maria Piana	8be6bbba46	Upgrade status-go	2021-03-15 15:55:41 +01:00
andrey	1771c3cf59	[#11843 ] "Enable all" is disabled after relogin for 3 or 4 chat link previews after relogin Signed-off-by: andrey <motor4ik@gmail.com> (cherry picked from commit `51178ab1b2`)	2021-03-08 15:22:36 +01:00
andrey	6fa6f65c8e	[#11822 ] Own status updates are shown on other user profiles	2021-03-08 08:52:31 +01:00
Andrea Maria Piana	3d802115b9	Dont push notification if chat is not in cofx Signed-off-by: andrey <motor4ik@gmail.com>	2021-03-08 08:52:13 +01:00
Roman Volosovskyi	1632880302	[#11842 ] Fix login after restoring existing account	2021-03-05 15:01:48 +02:00
Roman Volosovskyi	b3f34d1ea9	[#11823 ] Fix balances fetching on recovering kk multiacc	2021-03-04 18:45:12 +02:00
@@ -1 +1 @@
 .12.0
 .12.2