nix: upgrade xcode 11.4.1 to 11.5

Signed-off-by: Jakub Sokołowski <jakub@status.im>

.env

@@ -8,8 +8,7 @@ EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 HARDWALLET_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1

.env.e2e

@@ -6,8 +6,7 @@ EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 HARDWALLET_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=0
 PAIRING_POPUP_DISABLED=1
 PFS_ENCRYPTION_ENABLED=1

.env.jenkins

@@ -7,8 +7,7 @@ EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
 HARDWALLET_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1

.env.nightly

@@ -5,8 +5,7 @@ ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1

.env.release

@@ -5,8 +5,7 @@ ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL_STATUS_GO=
-LOG_LEVEL=info
+LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1

ci/Jenkinsfile.ios

@@ -1,7 +1,7 @@
 library 'status-react-jenkins@v1.1.7'
 
 pipeline {
-  agent { label 'macos-xcode-11.4.1' }
+  agent { label 'macos-xcode-11.5' }
 
   parameters {
     string(

ci/Jenkinsfile.macos

@@ -1,7 +1,7 @@
 library 'status-react-jenkins@v1.1.7'
 
 pipeline {
-  agent { label 'macos-xcode-11.4.1' }
+  agent { label 'macos-xcode-11.5' }
 
   parameters {
     string(

nix/overlay.nix

@@ -32,7 +32,7 @@ in {
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
   # Package version adjustments
-  xcodeWrapper = super.xcodeenv.composeXcodeWrapper { version = "11.4.1"; };
+  xcodeWrapper = super.xcodeenv.composeXcodeWrapper { version = "11.5"; };
   openjdk = super.pkgs.openjdk8_headless;
   nodejs = super.pkgs.nodejs-12_x;
 

src/status_im/constants.cljs

@@ -108,7 +108,7 @@
    :currency :usd
    :appearance 0
    :waku-enabled true
-   :log-level config/log-level-status-go})
+   :log-level config/log-level})
 
 (defn default-visible-tokens [chain]
   (get-in default-multiaccount [:wallet/visible-tokens chain]))

src/status_im/core.cljs

@@ -17,7 +17,8 @@
             [status-im.utils.error-handler :as error-handler]
             [status-im.utils.logging.core :as utils.logs]
             [status-im.utils.platform :as platform]
-            [status-im.utils.snoopy :as snoopy]))
+            [status-im.utils.snoopy :as snoopy]
+            [status-im.utils.config :as config]))
 
 (set! interop/next-tick js/setTimeout)
 (set! batching/fake-raf #(js/setTimeout % 0))
@@ -79,7 +80,7 @@
     :reagent-render views/main}))
 
 (defn init []
-  (utils.logs/init-logs)
+  (utils.logs/init-logs config/log-level)
   (error-handler/register-exception-handler!)
   (enableScreens)
   (re-frame/dispatch-sync [:init/app-started])

src/status_im/desktop/core.cljs

@@ -8,7 +8,6 @@
             [status-im.ui.components.react :as react]
             [status-im.utils.snoopy :as snoopy]
             [status-im.utils.error-handler :as error-handler]
-            [status-im.utils.logging.core :as utils.logs]
             [status-im.ui.screens.desktop.views :as desktop-views]
             [status-im.desktop.deep-links :as deep-links]
             [status-im.utils.config :as config]))
@@ -39,7 +38,6 @@
                              desktop-views/main)})))
 
 (defn init []
-  (utils.logs/init-logs)
   (error-handler/register-exception-handler!)
   (re-frame/dispatch-sync [:init/app-started])
   (.registerComponent ^js app-registry "StatusIm" #(reagent/reactify-component app-root))

src/status_im/ens/core.cljs

@@ -303,3 +303,18 @@
   (fx/merge cofx
             (set-username-candidate (get-in db [:ens/registration :username] ""))
             (navigation/navigate-to-cofx :ens-search {})))
+
+(fx/defn remove-username
+  {:events [::remove-username]}
+  [{:keys [db] :as cofx} name]
+  (let [names          (get-in db [:multiaccount :usernames] [])
+        preferred-name (get-in db [:multiaccount :preferred-name])
+        new-names      (remove #(= name %) names)]
+    (fx/merge cofx
+              (multiaccounts.update/multiaccount-update
+               :usernames new-names
+               {})
+              (when (= name preferred-name)
+                (multiaccounts.update/multiaccount-update
+                 :preferred-name (first new-names) {}))
+              (navigation/navigate-back))))

src/status_im/multiaccounts/login/core.cljs

@@ -195,7 +195,7 @@
               (contact/initialize-contacts)
               (stickers/init-stickers-packs)
               (mobile-network/on-network-status-change)
-              (logging/set-log-level multiaccount)
+              (logging/set-log-level (:log-level multiaccount))
               (multiaccounts/switch-preview-privacy-mode-flag))))
 
 (defn get-new-auth-method [auth-method save-password?]
@@ -256,7 +256,7 @@
                                              :mailserver-topics {}
                                              :default-mailserver true})
               (multiaccounts/switch-preview-privacy-mode-flag)
-              (logging/set-log-level multiaccount)
+              (logging/set-log-level (:log-level multiaccount))
               (when-not platform/desktop?
                 (initialize-wallet accounts nil)))))
 

src/status_im/ui/screens/chat/input/input.cljs

@@ -78,7 +78,6 @@
             cooldown-enabled?  [:chats/cooldown-enabled?]
             input-bottom-sheet [:chats/current-chat-ui-prop :input-bottom-sheet]
             one-to-one-chat?   [:current-chat/one-to-one-chat?]
-            public?            [:current-chat/public?]
             reply-message      [:chats/reply-message]
             sending-image      [:chats/sending-image]]
     (let [input-text-empty? (and (string/blank? (string/trim (or input-text "")))
@@ -90,7 +89,8 @@
          [send-image-view sending-image])
        [react/view {:style style/input-container}
         [basic-text-input input-text cooldown-enabled?]
-        (when (and input-text-empty? (not reply-message) (not public?))
+        ;; Disable images for all chats
+        (when (and input-text-empty? (not reply-message) false)
           [image/input-button (= :images input-bottom-sheet)])
         (when (and input-text-empty? mainnet? (not reply-message))
           [stickers/button (= :stickers input-bottom-sheet)])

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

@@ -38,7 +38,7 @@
    appender])
 
 (defview quoted-message
-  [_ {:keys [from text image]} outgoing current-public-key public?]
+  [_ {:keys [from text image]} outgoing current-public-key _]
   (letsubs [contact-name [:contacts/contact-name-by-identity from]]
     [react/view {:style (style/quoted-message-container outgoing)}
      [react/view {:style style/quoted-message-author-container}
@@ -48,8 +48,8 @@
        current-public-key
        (partial style/quoted-message-author outgoing)]]
      (if (and image
-              ;; Disabling images for public-chats
-              (not public?))
+              ;; Disabling images for all chats
+              false)
        [react/image {:style  {:width            56
                               :height           56
                               :background-color :black
@@ -298,7 +298,7 @@
                                          {:content (sheets/sticker-long-press message)
                                           :height  64}])}))
 
-(defn chat-message [{:keys [public? content content-type] :as message}]
+(defn chat-message [{:keys [content content-type] :as message}]
   (if (= content-type constants/content-type-command)
     [message.command/command-content message-content-wrapper message]
     (if (= content-type constants/content-type-system-text)
@@ -318,8 +318,8 @@
                               ;;TODO (perf) move to event
                               :source {:uri (contenthash/url (-> content :sticker :hash))}}]]
                (if (and (= content-type constants/content-type-image)
-                        ;; Disabling images for public-chats
-                        (not public?))
+                        ;; Disabling images for all chats
+                        false)
                  [react/touchable-highlight (image-message-press-handlers message)
                   [message-content-image message]]
                  [unknown-content-type message])))))])))

src/status_im/ui/screens/ens/views.cljs

@@ -509,15 +509,18 @@
           [section {:title   (i18n/label :t/key)
                     :content public-key}]])
        [react/view {:style {:margin-top 16 :margin-bottom 32}}
-        ;;TODO: re-enable once feature is developped
-        #_[list/big-list-item {:text          (i18n/label :t/ens-remove-username)
-                               :subtext       (i18n/label :t/ens-remove-hints)
-                               :text-color    colors/gray
+        ;;TODO this is temporary fix for accounts with failed txs
+        ;;we still need this for regular ens names (not pending) but we need to detach public key in the contract
+        (when pending?
+          [list/big-list-item {:text          (i18n/label :t/ens-remove-username)
+                               ;:subtext       (i18n/label :t/ens-remove-hints)
+                               :text-color    colors/red
                                :text-style    {:font-weight "500"}
                                :icon          :main-icons/close
-                               :icon-color    colors/gray
-                               :hide-chevron? true}]
-        (when-not custom-domain?
+                               :icon-color    colors/red
+                               :hide-chevron? true
+                               :action-fn     #(re-frame/dispatch [::ens/remove-username name])}])
+        (when (and (not custom-domain?) (not pending?))
           [react/view {:style {:margin-top 18}}
            [list/big-list-item {:text          (i18n/label :t/ens-release-username)
                                 :text-color    (if releasable?

src/status_im/utils/config.cljs

@@ -44,12 +44,7 @@
 
 ;; CONFIG VALUES
 (def log-level
-  (-> (get-config :LOG_LEVEL "error")
-      string/lower-case
-      keyword))
-(def log-level-status-go
-  (-> (get-config :LOG_LEVEL_STATUS_GO "")
-      string/upper-case))
+  (string/upper-case (get-config :LOG_LEVEL "")))
 (def fleet (get-config :FLEET "eth.staging"))
 (def default-network (get-config :DEFAULT_NETWORK))
 (def pow-target (js/parseFloat (get-config :POW_TARGET "0.0001")))

src/status_im/utils/logging/core.cljs

@@ -1,18 +1,18 @@
 (ns status-im.utils.logging.core
-  (:require [clojure.string :as clojure.string]
-            [re-frame.core :as re-frame]
+  (:require [re-frame.core :as re-frame]
             [status-im.native-module.core :as status]
             [status-im.utils.fx :as fx]
             [status-im.utils.types :as types]
             [status-im.utils.handlers :as handlers]
             [status-im.utils.email :as mail]
             [taoensso.timbre :as log]
-            [status-im.utils.config :as config]
             [status-im.i18n :as i18n]
             [status-im.utils.platform :as platform]
             [status-im.utils.build :as build]
             [status-im.transport.utils :as transport.utils]
-            [status-im.utils.datetime :as datetime]))
+            [status-im.utils.datetime :as datetime]
+            [clojure.string :as string]
+            [status-im.utils.config :as config]))
 
 (def report-email "error-reports@status.im")
 (def max-log-entries 1000)
@@ -22,17 +22,19 @@
   (when (>= (count @logs-queue) max-log-entries)
     (swap! logs-queue pop)))
 
-(defn init-logs []
-  (log/set-level! config/log-level)
-  (log/debug)
-  (log/merge-config!
-   {:output-fn (fn [& data]
-                 (let [res (apply log/default-output-fn data)]
-                   (add-log-entry res)
-                   res))}))
+(defn init-logs [level]
+  (when-not (string/blank? level)
+    (log/set-level! (-> level
+                        string/lower-case
+                        keyword))
+    (log/merge-config!
+     {:output-fn (fn [& data]
+                   (let [res (apply log/default-output-fn data)]
+                     (add-log-entry res)
+                     res))})))
 
 (defn get-js-logs []
-  (clojure.string/join "\n" @logs-queue))
+  (string/join "\n" @logs-queue))
 
 (re-frame/reg-fx
  :logs/archive-logs
@@ -44,18 +46,14 @@
 
 (re-frame/reg-fx
  :logs/set-level
- (fn [log-level]
-   (log/set-level! log-level)))
+ (fn [level]
+   (init-logs level)))
 
 (fx/defn set-log-level
-  [{:keys [db]}  multiaccount]
-  (let [log-level (if-let [level (get multiaccount :log-level)]
-                    (if (clojure.string/blank? level) "ERROR" level)
-                    config/log-level-status-go)]
-    {:db (assoc-in db [:multiaccount :log-level] log-level)
-     :logs/set-level (-> log-level
-                         clojure.string/lower-case
-                         keyword)}))
+  [{:keys [db]} log-level]
+  (let [log-level (or log-level config/log-level)]
+    {:db             (assoc-in db [:multiaccount :log-level] log-level)
+     :logs/set-level log-level}))
 
 (fx/defn send-logs
   [{:keys [db]}]
@@ -112,10 +110,10 @@
            :node-info :peers-summary]}]
   (let [build-number  (if platform/desktop? build/version build/build-no)
         build-version (str build/version " (" build-number ")")
-        separator (clojure.string/join (take 40 (repeat "-")))
+        separator (string/join (take 40 (repeat "-")))
         [enode-id ip-address port]
         (transport.utils/extract-url-components (:enode node-info))]
-    (clojure.string/join
+    (string/join
      "\n"
      (concat [(i18n/label :t/report-bug-email-template)]
              [separator

translations/ar.json

@@ -534,6 +534,7 @@
     "help-capitalized": "مساعدة",
     "help-center": "مركز المساعدة",
     "hide-content-when-switching-apps": "إخفاء معاينات الحالة  عند تبديل التطبيق",
+    "hide-content-when-switching-apps-ios": "إخفاء المعاينة",
     "history": "التاريخ",
     "hold-card": "امسك البطاقة في الخلف \n من هاتفك",
     "home": "الصفحة الرئيسية",
@@ -952,6 +953,7 @@
     "sent-at": "أرسلت في",
     "set-a-topic": "إنشاء موضوع",
     "set-currency": "ضبط العملة الافتراضية",
+    "set-custom-fee": "تعيين رسوم مخصصة",
     "set-dapp-access-permissions": "تعيين أذونات الوصول إلى DApp",
     "settings": "الإعدادات",
     "share": "مشاركه",
@@ -973,6 +975,7 @@
     "show-qr": "عرض رمز الاستجابة السريعة",
     "show-transaction-data": "إظهار بيانات المعاملات",
     "sign-and-send": "التوقيع والإرسال",
+    "sign-anyway": "تسجيل على أي حال",
     "sign-in": "فتح",
     "sign-message": "توقيع الرسالة",
     "sign-out": "تسجيل الخروج",
@@ -1085,6 +1088,8 @@
     "try-keeping-the-card-still": "حاول إبقاء البطاقة ثابتة",
     "turn-nfc-description": "تم تعطيل NFC على جهازك. يمكنك تمكينه في الإعدادات",
     "turn-nfc-on": "قم بتشغيل NFC للمتابعة",
+    "tx-fail-description1": "هذه المعاملة من المحتمل أن تفشل. قم بالتسجيل على مسؤوليتك الخاصة باستخدام رسوم الشبكة المخصصة.",
+    "tx-fail-description2": "هذه المعاملة من المحتمل أن تفشل. تعيين رسوم شبكة مخصصة للتوقيع على مسؤوليتك الخاصة.",
     "type": "نوع",
     "type-a-message": "اكتب رسالة...",
     "ulc-enabled": "تمكين ULC",

translations/de.json

@@ -921,6 +921,7 @@
     "sent-at": "Gesendet an",
     "set-a-topic": "Erstellen Sie ein Thema",
     "set-currency": "Standardwährung festlegen",
+    "set-custom-fee": "Benutzerdefinierte Gebühr festlegen",
     "set-dapp-access-permissions": "Festlegen von DApp-Zugriffsberechtigungen",
     "settings": "Einstellungen",
     "share": "Teilen",
@@ -942,6 +943,7 @@
     "show-qr": "QR-Code anzeigen",
     "show-transaction-data": "Transaktionsdetails anzeigen",
     "sign-and-send": "Signieren und senden",
+    "sign-anyway": "Trotzdem unterschreiben",
     "sign-in": "Freischalten",
     "sign-message": "Nachricht signieren",
     "sign-out": "Ausloggen",
@@ -1054,6 +1056,8 @@
     "try-keeping-the-card-still": "Versuchen Sie, die Karte ruhig zu halten",
     "turn-nfc-description": "NFC ist auf Ihrem Gerät deaktiviert. Sie können es in den Einstellungen aktivieren",
     "turn-nfc-on": "Schalten Sie NFC ein, um fortzufahren",
+    "tx-fail-description1": "Diese Transaktion wird wahrscheinlich scheitern. Die Unterzeichnung erfolgt auf eigenes Risiko unter Verwendung einer benutzerdefinierten Netzwerkgebühr.",
+    "tx-fail-description2": "Diese Transaktion wird wahrscheinlich scheitern. Legen Sie eine benutzerdefinierte Netzwerkgebühr fest, um auf eigenes Risiko zu unterzeichnen.",
     "type": "Typ",
     "type-a-message": "Geben Sie eine Nachricht ein...",
     "ulc-enabled": "ULC aktiviert",

translations/en.json

@@ -110,7 +110,7 @@
     "card-reseted": "Card has been reseted",
     "card-unpaired": "Card has been unpaired from current device",
     "change-fleet": "Change fleet to {{fleet}}",
-    "change-log-level": "Change log level to {{log-level}}",
+    "change-log-level": "Confirm and restart the app to change log level to {{log-level}}",
     "change-logging-enabled": "Are you sure you want to {{enable}} logging?",
     "change-passcode": "Change Passcode",
     "change-password": "Change Password",

translations/zh.json

@@ -913,6 +913,7 @@
     "sent-at": "发送于",
     "set-a-topic": "创建主题",
     "set-currency": "设置默认货币",
+    "set-custom-fee": "设置自定义费用",
     "set-dapp-access-permissions": "设置DApp访问权限",
     "settings": "设置",
     "share": "分享",
@@ -934,6 +935,7 @@
     "show-qr": "显示二维码",
     "show-transaction-data": "显示交易数据",
     "sign-and-send": "签名并发送",
+    "sign-anyway": "仍要签名",
     "sign-in": "解锁",
     "sign-message": "签名消息",
     "sign-out": "注销",
@@ -1046,6 +1048,8 @@
     "try-keeping-the-card-still": "保持卡不动",
     "turn-nfc-description": "设备已禁用NFC，请先在设置中启用NFC",
     "turn-nfc-on": "开启NFC",
+    "tx-fail-description1": "此交易可能失败。请根据自身风险承担能力设置自定义网络费。",
+    "tx-fail-description2": "此交易可能失败。请根据自身风险承担能力设置自定义网络费。",
     "type": "类型",
     "type-a-message": "输入讯息...",
     "ulc-enabled": "超轻客户端启用",

translations/zh_TW.json

@@ -913,6 +913,7 @@
     "sent-at": "發送於",
     "set-a-topic": "新增話題",
     "set-currency": "設置默認貨幣",
+    "set-custom-fee": "设置自定义费用",
     "set-dapp-access-permissions": "設定DApp訪問權限",
     "settings": "設定",
     "share": "分享",
@@ -934,6 +935,7 @@
     "show-qr": "顯示QR碼",
     "show-transaction-data": "顯示交易明細",
     "sign-and-send": "簽名並傳送",
+    "sign-anyway": "仍要签名",
     "sign-in": "解鎖",
     "sign-message": "簽署訊息",
     "sign-out": "登出",
@@ -1046,6 +1048,8 @@
     "try-keeping-the-card-still": "嘗試保持卡靜止",
     "turn-nfc-description": "您的設備上禁用了NFC。您可以在設定中啟用它",
     "turn-nfc-on": "開啟NFC以繼續",
+    "tx-fail-description1": "此交易可能失败。请根据自身风险承担能力设置自定义网络费。",
+    "tx-fail-description2": "此交易可能失败。请根据自身风险承担能力设置自定义网络费。",
     "type": "類型",
     "type-a-message": "輸入訊息...",
     "ulc-enabled": "啟用ULC",