Update version

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

VERSION

@@ -1 +1 @@
-0.14.0
+1.0.2

android/app/build.gradle

@@ -268,8 +268,7 @@ android {
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride =
+                output.versionCodeOverride = versionCodes.get(abi) + defaultConfig.versionCode
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
             }
 
         }

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

@@ -165,7 +165,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         return logFile;
     }
 
-    private String prepareLogsFile(final Context context) {
+    private File prepareLogsFile(final Context context) {
         final File logFile = getLogsFile();
 
         try {
@@ -185,7 +185,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
             String gethLogFilePath = logFile.getAbsolutePath();
             Log.d(TAG, gethLogFilePath);
 
-            return gethLogFilePath;
+            return logFile;
         } catch (Exception e) {
             Log.d(TAG, "Can't create geth.log file! " + e.getMessage());
         }
@@ -193,17 +193,24 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         return null;
     }
 
-    private String updateConfig(final String jsonConfigString, final String absRootDirPath, final String absKeystoreDirPath) throws JSONException {
+    private String updateConfig(final String jsonConfigString, final String absRootDirPath, final String keystoreDirPath) throws JSONException {
         final JSONObject jsonConfig = new JSONObject(jsonConfigString);
         // retrieve parameters from app config, that will be applied onto the Go-side config later on
-        final String absDataDirPath = pathCombine(absRootDirPath, jsonConfig.getString("DataDir"));
+        final String dataDirPath = jsonConfig.getString("DataDir");
         final Boolean logEnabled = jsonConfig.getBoolean("LogEnabled");
         final Context context = this.getReactApplicationContext();
-        final String gethLogFilePath = logEnabled ? prepareLogsFile(context) : null;
+        final File gethLogFile = logEnabled ? prepareLogsFile(context) : null;
+        String gethLogDirPath = null;
+        if (gethLogFile != null) {
+            gethLogDirPath = gethLogFile.getParent();
+        }
 
-        jsonConfig.put("DataDir", absDataDirPath);
+        Log.d(TAG, "log dir: " + gethLogDirPath + " log name: " + gethLogFileName);
-        jsonConfig.put("KeyStoreDir", absKeystoreDirPath);
+
-        jsonConfig.put("LogFile", gethLogFilePath);
+        jsonConfig.put("DataDir", dataDirPath);
+        jsonConfig.put("KeyStoreDir", keystoreDirPath);
+        jsonConfig.put("LogDir", gethLogDirPath);
+        jsonConfig.put("LogFile", gethLogFileName);
 
         return jsonConfig.toString();
     }
@@ -291,7 +298,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         }
 
         try {
-            final String updatedJsonConfigString = this.updateConfig(jsonConfigString, absRootDirPath, newKeystoreDir);
+            final String updatedJsonConfigString = this.updateConfig(jsonConfigString, absRootDirPath, "/keystore");
 
             prettyPrintConfig(updatedJsonConfigString);
 

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

@@ -325,8 +325,9 @@ RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
 
     NSLog(@"after remove lightchaindata");
 
-    NSURL *absTestnetKeystoreUrl = [absTestnetFolderName URLByAppendingPathComponent:@"keystore"];
+    NSString *keystore = @"keystore";
-    NSURL *absKeystoreUrl = [rootUrl URLByAppendingPathComponent:@"keystore"];
+    NSURL *absTestnetKeystoreUrl = [absTestnetFolderName URLByAppendingPathComponent:keystore];
+    NSURL *absKeystoreUrl = [rootUrl URLByAppendingPathComponent:keystore];
     if([fileManager fileExistsAtPath:absTestnetKeystoreUrl.path]){
         NSLog(@"copy keystore");
         [fileManager copyItemAtPath:absTestnetKeystoreUrl.path toPath:absKeystoreUrl.path error:nil];
@@ -341,19 +342,22 @@ RCT_EXPORT_METHOD(multiAccountDeriveAddresses:(NSString *)json
     NSString *relativeDataDir = [configJSON objectForKey:@"DataDir"];
     NSString *absDataDir = [rootUrl.path stringByAppendingString:relativeDataDir];
     NSURL *absDataDirUrl = [NSURL fileURLWithPath:absDataDir];
-    NSURL *absLogUrl = [absDataDirUrl URLByAppendingPathComponent:@"geth.log"];
+    NSURL *dataDirUrl = [NSURL fileURLWithPath:relativeDataDir];
-    [configJSON setValue:absDataDirUrl.path forKey:@"DataDir"];
+    NSURL *logUrl = [dataDirUrl URLByAppendingPathComponent:@"geth.log"];
-    [configJSON setValue:absKeystoreUrl.path forKey:@"KeyStoreDir"];
+    [configJSON setValue:@"/keystore" forKey:@"KeyStoreDir"];
-    [configJSON setValue:absLogUrl.path forKey:@"LogFile"];
+    [configJSON setValue:@"" forKey:@"LogDir"];
+    [configJSON setValue:logUrl.path forKey:@"LogFile"];
 
     NSString *resultingConfig = [configJSON bv_jsonStringWithPrettyPrint:NO];
     NSLog(@"node config %@", resultingConfig);
 
-    if(![fileManager fileExistsAtPath:absDataDirUrl.path]) {
+    if(![fileManager fileExistsAtPath:absDataDir]) {
-        [fileManager createDirectoryAtPath:absDataDirUrl.path withIntermediateDirectories:YES attributes:nil error:nil];
+        [fileManager createDirectoryAtPath:absDataDir
+               withIntermediateDirectories:YES attributes:nil error:nil];
     }
 
-    NSLog(@"logUrlPath %@", absLogUrl.path);
+    NSLog(@"logUrlPath %@ rootDir %@", logUrl.path, rootUrl.path);
+    NSURL *absLogUrl = [absDataDirUrl URLByAppendingPathComponent:@"geth.log"];
     if(![fileManager fileExistsAtPath:absLogUrl.path]) {
         NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
         [dict setObject:[NSNumber numberWithInt:511] forKey:NSFilePosixPermissions];

prod/status_im/i18n_resources.cljs

@@ -1,5 +1,6 @@
 (ns status-im.i18n-resources
-  (:require [status-im.react-native.js-dependencies :as rn-dependencies]))
+  (:require [status-im.react-native.js-dependencies :as rn-dependencies]
+            [clojure.string :as string]))
 
 (def default-device-language
   (keyword (.-language rn-dependencies/react-native-languages)))
@@ -78,7 +79,9 @@
     {:en (require-translation :en)}
     (not= :en default-device-language)
     (assoc default-device-language
-           (require-translation default-device-language))))
+           (require-translation (-> (name default-device-language)
+                                    (string/replace "-" "_")
+                                    keyword)))))
 
 (defn load-language [lang]
   (let [lang-key (valid-language (keyword lang))]

src/status_im/constants.cljs

@@ -43,6 +43,8 @@
 
 (def system "system")
 
+(def mainnet-rpc-url "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a")
+
 (def mainnet-networks
   [{:id             "mainnet_rpc",
     :etherscan-link "https://etherscan.io/address/",
@@ -50,7 +52,7 @@
     :config         {:NetworkId      (ethereum/chain-keyword->chain-id :mainnet)
                      :DataDir        "/ethereum/mainnet_rpc"
                      :UpstreamConfig {:Enabled true
-                                      :URL     "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a"}}}])
+                                      :URL mainnet-rpc-url}}}])
 
 (def sidechain-networks
   [{:id     "xdai_rpc",

src/status_im/contact/core.cljs

@@ -178,39 +178,15 @@
      :insert-gfycats    [[public-key [:contacts/contacts public-key :name]]
                          [public-key [:contacts/contacts public-key :alias]]]}))
 
-(defn add-ens-names [contacts names]
-  (reduce-kv (fn [acc public-key-keyword result]
-               (let [verified   (:verified result)
-                     error      (:error result)
-                     ens-name   (:name result)
-                     ens-verified-at (:verifiedAt result)
-                     public-key (str "0x" (name public-key-keyword))
-                     contact    (contact.db/public-key->contact contacts public-key)]
-
-                 (if error
-                   (assoc acc public-key contact)
-                   (assoc acc public-key
-                          (assoc contact
-                                 ;; setting the name for now as ens-verification is not enabled because of geth 1.9 upgrade
-                                 :name ens-name
-                                 :ens-verified-at ens-verified-at
-                                 :ens-verified verified)))))
-             (or contacts {})
-             names))
-
-(fx/defn names-verified
-  {:events [:contacts/ens-names-verified]}
-  [{:keys [db]} names]
-  {:db (update db :contacts/contacts add-ens-names names)})
-
 (fx/defn name-verified
   {:events [:contacts/ens-name-verified]}
-  [{:keys [db] :as cofx} public-key ens-name]
+  [{:keys [db now] :as cofx} public-key ens-name]
   (fx/merge cofx
             {:db (update-in db [:contacts/contacts public-key]
                             merge
                             {:name            ens-name
-                             :ens-verified-at (quot (time/timestamp) 1000)
+                             :last-ens-clock-value now
+                             :ens-verified-at now
                              :ens-verified    true})}
 
             (upsert-contact {:public-key public-key})))

src/status_im/data_store/contacts.cljs

@@ -24,6 +24,8 @@
                                 :tributeToTalk :tribute-to-talk
                                 :ensVerifiedAt :ens-verified-at
                                 :ensVerified :ens-verified
+                                :ensVerificationRetries :ens-verification-retries
+                                :lastENSClockValue :last-ens-clock-value
                                 :systemTags :system-tags
                                 :lastUpdated :last-updated})))
 
@@ -34,6 +36,8 @@
       (clojure.set/rename-keys {:public-key :id
                                 :ens-verified :ensVerified
                                 :ens-verified-at :ensVerifiedAt
+                                :last-ens-clock-value :lastENSClockValue
+                                :ens-verification-retries :ensVerificationRetries
                                 :photo-path :photoPath
                                 :tribute-to-talk :tributeToTalk
                                 :system-tags :systemTags

src/status_im/ens/core.cljs

@@ -3,6 +3,7 @@
             [re-frame.core :as re-frame]
             [status-im.ens.db :as ens.db]
             [taoensso.timbre :as log]
+            [status-im.utils.datetime :as datetime]
             [status-im.multiaccounts.update.core :as multiaccounts.update]
             [status-im.multiaccounts.model :as multiaccounts.model]
             [status-im.ethereum.abi-spec :as abi-spec]
@@ -42,6 +43,11 @@
  (fn [[registry name cb]]
    (resolver/pubkey registry name cb)))
 
+(re-frame/reg-fx
+ ::get-expiration-time
+ (fn [[registrar label-hash cb]]
+   (stateofus/get-expiration-time registrar label-hash cb)))
+
 (fx/defn set-state
   {:events [::name-resolved]}
   [{:keys [db]} username state]
@@ -249,15 +255,33 @@
   [{:keys [db]} username public-key]
   {:db (assoc-in db [:ens/names username :public-key] public-key)})
 
+(fx/defn store-expiration-date
+  {:events [::get-expiration-time-success]}
+  [{:keys [now db]} username timestamp]
+  {:db (-> db
+           (assoc-in [:ens/names username :expiration-date]
+                     (datetime/timestamp->year-month-day-date timestamp))
+           (assoc-in [:ens/names username :releasable?] (<= timestamp now)))})
+
 (fx/defn navigate-to-name
   {:events [::navigate-to-name]}
   [{:keys [db] :as cofx} username]
-  (let [registry (get ens/ens-registries (ethereum/chain-keyword db))]
+  (let [chain (ethereum/chain-keyword db)
+        registry (get ens/ens-registries chain)
+        registrar (get stateofus/registrars chain)]
     (fx/merge cofx
-              {::resolve-address [registry username
+              {::get-expiration-time
-                                  #(re-frame/dispatch [::address-resolved username %])]
+               [registrar
-               ::resolve-pubkey  [registry username
+                (-> username
-                                  #(re-frame/dispatch [::public-key-resolved username %])]}
+                    stateofus/username
+                    ethereum/sha3)
+                #(re-frame/dispatch [::get-expiration-time-success username %])]
+               ::resolve-address
+               [registry username
+                #(re-frame/dispatch [::address-resolved username %])]
+               ::resolve-pubkey
+               [registry username
+                #(re-frame/dispatch [::public-key-resolved username %])]}
               (navigation/navigate-to-cofx :ens-name-details username))))
 
 (fx/defn start-registration

src/status_im/ethereum/ens.cljs

@@ -11,9 +11,9 @@
 
 ;; this is the addresses of ens registries for the different networks
 (def ens-registries
-  {:mainnet "0x314159265dd8dbb310642f98f50c066173c1259b"
+  {:mainnet "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"
-   :testnet "0x112234455c3a32fd11230c42e7bccd4a84e02010"
+   :testnet "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"
-   :rinkeby "0xe7410170f87102DF0055eB195163A03B7F2Bff4A"})
+   :rinkeby "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e"})
 
 (def default-namehash "0000000000000000000000000000000000000000000000000000000000000000")
 (def default-address "0x0000000000000000000000000000000000000000")
@@ -163,4 +163,4 @@
 (defn get-owner
   [registry ens-name cb]
   {:pre [(is-valid-eth-name? ens-name)]}
-  (owner registry ens-name cb))
+  (owner registry ens-name cb))

src/status_im/ethereum/json_rpc.cljs

@@ -31,6 +31,7 @@
    "shh_generateSymKeyFromPassword" {}
    "shh_getSymKey" {}
    "shh_markTrustedPeer" {}
+   "shhext_startMessenger" {}
    "shhext_sendPairInstallation" {}
    "shhext_syncDevices" {}
    "shhext_requestMessages" {}

src/status_im/ethereum/stateofus.cljs

@@ -1,5 +1,6 @@
 (ns status-im.ethereum.stateofus
-  (:require [clojure.string :as string]))
+  (:require [clojure.string :as string]
+            [status-im.ethereum.json-rpc :as json-rpc]))
 
 (def domain "stateofus.eth")
 
@@ -24,3 +25,15 @@
   (boolean
    (and (lower-case? username)
         (re-find #"^[a-z0-9]+$" username))))
+
+(defn get-expiration-time
+  [registrar label-hash cb]
+  (json-rpc/eth-call
+   {:contract registrar
+    :method "getExpirationTime(bytes32)"
+    :params [label-hash]
+    :outputs ["uint256"]
+    :on-success
+    (fn [[release-time]]
+      ;;NOTE: returns a timestamp in s and we want ms
+      (cb (* release-time 1000)))}))

src/status_im/ethereum/subscriptions.cljs

@@ -25,14 +25,15 @@
   {:db (assoc-in db [:ethereum/subscriptions id] handler)})
 
 (fx/defn new-block
-  [{:keys [db] :as cofx} historical? block-number accounts]
+  [{:keys [db] :as cofx} historical? block-number accounts transactions-per-account]
   (let [{:keys [:wallet/all-tokens]} db
         chain (ethereum/chain-keyword db)
         chain-tokens (into {} (map (juxt :address identity)
                                    (tokens/tokens-for all-tokens chain)))]
     (log/debug "[wallet-subs] new-block"
                "accounts" accounts
-               "block" block-number)
+               "block" block-number
+               "transactions-per-account" transactions-per-account)
     (fx/merge cofx
               (cond-> {}
                 (not historical?)
@@ -41,10 +42,10 @@
                 ;;NOTE only get transfers if the new block contains some
                 ;;     from/to one of the multiaccount accounts
                 (not-empty accounts)
-                (assoc :transactions/get-transfers-from-block
+                (assoc :transactions/get-transfers
                        {:chain-tokens chain-tokens
                         :addresses    accounts
-                        :block        block-number
+                        :before-block block-number
                         :historical?  historical?}))
               (transactions/check-watched-transactions))))
 
@@ -91,12 +92,12 @@
       :historical?  true}}))
 
 (fx/defn new-wallet-event
-  [cofx {:keys [type blockNumber accounts] :as event}]
+  [cofx {:keys [type blockNumber accounts newTransactions] :as event}]
   (log/debug "[wallet-subs] new-wallet-event"
              "event-type" type)
   (case type
-    "newblock" (new-block cofx false blockNumber accounts)
+    "newblock" (new-block cofx false blockNumber accounts newTransactions)
-    "history" (new-block cofx true blockNumber accounts)
+    "history" (new-block cofx true blockNumber accounts nil)
     "reorg" (reorg cofx event)
     "recent-history-fetching" (recent-history-fetching-started cofx accounts)
     "recent-history-ready" (recent-history-fetching-ended cofx event)

src/status_im/ethereum/transactions/core.cljs

@@ -231,26 +231,30 @@
 
 (re-frame/reg-fx
  :transactions/get-transfers
- (fn [{:keys [chain-tokens addresses before-block page-size]
+ (fn [{:keys [chain-tokens addresses before-block page-size
+              transactions-per-address]
        :as params
-       :or {page-size 0}}]
+       :or {page-size 20}}]
    {:pre [(cljs.spec.alpha/valid?
            (cljs.spec.alpha/coll-of string?)
            addresses)]}
    (log/debug "[transactions] get-transfers"
               "addresses" addresses
               "block" before-block
-              "page-size" page-size)
+              "page-size" page-size
+              "transactions-per-address" transactions-per-address)
    (when before-block
      (doseq [address addresses]
-       (json-rpc/call
+       (let [page-size (or (get transactions-per-address address)
-        {:method "wallet_getTransfersByAddress"
+                           page-size)]
-         :params [address (encode/uint before-block) (encode/uint page-size)]
+         (json-rpc/call
-         :on-success #(re-frame/dispatch
+          {:method "wallet_getTransfersByAddress"
-                       [::new-transfers
+           :params [address (encode/uint before-block) (encode/uint page-size)]
-                        (enrich-transfers chain-tokens %)
+           :on-success #(re-frame/dispatch
-                        (assoc params :address address)])
+                         [::new-transfers
-         :on-error #(re-frame/dispatch [::tx-fetching-failed address])})))))
+                          (enrich-transfers chain-tokens %)
+                          (assoc params :address address)])
+           :on-error #(re-frame/dispatch [::tx-fetching-failed address])}))))))
 
 (fx/defn initialize
   [{:keys [db]} addresses]
@@ -261,7 +265,6 @@
     {:transactions/get-transfers
      {:chain-tokens chain-tokens
       :addresses    (map eip55/address->checksum addresses)
-      :page-size    20
       :historical?  true}}))
 
 (fx/defn fetch-more-tx
@@ -282,6 +285,5 @@
       {:chain-tokens chain-tokens
        :addresses    [address]
        :before-block min-known-block
-       :page-size    20
        :historical?  true}}
      (tx-fetching-in-progress [address]))))

src/status_im/mailserver/core.cljs

@@ -193,21 +193,19 @@
                 (generate-mailserver-symkey mailserver)))))
 
 (fx/defn add-peer
-  [{:keys [db] :as cofx}]
+  [{:keys [db now] :as cofx}]
   (let [{:keys [address sym-key-id generating-sym-key?] :as mailserver}
         (fetch-current db)]
     (fx/merge
      cofx
-     {:db (-> db
+     {:db (assoc
-              (update-mailserver-state :connecting)
+           (update-mailserver-state db :connecting)
-              (update :mailserver/connection-checks inc))
+           :mailserver/last-connection-attempt now)
       :mailserver/add-peer address
       ;; Any message sent before this takes effect will not be marked as sent
       ;; probably we should improve the UX so that is more transparent to the
       ;; user
-      :mailserver/update-mailservers [address]
+      :mailserver/update-mailservers [address]}
-      :utils/dispatch-later [{:ms constants/connection-timeout
-                              :dispatch [:mailserver/check-connection-timeout]}]}
      (when-not (or sym-key-id generating-sym-key?)
        (generate-mailserver-symkey mailserver)))))
 
@@ -521,23 +519,20 @@
                   {:mailserver/remove-peer address}
                   (set-current-mailserver))))))
 
+(defn check-connection! []
+  (re-frame/dispatch [:mailserver/check-connection-timeout]))
+
 (fx/defn check-connection
-  "connection-checks counter is used to prevent changing
+  "Check connection checks that the connection is successfully connected,
-   mailserver on flaky connections
+  otherwise it will try to change mailserver and connect again"
-   if there is more than one connection check pending
+  [{:keys [db now] :as cofx}]
-      decrement the connection check counter
-   else
-      change mailserver if mailserver is connected"
-  [{:keys [db] :as cofx}]
   ;; check if logged into multiaccount
   (when (contains? db :multiaccount)
-    (let [connection-checks (dec (:mailserver/connection-checks db))]
+    (let [last-connection-attempt (:mailserver/last-connection-attempt db)]
-      (if (>= 0 connection-checks)
+      (when (<= (- now last-connection-attempt))
         (fx/merge cofx
-                  {:db (dissoc db :mailserver/connection-checks)}
+                  (when (not= :connected (:mailserver/state db))
-                  (when (= :connecting (:mailserver/state db))
+                    (change-mailserver)))))))
-                    (change-mailserver)))
-        {:db (update db :mailserver/connection-checks dec)}))))
 
 (fx/defn reset-request-to
   [{:keys [db]}]
@@ -813,7 +808,7 @@
                        :on-success
                        #(log/debug "added mailserver-topic successfully")
                        :on-failure
-                       #(log/error "failed to delete mailserver topic" %)})
+                       #(log/error "failed to add mailserver topic" %)})
                     mailserver-topics)}
              (process-next-messages-request))))))))
 

src/status_im/mailserver/topics.cljs

@@ -5,12 +5,14 @@
             [status-im.utils.fx :as fx]
             [taoensso.timbre :as log]))
 
-(defn calculate-last-request [{:keys [discovery?]}
+(defn calculate-last-request [{:keys [negotiated?
+                                      discovery?]}
                               {:keys [previous-last-request
                                       now-s]}]
   ;; New topic, if discovery we don't fetch history
   (if (and (nil? previous-last-request)
-           discovery?)
+           (or discovery?
+               negotiated?))
     (- now-s 10)
     (max previous-last-request
          (- now-s constants/max-request-range))))
@@ -34,7 +36,7 @@
     {::json-rpc/call [{:method "mailservers_addMailserverTopic"
                        :params [mailserver-topic]
                        :on-success #(log/debug "added mailserver-topic successfully")
-                       :on-failure #(log/error "failed to delete mailserver topic" %)}]}))
+                       :on-failure #(log/error "failed to add mailserver topic" %)}]}))
 
 (defn new-chat-ids? [previous-mailserver-topic new-mailserver-topic]
   (seq (clojure.set/difference (:chat-ids new-mailserver-topic)

src/status_im/multiaccounts/recover/core.cljs

@@ -20,7 +20,7 @@
 
 (defn existing-account?
   [root-key multiaccounts]
-  (contains? multiaccounts (:key-uid root-key)))
+  (contains? multiaccounts (:keyUid root-key)))
 
 (re-frame/reg-fx
  ::validate-mnemonic
@@ -130,7 +130,7 @@
 
 (fx/defn on-import-multiaccount-success
   {:events [::import-multiaccount-success]}
-  [{:keys [db] :as cofx} {:keys [key-uid] :as root-data} derived-data]
+  [{:keys [db] :as cofx} root-data derived-data]
   (let [multiaccounts (:multiaccounts/multiaccounts db)]
     (fx/merge
      cofx
@@ -140,7 +140,7 @@
                   :step :recovery-success
                   :forward-action :multiaccounts.recover/re-encrypt-pressed)}
      (when (existing-account? root-data multiaccounts)
-       (show-existing-multiaccount-alert key-uid))
+       (show-existing-multiaccount-alert (:keyUid root-data)))
      (navigation/navigate-to-cofx :recover-multiaccount-success nil))))
 
 (fx/defn enter-phrase-pressed

src/status_im/multiaccounts/update/publisher.cljs

@@ -1,5 +1,6 @@
 (ns status-im.multiaccounts.update.publisher
   (:require [taoensso.timbre :as log]
+            [re-frame.core :as re-frame]
             [status-im.constants :as constants]
             [status-im.multiaccounts.update.core :as multiaccounts]
             [status-im.ethereum.json-rpc :as json-rpc]
@@ -25,4 +26,9 @@
         (log/debug "sending contact updates")
         (json-rpc/call {:method "shhext_sendContactUpdates"
                         :params [(or preferred-name name) photo-path]
-                        :on-success #(log/debug "sent contact updates")})))))
+                        :on-failure #(do
+                                       (log/warn "failed to send contact updates")
+                                       (re-frame/dispatch [:multiaccounts.update.callback/failed-to-publish]))
+                        :on-success #(do
+                                       (log/debug "sent contact updates")
+                                       (re-frame/dispatch [:multiaccounts.update.callback/published]))})))))

src/status_im/node/core.cljs

@@ -7,7 +7,8 @@
             [status-im.utils.fx :as fx]
             [status-im.utils.platform :as utils.platform]
             [status-im.utils.types :as types]
-            [taoensso.timbre :as log])
+            [taoensso.timbre :as log]
+            [status-im.ethereum.ens :as ens])
   (:require-macros [status-im.utils.slurp :refer [slurp]]))
 
 (defn- add-custom-bootnodes [config network all-bootnodes]
@@ -121,19 +122,20 @@
              :PermissionsConfig {:Enabled true}
              :MailserversConfig {:Enabled true}
              :EnableNTPSync true
-             :WhisperConfig           {:Enabled true
+             :WhisperConfig {:Enabled true
-                                       :LightClient true
+                             :LightClient true
-                                       :MinimumPoW 0.001}
+                             :MinimumPoW 0.001}
              :ShhextConfig
-             {:BackupDisabledDataDir (utils.platform/no-backup-directory)
+             {:BackupDisabledDataDir      (utils.platform/no-backup-directory)
-              :InstallationID installation-id
+              :InstallationID             installation-id
               :MaxMessageDeliveryAttempts config/max-message-delivery-attempts
-              :MailServerConfirmations  config/mailserver-confirmations-enabled?
+              :MailServerConfirmations    config/mailserver-confirmations-enabled?
-              :VerifyTransactionURL "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a"
+              :VerifyTransactionURL       constants/mainnet-rpc-url
-              :VerifyENSURL "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a"
+              :VerifyENSURL               constants/mainnet-rpc-url
-              :VerifyTransactionChainID 1
+              :VerifyENSContractAddress   (:mainnet ens/ens-registries)
-              :DataSyncEnabled true
+              :VerifyTransactionChainID   1
-              :PFSEnabled true}
+              :DataSyncEnabled            true
+              :PFSEnabled                 true}
              :RequireTopics (get-topics current-network)
              :StatusAccountsConfig {:Enabled true})
 

src/status_im/protocol/core.cljs

@@ -68,4 +68,4 @@
                      (not initialization-complete?)
                      (assoc :initialization-protocol initialization-protocol))}
               (when initialization-complete?
-                (transport/init-whisper)))))
+                (transport/init-messenger)))))

src/status_im/subs.cljs

@@ -2005,7 +2005,7 @@
  :<- [:get-screen-params :ens-name-details]
  :<- [:ens/names]
  (fn [[name ens]]
-   (let [{:keys [address public-key]} (get ens name)
+   (let [{:keys [address public-key expiration-date releasable?]} (get ens name)
          pending? (nil? address)]
      (cond-> {:name       name
               :custom-domain? (not (string/ends-with? name ".stateofus.eth"))}
@@ -2013,7 +2013,9 @@
        (assoc :pending? true)
        (not pending?)
        (assoc :address    address
-              :public-key public-key)))))
+              :public-key public-key
+              :releasable? releasable?
+              :expiration-date expiration-date)))))
 
 (re-frame/reg-sub
  :ens.main/screen

src/status_im/transport/core.cljs

@@ -2,6 +2,7 @@
  status-im.transport.core
   (:require
    [re-frame.core :as re-frame]
+   [status-im.ethereum.json-rpc :as json-rpc]
    [status-im.native-module.core :as status]
    [status-im.mailserver.core :as mailserver]
    [status-im.transport.message.core :as message]
@@ -34,10 +35,23 @@
 (fx/defn fetch-node-info-fx [cofx]
   {::fetch-node-info []})
 
+(fx/defn init-messenger
+  "We should only start receiving messages/processing topics once all the
+  initializiation is completed, otherwise we might receive messages/topics
+  when the state has not been properly initialized."
+  [cofx]
+  {::json-rpc/call [{:method "shhext_startMessenger"
+                     :on-success #(do
+                                    (log/debug "messenger initialized")
+                                    (re-frame/dispatch [::init-whisper]))
+                     :on-failure #(log/error "failed to init messenger")}]})
+
 (fx/defn init-whisper
   "Initialises whisper protocol by:
   - (optionally) initializing mailserver"
+  {:events [::init-whisper]}
   [cofx]
+  (log/debug "Initializing whisper")
   (fx/merge cofx
             (fetch-node-info-fx)
             (pairing/init)

src/status_im/transport/message/core.cljs

@@ -36,9 +36,7 @@
   (models.contact/ensure-contact cofx contact))
 
 (fx/defn handle-message [cofx message]
-  (fx/merge cofx
+  (models.message/receive-one cofx message))
-            (models.message/receive-one message)
-            (ens/verify-names-from-message message (:from message))))
 
 (fx/defn process-response [cofx response-js]
   (let [chats (.-chats response-js)

src/status_im/ui/components/list_selection.cljs

@@ -13,14 +13,19 @@
             (:url content))
     (.share react/sharing (clj->js content))))
 
-(defn- message-options [message-id text]
+(defn- message-options [message-id text from outgoing]
-  [{:label  (i18n/label :t/message-reply)
+  (into
-    :action #(re-frame/dispatch [:chat.ui/reply-to-message message-id])}
+   []
-   {:label  (i18n/label :t/sharing-copy-to-clipboard)
+   (concat
-    :action #(react/copy-to-clipboard text)}
+    (when (and from (not outgoing))
-   (when-not platform/desktop?
+      [{:label  (i18n/label :t/view-profile)
+        :action #(re-frame/dispatch [:chat.ui/show-profile from])}])
+    [{:label  (i18n/label :t/message-reply)
+      :action #(re-frame/dispatch [:chat.ui/reply-to-message message-id])}
+     {:label  (i18n/label :t/sharing-copy-to-clipboard)
+      :action #(react/copy-to-clipboard text)}
      {:label  (i18n/label :t/sharing-share)
-      :action #(open-share {:message text})})])
+      :action #(open-share {:message text})}])))
 
 (defn show [options]
   (cond
@@ -28,9 +33,9 @@
     platform/android? (dialog/show options)
     platform/desktop? (show-desktop-menu (->> (:options options) (remove nil?)))))
 
-(defn chat-message [message-id text dialog-title]
+(defn chat-message [message-id text from outgoing dialog-title]
   (show {:title       dialog-title
-         :options     (message-options message-id text)
+         :options     (message-options message-id text from outgoing)
          :cancel-text (i18n/label :t/message-options-cancel)}))
 
 (defn- platform-web-browser []

src/status_im/ui/screens/add_new/new_chat/db.cljs

@@ -1,5 +1,6 @@
 (ns status-im.ui.screens.add-new.new-chat.db
   (:require [status-im.utils.hex :as hex]
+            [status-im.ethereum.ens :as ens]
             [status-im.utils.platform :as platform]
             [status-im.i18n :as i18n]
             [cljs.spec.alpha :as spec]
@@ -11,7 +12,8 @@
 
 (defn validate-pub-key [db public-key]
   (cond
-    (not (spec/valid? :global/public-key public-key))
+    (or (not (spec/valid? :global/public-key public-key))
+        (= public-key ens/default-key))
     (i18n/label (if platform/desktop?
                   :t/use-valid-contact-code-desktop
                   :t/use-valid-contact-code))

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

@@ -521,8 +521,17 @@
     [message-delivery-status message]]])
 
 (defn open-chat-context-menu
-  [{:keys [message-id content] :as message}]
+  [{:keys [message-id content from outgoing]}]
-  (list-selection/chat-message message-id (:text content) (i18n/label :t/message)))
+  (list-selection/chat-message message-id (:text content) from outgoing (i18n/label :t/message)))
+
+(defn open-sticker-context-menu
+  [{:keys [from outgoing]}]
+  (when (and from (not outgoing))
+    (list-selection/show
+     {:title       (i18n/label :t/message)
+      :options     [{:label  (i18n/label :t/view-profile)
+                     :action #(re-frame/dispatch [:chat.ui/show-profile from])}]
+      :cancel-text (i18n/label :t/message-options-cancel)})))
 
 (defn chat-message
   [{:keys [outgoing group-chat modal? current-public-key content-type content] :as message}]
@@ -539,9 +548,12 @@
                                                                             :input-bottom-sheet nil}])
                             (when-not platform/desktop?
                               (react/dismiss-keyboard!)))))
-       :on-long-press #(when (or (= content-type constants/content-type-text)
+       :on-long-press #(cond (or (= content-type constants/content-type-text)
                                  (= content-type constants/content-type-emoji))
-                         (open-chat-context-menu message))}
+                             (open-chat-context-menu message)
+
+                             (= content-type constants/content-type-sticker)
+                             (open-sticker-context-menu message))}
       [react/view {:accessibility-label :chat-item}
        (let [incoming-group (and group-chat (not outgoing))]
          [message-content message-body (merge message

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

@@ -14,11 +14,13 @@
 (defn format-author [alias style name]
   (let [additional-styles (style false)]
     (if name
-      [react/text {:style (merge {:color       colors/blue
+      (let [name (subs name 0 80)]
-                                  :font-size   13
+        [react/text {:number-of-lines 2
-                                  :line-height 18
+                     :style (merge {:color       colors/blue
-                                  :font-weight "500"} additional-styles)}
+                                    :font-size   13
-       (str "@" (or (stateofus/username name) name))]
+                                    :line-height 18
+                                    :font-weight "500"} additional-styles)}
+         (str "@" (or (stateofus/username name) name))])
       [react/text {:style (merge {:color       colors/gray
                                   :font-size   12
                                   :line-height 18
@@ -35,7 +37,7 @@
     (or (and (= from current-public-key)
              [react/text {:style (style true)}
               (str reply-symbol (i18n/label :t/You))])
-        (format-author reply-name style false))))
+        (format-author (subs reply-name 0 80) style false))))
 
 (def ^:private styling->prop
   {:bold      {:style {:font-weight "700"}}

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

@@ -312,7 +312,7 @@
    modal?]
   (letsubs [messages           [:chats/current-chat-messages-stream]
             current-public-key [:multiaccount/public-key]]
-    {:component-did-mount
+    {:component-did-update
      (fn [args]
        (when-not (:messages-initialized? (second (.-argv (.-props args))))
          (re-frame/dispatch [:chat.ui/load-more-messages]))
@@ -335,6 +335,7 @@
                                           :list-ref           messages-list-ref}])
            :inverted                  true
            :onEndReached              #(re-frame/dispatch [:chat.ui/load-more-messages])
+           :onScrollToIndexFailed     #()
            :keyboardShouldPersistTaps :handled}
           group-header {:header [group-chat-footer chat-id]}]
       (if pending-invite-inviter-name

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

@@ -477,8 +477,14 @@
 ;;; NAME DETAILS SCREEN
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(def ^:const release-instructions-link "https://our.status.im/managing-your-ens-name-in-v1/")
+
+(defn open-release-instructions-link! []
+  (.openURL react/linking release-instructions-link))
+
 (views/defview name-details []
-  (views/letsubs [{:keys [name address custom-domain? public-key pending?]}
+  (views/letsubs [{:keys [name address custom-domain? public-key
+                          expiration-date releasable? pending?]}
                   [:ens.name/screen]]
     [react/view {:style {:flex 1}}
      [topbar/topbar {:title name}]
@@ -503,23 +509,32 @@
           [section {:title   (i18n/label :t/key)
                     :content public-key}]])
        [react/view {:style {:margin-top 16 :margin-bottom 32}}
-        [list/big-list-item {:text          (i18n/label :t/ens-remove-username)
+        ;;TODO: re-enable once feature is developped
-                             :subtext       (i18n/label :t/ens-remove-hints)
+        #_[list/big-list-item {:text          (i18n/label :t/ens-remove-username)
-                             :text-color    colors/gray
+                               :subtext       (i18n/label :t/ens-remove-hints)
-                             :text-style    {:font-weight "500"}
+                               :text-color    colors/gray
-                             :icon          :main-icons/close
+                               :text-style    {:font-weight "500"}
-                             :icon-color    colors/gray
+                               :icon          :main-icons/close
-                             :hide-chevron? true}]
+                               :icon-color    colors/gray
+                               :hide-chevron? true}]
         (when-not custom-domain?
           [react/view {:style {:margin-top 18}}
            [list/big-list-item {:text          (i18n/label :t/ens-release-username)
-                                :text-color    colors/gray
+                                :text-color    (if releasable?
+                                                 colors/blue
+                                                 colors/gray)
                                 :text-style    {:font-weight "500"}
-                                :subtext       (i18n/label :t/ens-locked)
+                                :subtext       (when (and expiration-date
+                                                          (not releasable?))
+                                                 (i18n/label :t/ens-locked
+                                                             {:date expiration-date}))
                                 :icon          :main-icons/delete
-                                :icon-color    colors/gray
+                                :icon-color    (if releasable?
-                                :active?       false
+                                                 colors/blue
-                                :hide-chevron? true}]])]]]]))
+                                                 colors/gray)
+                                :active?       releasable?
+                                :hide-chevron? true
+                                :action-fn     #(open-release-instructions-link!)}]])]]]]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; WELCOME SCREEN

src/status_im/ui/screens/glossary/view.cljs

@@ -7,6 +7,8 @@
 
 (def messages [{:title   :t/account-title
                 :content :t/account-content}
+               {:title   :t/wallet-key-title
+                :content :t/wallet-key-content}
                {:title   :t/chat-key-title
                 :content :t/chat-key-content}
                {:title   :t/chat-name-title
@@ -18,9 +20,7 @@
                {:title   :t/peer-title
                 :content :t/peer-content}
                {:title   :t/seed-phrase-title
-                :content :t/seed-phrase-content}
+                :content :t/seed-phrase-content}])
-               {:title   :t/wallet-key-title
-                :content :t/wallet-key-content}])
 
 (defn render-section-header [{:keys [title]}]
   [react/view {:style {:position         "absolute"

src/status_im/ui/screens/mobile_network_settings/events.cljs

@@ -33,7 +33,8 @@
         (sheet-defaults)]
 
        logged-in?
-       [(bottom-sheet/hide-bottom-sheet)]))))
+       [(mailserver/process-next-messages-request)
+        (bottom-sheet/hide-bottom-sheet)]))))
 
 (defn apply-settings
   ([sync?] (apply-settings sync? :default))

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

@@ -65,7 +65,8 @@
 (defn- header [{:keys [photo-path] :as account} photo-added?]
   [profile.components/profile-header
    {:contact                account
-    :allow-icon-change?     true
+    ;;set to true if we want to re-enable custom icon
+    :allow-icon-change?     false
     :include-remove-action?  photo-added?}])
 
 (defn- header-in-toolbar [account]

src/status_im/ui/screens/wallet/add_new/views.cljs

@@ -33,24 +33,25 @@
       :icon        :main-icons/add
       :accessories [:chevron]
       :on-press    #(re-frame/dispatch [:wallet.accounts/start-adding-new-account {:type :generate}])}]
-    [list-item/list-item
+    ;;TODO: implement adding account by seedphrase and private key
-     {:type                 :section-header
+    #_[list-item/list-item
-      :container-margin-top 24
+       {:type                 :section-header
-      :title                "Advanced"}]
+        :container-margin-top 24
-    [list-item/list-item
+        :title                (i18n/label :t/advanced)}]
-     {:title       "Enter a seed phrase"
+    #_[list-item/list-item
-      :theme       :action
+       {:title       (i18n/label :t/enter-a-seed-phrase)
-      :icon        :main-icons/add
+        :theme       :action
-      :accessories [:chevron]
+        :icon        :main-icons/add
-      :disabled?   true
+        :accessories [:chevron]
-      :on-press    #(re-frame/dispatch [:wallet.accounts/start-adding-new-account {:type :seed}])}]
+        :disabled?   true
-    [list-item/list-item
+        :on-press    #(re-frame/dispatch [:wallet.accounts/start-adding-new-account {:type :seed}])}]
-     {:title       "Enter a private key"
+    #_[list-item/list-item
-      :theme       :action
+       {:title       (i18n/label :t/enter-a-private-key)
-      :icon        :main-icons/add
+        :theme       :action
-      :accessories [:chevron]
+        :icon        :main-icons/add
-      :disabled?   true
+        :accessories [:chevron]
-      :on-press    #(re-frame/dispatch [:wallet.accounts/start-adding-new-account {:type :key}])}]]])
+        :disabled?   true
+        :on-press    #(re-frame/dispatch [:wallet.accounts/start-adding-new-account {:type :key}])}]]])
 
 (def input-container
   {:flex-direction     :row
@@ -69,20 +70,21 @@
                   :justify-content :space-between
                   :align-items     :center :margin-horizontal 16}
       [react/view
-       [react/text {:style {:typography :header :margin-top 16}} "Add a watch-only address"]
+       [react/text {:style {:typography :header :margin-top 16}}
+        (i18n/label :t/add-a-watch-account)]
        [react/text {:style {:color colors/gray :text-align :center :margin-vertical 16}}
-        "Enter the address to watch"]]
+        (i18n/label :t/enter-watch-account-address)]]
       [react/view {:align-items :center :flex 1 :flex-direction :row}
        [react/text-input {:auto-focus        true
                           :multiline         true
                           :text-align        :center
-                          :placeholder       "Enter address"
+                          :placeholder       (i18n/label :t/enter-address)
                           :style             {:typography :header :flex 1}
                           :on-change-text    #(re-frame/dispatch [:set-in [:add-account :address] %])}]]]
      [toolbar/toolbar
       {:show-border? true
        :right        {:type      :next
-                      :label     "Next"
+                      :label     (i18n/label :t/next)
                       :on-press  #(re-frame/dispatch [:wallet.accounts/add-watch-account])
                       :disabled? add-account-disabled?}}]]))
 

src/status_im/ui/screens/wallet/components/views.cljs

@@ -39,8 +39,8 @@
        {:multiline           true
         :container           {:margin 16 :padding-vertical 16 :height 72}
         :style               {:text-align-vertical :top :height 42}
-        :placeholder         "0x... or username.domain.eth" ;(i18n/label :t/recipient-code)
+        :placeholder         (i18n/label :t/recipient-code-placeholder)
         :on-change-text      #(reset! content %)
         :accessibility-label :recipient-address-input}]
       [react/text {:style {:color colors/gray :margin-horizontal 16}}
-       "Enter address or username of the recepient"]]]))
+       (i18n/label :t/enter-recipient-address-or-username)]]]))

src/status_im/ui/screens/wallet/navigation.cljs

@@ -1,11 +1,14 @@
 (ns status-im.ui.screens.wallet.navigation
   (:require [status-im.ui.screens.navigation :as navigation]
-            [status-im.ui.screens.wallet.signing-phrase.views :as signing-phrase]))
+            [status-im.ui.screens.wallet.signing-phrase.views :as signing-phrase]
+            [re-frame.core :as re-frame]))
 
 (defmethod navigation/preload-data! :wallet-stack
   [db [event]]
   (let [wallet-set-up-passed? (get-in db [:multiaccount :wallet-set-up-passed?])
         sign-phrase-showed?   (get db :wallet/sign-phrase-showed?)]
+    ;;TODO temporary simple fix for v1
+    (re-frame/dispatch [:wallet.ui/pull-to-refresh])
     (if (or (= event :navigate-back) wallet-set-up-passed? sign-phrase-showed?)
       db
       (assoc db :popover/popover {:view [signing-phrase/signing-phrase]}

src/status_im/ui/screens/wallet/transactions/views.cljs

@@ -7,9 +7,10 @@
             [status-im.ui.components.icons.vector-icons :as vector-icons]
             [status-im.ui.components.styles :as components.styles]
             [status-im.ui.components.toolbar.actions :as actions]
-            [status-im.ui.components.toolbar.view :as toolbar]
+            [status-im.ui.components.toolbar.view :as toolbar-old]
             [status-im.ui.screens.wallet.transactions.styles :as styles]
-            [status-im.ui.components.topbar :as topbar])
+            [status-im.ui.components.topbar :as topbar]
+            [status-im.ui.components.toolbar :as toolbar])
   (:require-macros [status-im.utils.views :refer [defview letsubs]]))
 
 (defn- transaction-icon
@@ -124,19 +125,12 @@
                    :margin-vertical 8}}
           [react/activity-indicator {:size :large
                                      :animating true}]]
-         [react/view
+         [toolbar/toolbar
-          {:style {:flex               1
+          {:center {:label    (i18n/label :t/transactions-load-more)
-                   :padding-horizontal 14
+                    :type     :secondary
-                   :height             52
+                    :on-press (when-not fetching-more-history?
-                   :align-items        :center
+                                #(re-frame/dispatch
-                   :justify-content    :center
+                                  [:transactions/fetch-more address]))}}]))]))
-                   :background-color   colors/blue-light}}
-          [react/text
-           {:style {:color colors/blue}
-            :on-press (when-not fetching-more-history?
-                        #(re-frame/dispatch
-                          [:transactions/fetch-more address]))}
-           (i18n/label :t/transactions-load-more)]]))]))
 
 (defn- render-item-filter [{:keys [id label checked? on-touch]}]
   [react/view {:accessibility-label :filter-item}
@@ -256,10 +250,10 @@
             [:wallet.transactions.details/screen hash address]]
     [react/view {:style components.styles/flex}
      ;;TODO options should be replaced by bottom sheet ,and topbar should be used here
-     [toolbar/toolbar {}
+     [toolbar-old/toolbar {}
-      toolbar/default-nav-back
+      toolbar-old/default-nav-back
-      [toolbar/content-title (i18n/label :t/transaction-details)]
+      [toolbar-old/content-title (i18n/label :t/transaction-details)]
-      (when transaction [toolbar/actions (details-action hash url)])]
+      (when transaction [toolbar-old/actions (details-action hash url)])]
      [react/scroll-view {:style components.styles/main-container}
       [details-header date type amount-text currency-text]
       [details-confirmations confirmations confirmations-progress (= :failed type)]

src/status_im/utils/contenthash.cljs

@@ -58,7 +58,7 @@
 (defn url [hex]
   (let [{:keys [namespace hash]} (decode (ethereum/normalized-hex hex))]
     (case namespace
-      :ipfs (str "https://cloudflare-ipfs.com/ipfs/" hash)
+      :ipfs (str "https://ipfs.infura.io/ipfs/" hash)
       "")))
 
 (fx/defn cat

src/status_im/utils/platform.cljs

@@ -33,9 +33,8 @@
 
 (defn no-backup-directory []
   (cond
-    android? (str (.-DocumentDirectoryPath rn-dependencies/fs)
+    android? "/../no_backup"
-                  "/../no_backup")
+    ios?     "/"))
-    ios?          (.-LibraryDirectoryPath rn-dependencies/fs)))
 
 (defn android-version>= [v]
   (and android? (>= version v)))

src/status_im/utils/publisher.cljs

@@ -3,11 +3,12 @@
             [re-frame.db]
             [status-im.multiaccounts.update.publisher :as multiaccounts]
             [status-im.utils.async :as async-util]
+            [status-im.mailserver.core :as mailserver]
             [status-im.utils.datetime :as datetime]
             [status-im.utils.fx :as fx]))
 
 (defonce polling-executor (atom nil))
-(def sync-interval-ms 120000)
+(def sync-interval-ms 10000)
 (def sync-timeout-ms  20000)
 
 (defn- start-publisher! []
@@ -18,7 +19,7 @@
            (fn [done-fn]
              (let [cofx {:now  (datetime/timestamp)
                          :db   @re-frame.db/app-db}]
-               (multiaccounts/publish-update! cofx)
+               (mailserver/check-connection!)
                (done-fn)))
            sync-interval-ms
            sync-timeout-ms)))

src/status_im/wallet/core.cljs

@@ -27,24 +27,31 @@
             [status-im.ethereum.stateofus :as stateofus]
             [status-im.ui.components.bottom-sheet.core :as bottom-sheet]))
 
-(re-frame/reg-fx
+(defn get-balance
- :wallet/get-balance
+  [{:keys [address on-success on-error number-of-retries]
- (fn [{:keys [account-address on-success on-error]}]
+    :as params
-   (json-rpc/call
+    :or {number-of-retries 4}}]
-    {:method     "eth_getBalance"
+  (log/debug "[wallet] get-balance"
-     :params     [account-address "latest"]
+             "address" address
-     :on-success on-success
+             "number-of-retries" number-of-retries)
-     :on-error   on-error})))
+  (json-rpc/call
+   {:method     "eth_getBalance"
+    :params     [address "latest"]
+    :on-success on-success
+    :on-error   (fn [error]
+                  (if (zero? number-of-retries)
+                    (on-error error)
+                    (get-balance
+                     (update params :number-of-retries dec))))}))
 
 (re-frame/reg-fx
  :wallet/get-balances
  (fn [addresses]
    (doseq [address addresses]
-     (json-rpc/call
+     (get-balance
-      {:method     "eth_getBalance"
+      {:address    address
-       :params     [address "latest"]
        :on-success #(re-frame/dispatch [::update-balance-success address %])
-       :on-error    #(re-frame/dispatch [::update-balance-fail %])}))))
+       :on-error   #(re-frame/dispatch [::update-balance-fail %])}))))
 
 ;; TODO(oskarth): At some point we want to get list of relevant
 ;; assets to get prices for
@@ -175,21 +182,33 @@
     (when (not-empty balances)
       balances)))
 
+(defn get-token-balances
+  [{:keys [addresses tokens init? assets number-of-retries]
+    :as params
+    :or {number-of-retries 4}}]
+  (log/debug "[wallet] get-token-balances"
+             "addresses" addresses
+             "number-of-retries" number-of-retries)
+  (json-rpc/call
+   {:method "wallet_getTokensBalances"
+    :params [addresses (keys tokens)]
+    :on-success
+    (fn [results]
+      (when-let [balances (clean-up-results results tokens (if init? nil assets))]
+        (re-frame/dispatch (if init?
+                             ;; NOTE: when there it is not a visible
+                             ;; assets we make an initialization round
+                             [::tokens-found balances]
+                             [::update-tokens-balances-success balances]))))
+    :on-error
+    (fn [error]
+      (if (zero? number-of-retries)
+        (re-frame/dispatch [::update-token-balance-fail error])
+        (get-token-balances (update params :number-of-retries dec))))}))
+
 (re-frame/reg-fx
  :wallet/get-tokens-balances
- (fn [{:keys [addresses tokens init? assets]}]
+ get-token-balances)
-   (json-rpc/call
-    {:method "wallet_getTokensBalances"
-     :params [addresses (keys tokens)]
-     :on-success
-     (fn [results]
-       (when-let [balances (clean-up-results results tokens (if init? nil assets))]
-         (re-frame/dispatch (if init?
-                              ;; NOTE: when there it is not a visible
-                              ;; assets we make an initialization round
-                              [::tokens-found balances]
-                              [::update-tokens-balances-success balances]))))
-     :on-error   #(re-frame/dispatch [::update-token-balance-fail %])})))
 
 (defn clear-error-message [db error-type]
   (update-in db [:wallet :errors] dissoc error-type))

status-go-version.json

@@ -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.40.0",
+    "version": "v0.43.1+hotfix.1",
-    "commit-sha1": "dc31c818fce6dbff6cfd76da09d901b0df742e2e",
+    "commit-sha1": "cda577f607d687524b60dff379059cba382efcfd",
-    "src-sha256": "1f0fp5c4lqnh244wcvbnl5i4p9fb0f3i0rjjvbiqwkz9zwwp3xlv"
+    "src-sha256": "1pgsmfkal2hghqdincv0rghm445d52n4pjnvi19ha416ppggfpbv"
 }

test/cljs/status_im/test/mailserver/core.cljs

@@ -571,13 +571,13 @@
   (testing "Mailserver disconnected, sym-key exists"
     (let [result (peers-summary-change-result true false true)]
       (is (= (into #{} (keys result))
-             #{:db :mailserver/add-peer :utils/dispatch-later :mailserver/update-mailservers}))
+             #{:db :mailserver/add-peer :mailserver/update-mailservers}))
       (is (= (get-in result [:db :mailserver/state])
              :connecting))))
   (testing "Mailserver disconnected, sym-key doesn't exists (unlikely situation in practice)"
     (let [result (peers-summary-change-result false false true)]
       (is (= (into #{} (keys result))
-             #{:db :mailserver/add-peer :utils/dispatch-later  :shh/generate-sym-key-from-password :mailserver/update-mailservers}))
+             #{:db :mailserver/add-peer :shh/generate-sym-key-from-password :mailserver/update-mailservers}))
       (is (= (get-in result [:db :mailserver/state])
              :connecting))))
   (testing "Mailserver isn't concerned by peer summary changes"

test/cljs/status_im/test/models/contact.cljs

@@ -100,30 +100,3 @@
     (testing "the message is coming from us"
       (testing "it does not update contacts"
         (is (nil? (model/handle-contact-update {:db {:multiaccount {:public-key "me"}}} "me" 1 {})))))))
-
-(deftest add-ens-names-test
-  (with-redefs [gfycat/generate-gfy (constantly "generated")
-                identicon/identicon (constantly "generated")]
-    (testing "adding ens names"
-      (let [pk1 "048e57d37615380705cedf2eacc3543e7597eaed38c0bd0ff5b8c759406c657a29b4d6f4018ae323479dafa6bf1c821a422f2478a6759689afbca5e48fba720332"
-            pk2 "04318d20a2ca5fd0022579005ed24802e07d4ec610bede808dd13d3318af439e16d55be1a59af007a11120bd1c205861e5f53fe7b000a25e2b0d4eee7f0c5ebf7e"
-            expected {(str "0x" pk1) {:alias "generated"
-                                      :identicon "generated"
-                                      :name "name-1"
-                                      :ens-verified true
-                                      :ens-verified-at 1
-                                      :public-key (str "0x" pk1)
-                                      :system-tags #{}}
-                      (str "0x" pk2) {:alias "generated"
-                                      :name  "name-2"
-                                      :identicon "generated"
-                                      :ens-verified false
-                                      :ens-verified-at 2
-                                      :public-key (str "0x" pk2)
-                                      :system-tags #{}}}]
-        (is (= expected (model/add-ens-names {} {pk1 {:verified true
-                                                      :name "name-1"
-                                                      :verifiedAt 1}
-                                                 pk2 {:verified false
-                                                      :name "name-2"
-                                                      :verifiedAt 2}})))))))

translations/ar.json

@@ -2,13 +2,16 @@
     "about-app": "حول",
     "about-key-storage-content": "لن تصل Status مطلقًا إلى مفتاحك الخاص. تأكد من النسخ الاحتياطي عبارة البذور الخاصة بك. إذا فقدت هاتفك ، فهذه هي الطريقة الوحيدة للوصول إلى مفاتيحك.",
     "about-key-storage-title": "حول التخزين الرئيسي",
-    "about-names-content": "هويتك آمنة وخاصة من خلال التصميم. تحصل على مفتاح تشفير تم إنشاؤه محليًا. الاسم والصورة هي نسخة قابلة للقراءة من هذا. إنها فريدة من نوعها. لا أحد يستطيع أن يدعي أنه أنت. لا أحد يرى اسمك الحقيقي إلا إذا قدمته.",
+    "about-names-content": "هويتك آمنة وخاصة من خلال التصميم. تحصل على مفتاح تشفير تم إنشاؤه محليًا. الاسم والصورة هي نسخة قابلة للقراءة من هذا. إنها فريدة من نوعها. لا أحد يستطيع أن يدعي أنه أنت. لا أحد يرى اسمك الحقيقي إلا إذا قدمته أنت.",
-    "about-names-title": "عن الأسماء",
+    "about-names-title": "لا يمكن تغيير الأسماء",
-    "access-key": "مفتاح الوصول",
+    "accept-and-share-address": "قبول العنوان ومشاركته",
+    "access-key": "الوصول إلى المفاتيح الحالية",
     "account-added": "تمت أضافه الحساب",
     "account-color": "لون الحساب",
+    "account-content": "حساب Status  الخاص بك، يتم الوصول إليه من خلال العبارة الأولية التي تنشئها أو تستوردها أثناء المعاملة. يمكن أن يشتمل حساب الحالة على أكثر من عنوان Ethereum ، بالإضافة إلى العنوان الذي تم إنشاؤه أثناء المعاملة. نشير إلى هذه الحسابات الإضافية داخل المحفظة.",
     "account-name": "اسم الحساب",
     "account-settings": "إعدادات الحساب",
+    "account-title": "الحساب",
     "accounts": "حسابات",
     "active-online": "متصل",
     "active-unknown": "غير معروف",
@@ -28,6 +31,9 @@
     "add-to-contacts": "أضف إلى جهات الاتصال",
     "add-to-contacts-text": "بإضافة مستخدم إلى قائمة جهات الاتصال الخاصة بك ، يمكنك مشاركة عنوان محفظتك",
     "address": "عنوان",
+    "address-received": "العنوان المستلم",
+    "address-request-accepted": "قبول طلب العنوان",
+    "address-requested": "العنوان المطلوب",
     "advanced": "المتقدمة",
     "advanced-settings": "إعدادات متقدمة",
     "agree-by-continuing": "بالمتابعة أنت توافق \n الينا",
@@ -57,8 +63,8 @@
     "back": "الى الخلف",
     "back-up-seed-phrase": "النسخ الاحتياطي لعبارة \"البذور\" ",
     "back-up-your-seed-phrase": "النسخ الاحتياطي للعبارة الأولية الخاصة بك",
-    "backup-recovery-phrase": "النسخ الاحتياطي للعبارة الولية",
+    "backup-recovery-phrase": "النسخ الاحتياطي للعبارة الأولية",
-    "backup-your-recovery-phrase": "النسخ الاحتياطي للعبارة الاولية الخاصة بك",
+    "backup-your-recovery-phrase": "النسخ الاحتياطي للعبارة الاولية الخاصة",
     "balance": "توازن",
     "begin-set-up": "ابدأ الإعداد",
     "biometric-auth-android-sensor-desc": "استشعار تعمل باللمس",
@@ -93,7 +99,7 @@
     "bootnodes": "Bootnodes",
     "bootnodes-enabled": "تمكين bootnodes",
     "bootnodes-settings": "إعدادات Bootnodes",
-    "browsed-websites": "تصفح المواقع سوف تظهر هنا.",
+    "browsed-websites": "سوف يظهر سجل المتصفح هنا",
     "browser": "المتصفح",
     "browser-not-secure": "الاتصال غير آمن! لا توقع المعاملات ولا ترسل بيانات شخصية على هذا الموقع.",
     "browser-secure": "اتصال آمن. تأكد من أنك تثق بهذا الموقع بالفعل قبل توقيع المعاملات أو إدخال البيانات الشخصية.",
@@ -115,6 +121,7 @@
     "cannot-use-default-pin": "رمز المرور 000000 غير مسموح به. \n يرجى استخدام رقم آخر",
     "cant-read-card": "لا يمكن قراءة البطاقة",
     "cant-read-card-error-explanation": "يجب أن تظل البطاقة على اتصال بالهاتف أثناء الإعداد حتى تتمكن من الاتصال بقارئ NFC",
+    "cant-report-bug": "لا يمكن الإبلاغ عن خطأ",
     "card-already-linked": "البطاقة مرتبطة بالفعل بحساب آخر متعدد الحسابات",
     "card-is-blank": "هذه البطاقة فارغة",
     "card-is-empty": "البطاقة فارغة",
@@ -134,11 +141,16 @@
     "chaos-unicorn-day": "الفوضى يونيكورن اليوم",
     "chaos-unicorn-day-details": "🦄🦄🦄🦄🦄🦄🦄🚀!",
     "chat": "دردشة",
-    "chat-and-transact": "الدردشة والتعامل بشكل خاص مع أصدقائك.",
+    "chat-and-transact": "الدردشة والمعاملة بشكل خاص مع أصدقائك.",
     "chat-key": "مفتاح المحادثة",
+    "chat-key-content": "يتم إرسال واستقبال الرسائل على بروتوكول دردشة Status باستخدام مفاتيح التشفير. مفتاح الدردشة العامة هو سلسلة من الأحرف التي تشاركها مع الآخرين حتى يتمكنوا من إرسال رسائل إليك في Status.",
+    "chat-key-title": "مفتاح المحادثة",
     "chat-name": "اسم الدردشة",
+    "chat-name-content": "ثلاث كلمات عشوائية، مشتقة من مفتاح الدردشة الخاص بك واستخدامها كاسم مستعار افتراضي في الدردشة. أسماء الدردشة هي فريدة من نوعها تماما. لا يمكن أن يكون أي مستخدم آخر له نفس الكلمات الثلاث.",
+    "chat-name-title": "اسم الدردشة",
     "chat-settings": "إعدادات الدردشة",
     "chats": "دردشات",
+    "check-on-etherscan": "إبحث في Etherscan ",
     "check-your-recovery-phrase": "تحقق من العبارة الأولية الخاصة بك",
     "choose-authentication-method": "اختر طريقة مصادقة لحماية الحساب المتعدد",
     "clear": "واضح",
@@ -195,7 +207,7 @@
     "create-a-pin": "قم بإنشاء رمز مرور مكون من 6 أرقام",
     "create-group-chat": "إنشاء دردشة جماعية",
     "create-multiaccount": "إنشاء حساب متعدد",
-    "create-new-key": "الحصول علي مفتاح جديد",
+    "create-new-key": "الحصول على مفاتيح جديدة",
     "create-pin": "قم بإنشاء رمز مرور مكون من 6 أرقام",
     "create-pin-description": "ستحتاج إلى بطاقتك + رمز المرور المكون من 6 أرقام لإلغاء تأمين Status وتأكيد المعاملات",
     "created-group-chat-description": "لقد أنشأت المجموعة {{group-name}}",
@@ -286,9 +298,9 @@
     "current-pin-description": "أدخل رمز المرور المكون من 6 أرقام للمتابعة",
     "custom": "مجال مخصص",
     "custom-networks": "شبكات مخصصة",
-    "custom-seed-phrase": "عبارة البذور المخصصة",
+    "custom-seed-phrase": "العبارة غير صالحة",
-    "custom-seed-phrase-text-1": "هذا يبدو وكأنه عبارة أولية مخصصة ولا يتطابق مع قاموس Status. هذا يمكن أن يعني أيضا",
+    "custom-seed-phrase-text-1": "هذه العبارة الأولية لا تتوافق مع قاموسنا المدعوم. تحقق من وجود أخطاء إملائية.",
-    "custom-seed-phrase-text-2": "بعض الكلمات بها أخطاء إملائية.",
+    "custom-seed-phrase-text-2": "فارغ",
     "dapp": "ÐApp",
     "dapp-would-like-to-connect-wallet": "ترغب في الاتصال",
     "dapps": "ÐApps",
@@ -335,6 +347,7 @@
     "datetime-today": "اليوم",
     "datetime-yesterday": "أمس",
     "decimals": "الكسور العشرية",
+    "decline": "رفض الدعوة",
     "decryption-failed-confirm": "سجل",
     "decryption-failed-content": "لم نتمكن من فك تشفير بياناتك ، فقد تحتاج إلى إنشاء حساب جديد متعدد ومحو بياناتك القديمة من خلال النقر على \"تطبيق\". النقر على \"إلغاء\" ، سيحاول مرة أخرى",
     "decryption-failed-title": "لم نتمكن من فك تشفير بياناتك",
@@ -391,7 +404,9 @@
     "ens-displayed-with": "يتم عرض الرسائل الخاصة بك للآخرين مع",
     "ens-get-name": "الحصول علي اسم مستخدم عالمي",
     "ens-got-it": "حسنا، تابع",
-    "ens-locked": "اسم المستخدم مقفل. لن تكون قادرا علي اصداره حتى 25.05.2020",
+    "ens-locked": "{{date}} اسم المستخدم مقفل. لن تكون قادرا علي اصداره حتى",
+    "ens-name-content": "اسم مستعار مخصص لمفتاح الدردشة الذي يمكنك تسجيله باستخدام خدمة Ethereum Name Service. أسماء ENS هي أسماء مستخدمين لا مركزية.",
+    "ens-name-title": "اسم ENS",
     "ens-network-restriction": "متوفر فقط على Mainnet",
     "ens-no-usernames": "ليس لديك اي اسم مستخدم متصل",
     "ens-powered-by": "مدعوم من Ethereum  اسم الخدمات",
@@ -402,12 +417,12 @@
     "ens-release-username": "الإفراج عن اسم المستخدم",
     "ens-remove-hints": "سيؤدي الاستمرار إلى ربط اسم المستخدم هذا بمفتاحك.",
     "ens-remove-username": "إزالة اسم المستخدم",
-    "ens-saved": "متصل الآن بالمفتاح الخاص بك ويمكن استخدامه في Status.",
+    "ens-saved": "متصل الآن بالمفتاح الخاص ويمكن استخدامه في Status.",
     "ens-saved-title": "اسم المستخدم المضاف",
     "ens-show-username": "عرض اسم مستخدم ENS الخاص بي في الدردشات",
     "ens-terms-header": "شروط تسجيل الاسم",
     "ens-terms-point-1": "تودع الأموال لمدة 1 سنة. سيتم قفل SNT الخاص بك ، ولكن لا تنفق.",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b (ENS Registry).",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e (ENS Registry).",
     "ens-terms-point-2": "بعد عام واحد ، يمكنك تحرير الاسم واسترداد مقدمك ، أو عدم اتخاذ أي إجراء للحفاظ على الاسم.",
     "ens-terms-point-3": "إذا تغيرت شروط العقد-علي سبيل المثال Status  التي تجعل ترقيات العقد-يحق للمستخدم الإفراج عن اسم المستخدم بغض الزمن عن الوقت المحتفظ به.",
     "ens-terms-point-4": "لا يمكن لوحده تحكم العقد الوصول إلى أموالك المودعة. يمكن نقلها فقط إلى العنوان الذي أرسلها.",
@@ -421,16 +436,16 @@
     "ens-transaction-pending": "المعاملة جارية ...",
     "ens-understand": "أدرك أن عنوان محفظتي سيكون مرتبطًا بشكل عام باسم المستخدم الخاص بي.",
     "ens-username": "اسم المستخدم ENS",
-    "ens-username-already-added": "اسم المستخدم مرتبط بالفعل بالمفتاح الخاص بك ويمكن استخدامه داخل Status.",
+    "ens-username-already-added": "اسم المستخدم مرتبط بالفعل بالمفتاح الخاص بك ويمكن استخدامه في Status.",
     "ens-username-available": "✓ اسم المستخدم متاح!",
-    "ens-username-connected": "اسم المستخدم هذا مملوك لك ومتصل بمفتاح الدردشة.",
+    "ens-username-connected": "اسم المستخدم هذا مملوك لك ومتصل بمفتاح الدردشة الخاص بك.",
     "ens-username-connected-continue": "استمر في ضبط `إظهار اسم مستخدم ENS الخاص بي في المحادثات '.",
-    "ens-username-connected-with-different-key": "ستتطلب المتابعة معاملة لتوصيل اسم المستخدم بالمفتاح الحالي.",
+    "ens-username-connected-with-different-key": "ستتطلب المتابعة معاملة لتوصيل اسم المستخدم بالمفتاح الحالي",
     "ens-username-connection-confirmation": "سيتم ربط {{username}} بمجرد اكتمال المعاملة.",
     "ens-username-hints": "ما لا يقل عن 4 أحرف. الحروف اللاتينية والأرقام والأحرف الصغيرة فقط.",
     "ens-username-invalid": "الحروف والأرقام فقط.",
     "ens-username-owned": "✓ اسم المستخدم هو مملوك لك. ",
-    "ens-username-owned-continue": "سيؤدي الاستمرار إلى ربط اسم المستخدم هذا بمفتاحك.",
+    "ens-username-owned-continue": "سيؤدي الاستمرار إلى ربط اسم المستخدم هذا بمفتاحك الخاص.",
     "ens-username-registration-confirmation": "لطيف! أنت تملك {{username}} بمجرد اكتمال المعاملة.",
     "ens-username-taken": "الاسم مستخدم من قبل :(",
     "ens-username-you-can-follow-progress": "يمكنك متابعة التقدم المحرز في قسم سجل المعاملات في محفظتك.",
@@ -451,6 +466,9 @@
     "ens-your-usernames": "أسماء المستخدمين الخاصة بك",
     "ens-your-your-name": "اسم ENS الخاص بك",
     "enter-12-words": "أدخل 12 كلمة من العبارة الأولية ، مفصولة بمسافات واحدة",
+    "enter-a-private-key": "إدخال مفتاح خاص",
+    "enter-a-seed-phrase": "أدخل العبارة الأولية",
+    "enter-address": "أدخل العنوان",
     "enter-contact-code": "أدخل اسم مستخدم ENS أو مفتاح الدردشة",
     "enter-ens-or-contact-code": "أدخل اسم مستخدم ENS أو مفتاح الدردشة",
     "enter-pair-code": "أدخل رمز الاقتران الخاص بك",
@@ -459,8 +477,10 @@
     "enter-pin": "أدخل رمز المرور المكون من 6 أرقام",
     "enter-puk-code": "أدخل رمز PUK",
     "enter-puk-code-description": "تم حظر رمز المرور المكون من 6 أرقام. الرجاء إدخال رمز PUK لإلغاء قفل رمز المرور.",
+    "enter-recipient-address-or-username": "أدخل عنوان أو اسم المستخدم للمستلم",
     "enter-seed-phrase": "أدخل العبارة الأولية",
     "enter-url": "أدخل عنوان URL",
+    "enter-watch-account-address": "أدخل العنوان لمشاهدته",
     "enter-word": "أدخل كلمة",
     "enter-your-code": "أدخل رمز المرور المكون من 6 أرقام",
     "enter-your-password": "ادخل رقمك السري",
@@ -497,23 +517,24 @@
     "finishing-card-setup-steps": "> تحميل مفاتيح للبطاقة\n> إنشاء حساب متعدد",
     "fleet": "اسطول",
     "fleet-settings": "إعدادات الأسطول",
-    "follow-your-interests": "اتبع اهتماماتك في واحده من العديد من الأحاديث العامة.",
+    "follow-your-interests": "اتبع اهتماماتك في واحده من العديد من المحادثات العامة",
     "free": "↓ مجاني",
     "from": "من عند",
     "gas-limit": "حد الغاز",
     "gas-price": "سعر الغاز",
     "gas-used": "الغاز المستخدم",
-    "generate-a-key": "إنشاء مفتاح",
+    "generate-a-key": "إنشاء مفاتيح",
-    "generate-a-new-account": "إنشاء مفتاح جديد",
+    "generate-a-new-account": "إنشاء مفاتيح",
-    "generate-a-new-key": "إنشاء مفتاح جديد",
+    "generate-a-new-key": "إنشاء مفتاح",
-    "generate-account": "إنشاء مفتاح",
+    "generate-account": "إنشاء مفتاح خاص",
-    "generate-new-key": "إنشاء مفتاح جديد",
+    "generate-new-key": "إنشاء مفتاح",
     "generating-codes-for-pairing": "> تنزيل برنامج المنتج على البطاقة \n > توليد رموز القفل والاقتران",
     "generating-keys": "يتم الآن إنشاء مفاتيح...",
-    "generating-mnemonic": "توليد عبارة ذاكري",
+    "generating-mnemonic": "توليد عبارة ذاكرة",
     "get-started": "البدء",
     "get-status-at": "الحصول على Status في http:\/\/status.im",
     "get-stickers": "الحصول على ملصقات",
+    "glossary": "المعجم",
     "go-to-settings": "انتقل إلى الإعدادات...",
     "got-it": "فهمت ذلك",
     "grant-face-id-permissions": "لمنح إذن Face ID المطلوب ، يرجى الانتقال إلى إعدادات النظام والتأكد من تحديد Status > Face ID",
@@ -535,7 +556,7 @@
     "help": "مساعدة",
     "help-capitalized": "مساعدة",
     "help-center": "مركز المساعدة",
-    "hide-content-when-switching-apps": "حاله اللون الأبيض عند تبديل التطبيقات",
+    "hide-content-when-switching-apps": "إخفاء معاينات Status  عند تبديل التطبيق",
     "history": "التاريخ",
     "hold-card": "امسك البطاقة في الخلف \n من هاتفك",
     "home": "الصفحة الرئيسية",
@@ -548,6 +569,7 @@
     "importing-keycard-multiaccount": "نحن مستعدون لاستيراد بطاقة المفتاح متعددة الحسابات",
     "in-contacts": "في الاتصالات",
     "incoming": "الوارده",
+    "incoming-transaction": "المعاملات الواردة",
     "incorrect-code": [
         "str",
         "آسف الرمز غير صحيح ، يرجى إدخاله مرة أخرى"
@@ -557,25 +579,25 @@
     "install": "↓ تثبيت",
     "install-the-extension": "تثبيت التمديد",
     "intro-message1": "مرحبًا بك في Status! \n انقر فوق هذه الرسالة لتعيين كلمة المرور الخاصة بك والبدء.",
-    "intro-privacy-policy-note1": "Status لا تجمع أو تشارك أو تبيع أي بيانات شخصية. من خلال الاستمرار أنت توافق على",
+    "intro-privacy-policy-note1": "Status لا تجمع أو تشارك أو تبيع أي بيانات شخصية. من خلال الاستمرار أنت توافق على ذلك",
     "intro-privacy-policy-note2": "سياسة الخصوصية",
     "intro-text": "Status  هي بوابتك إلى الويب اللامركزي",
-    "intro-text1": "منصة مفتوحة المصدر للدردشة بشكل آمن والتعامل مع Ethereum blockchain",
+    "intro-text1": "منصة مفتوحة للدردشة بشكل آمن والتعامل مع Ethereum blockchain",
-    "intro-text2": "تم إعداد الحساب المتعدد الخاص بك. من فضلك لا تنسى أن نسجل نسخة احتياطية من العبارة الأولية في ملف التعريف الخاص بك",
+    "intro-text2": "تم إعداد الحساب المتعدد الخاص بك. من فضلك لا تنسى أن نسجل نسخة احتياطية من العبارة الأولية في ملف التعريف الخاص",
-    "intro-text3": "تم إعداد الحساب المتعدد الخاص بك. من فضلك لا تنسى أن نسجل نسخة احتياطية من العبارة الأولية في ملف التعريف الخاص بك",
+    "intro-text3": "تم إعداد الحساب المتعدد الخاص بك. من فضلك لا تنسى أن نسجل نسخة احتياطية من العبارة الأولية في ملف التعريف الخاص",
-    "intro-title1": "اتصال خاص وآمن",
+    "intro-title1": "الاتصالات الخاصة حقا",
     "intro-title2": "محفظة آمنة",
     "intro-title3": "التطبيقات اللامركزية",
-    "intro-wizard-text1": "هويتك آمنة حسب التصميم. تحصل على مفتاح تشفير تم إنشاؤه محليًا",
+    "intro-wizard-text1": "هويتك آمنة حسب التصميم. تحصل على مفتاح تشفير تم إنشاؤه",
-    "intro-wizard-text2": "هذا الاسم هو هويتك في Status. لا يمكن تغييره بمجرد اختيار واحد.",
+    "intro-wizard-text2": "هذا الاسم هو هويتك في Status. لا يمكن تغييره بمجرد اختياره.",
-    "intro-wizard-text3": "يتم تخزين المفتاح الخاص بك محليا. لا يوجد نسخة فقط لديك حق الوصول.",
+    "intro-wizard-text3": "يتم تخزين المفتاح الخاص بك محليا. لا يوجد نسخة، فقط لديك حق الوصول.",
-    "intro-wizard-text4": "تأمين وتشفير المفتاح الخاص بك",
+    "intro-wizard-text4": "تأمين وتشفير المفتاح الخاص",
     "intro-wizard-text6": "ستعلمك Status بالرسائل الجديدة. يمكنك تعديل تفضيلات الإشعارات الخاصة بك لاحقًا في الإعدادات",
     "intro-wizard-title-alt4": "إنشاء كلمه مرور",
     "intro-wizard-title-alt5": "تاكيد كلمه المرور",
-    "intro-wizard-title1": "احصل علي مفتاح أولا",
+    "intro-wizard-title1": "احصل علي مفتاح",
-    "intro-wizard-title2": "اختر المفتاح والاسم",
+    "intro-wizard-title2": "اختيار اسم دردشة",
-    "intro-wizard-title3": "حدد تخزين المفاتيح",
+    "intro-wizard-title3": "اختيار تخزين المفاتيح",
     "intro-wizard-title4": "إنشاء رمز مرور مكون من 6 أرقام",
     "intro-wizard-title5": "تأكيد رمز المرور",
     "intro-wizard-title6": "تمكين الإشعارات",
@@ -598,36 +620,36 @@
     "keycard-blocked": "تم حظر Keycard. \n تحتاج إلى إعادة تعيين البطاقة لمتابعة استخدامها.",
     "keycard-cancel-setup-text": "سيؤدي هذا إلى إلغاء إعداد لوحة المفاتيح. يوصى بشدة بإنهاء الإعداد من أجل استخدام لوحة المفاتيح. هل تريد حقًا الإلغاء؟",
     "keycard-cancel-setup-title": "عملية خطيرة",
-    "keycard-desc": "Android فقط. سوف تحتاج إلى الحصول على بطاقة المفاتيح أولاً",
+    "keycard-desc": "Android فقط. سوف تحتاج إلى الحصول على بطاقة المفاتيح",
     "keycard-existing-multiaccount": "لا يمكنك استرداد هذا الحساب المتعدد لأنه موجود بالفعل على هاتفك",
     "keycard-free-pairing-slots": "يحتوي Keycard على {{n}} فتحات إقران مجانية",
     "keycard-has-multiaccount-on-it": "هذه البطاقة لديها بالفعل حساب متعدد علي ذلك. إذا كنت ترغب في تغييره ، قم بتسجيل الدخول أولا وأعاده تعيين بطاقتك. إذا كنت ترغب في استيراد بطاقة بطاقت متعددة ، يرجى استخدام \"أضافه القائمة متعددة الحسابات\"",
     "keycard-onboarding-finishing-header": "الانتهاء من",
-    "keycard-onboarding-intro-header": "تخزين المفتاح الخاص بك علي بطاقة المفاتيح",
+    "keycard-onboarding-intro-header": "تخزين المفتاح الخاص علي بطاقة المفاتيح",
     "keycard-onboarding-intro-text": "استعد ، قد يستغرق هذا بضع دقائق ، ولكن من المهم تأمين حسابك",
     "keycard-onboarding-pairing-header": "يتم الآن اقران البطاقة...",
     "keycard-onboarding-preparing-header": "يتم الآن اعداد البطاقة...",
     "keycard-onboarding-puk-code-header": "اكتب الرموز لأسفل \n وتخزينها بشكل آمن",
-    "keycard-onboarding-recovery-phrase-description": "مع هذه العبارة الأولية ، يمكنك دائمًا استعادة مفتاحك. اكتب عبارة بذور أسفل. احتفظ به آمنًا ، في وضع عدم الاتصال ، وفصله عن هذا الجهاز.",
+    "keycard-onboarding-recovery-phrase-description": "مع هذه العبارة الأولية، يمكنك دائمًا استعادة مفتاحك. اكتب عبارة بذور أسفل. احتفظ به آمنًا، في وضع عدم الاتصال، وفصله عن هذا الجهاز.",
-    "keycard-onboarding-recovery-phrase-header": "النسخ الاحتياطي لعبارة \"البذور\" ",
+    "keycard-onboarding-recovery-phrase-header": "النسخ الاحتياطي للعبارة الأولية",
-    "keycard-onboarding-recovery-phrase-text": "فقط لاجل عينيك. هذه هي البذور السحرية المستخدمة لإنشاء مفتاحك.",
+    "keycard-onboarding-recovery-phrase-text": "فقط لاجل عينيك. هذه هي العبارة السحرية المستخدمة لإنشاء مفتاحك.",
     "keycard-onboarding-start-header": "امسك البطاقة في الخلف \n من هاتفك للبدء",
     "keycard-onboarding-start-step1": "إنشاء رمز المرور",
-    "keycard-onboarding-start-step1-text": "حوالي دقيقة واحدة. قم بإنشاء رمز مرور مكون من 6 أرقام لتشفير المفتاح",
+    "keycard-onboarding-start-step1-text": "حوالي 1 دقيقة. قم بإنشاء رمز مرور مكون من 6 أرقام لتشفير المفاتيح",
     "keycard-onboarding-start-step2": "اكتب في الاسفل PUK ورمز الاقتران",
     "keycard-onboarding-start-step2-text": "حوالي دقيقه واحده. ستحتاج إلى قطعه من الورق وقلم رصاص لذلك",
     "keycard-onboarding-start-step3": "نسخ احتياطي لعبارة البذور",
     "keycard-onboarding-start-step3-text": "حوالي 1 دقيقة. أيضا قطعة من الورق وقلم رصاص ضرورية",
     "keycard-onboarding-start-text": "والحفاظ على بطاقة للاتصال عبر الهاتف أثناء الإعداد. سيستغرق الإعداد حوالي 4 دقائق",
     "keycard-recovery-intro-button-text": "بدء الاسترداد",
-    "keycard-recovery-intro-header": "استعادة مفتاح المخزنة على keycard",
+    "keycard-recovery-intro-header": "استعادة مفتاح مخزن على keycard",
-    "keycard-recovery-intro-text": "إذا قمت بإنشاء مفتاح باستخدام keycard من قبل وتريد الآن استخدام هذا المفتاح على هذا الجهاز",
+    "keycard-recovery-intro-text": "إذا قمت بإنشاء مفتاح باستخدام keycard من قبل وتريد الآن استخدام هذا المفتاح  الخاص",
     "keycard-recovery-no-key-header": "لا يوجد شيىء لاسترجاعه هنا",
-    "keycard-recovery-no-key-text": "لا تحتوي Keycard على أي مفتاح مخزّن عليه. من أجل استخدامه ، قم بإنشاء مفتاح جديد واختر Keycard لتخزين المفتاح",
+    "keycard-recovery-no-key-text": "لا تحتوي Keycard على أي مفتاح مخزّن. من أجل استخدامه، قم بإنشاء مفتاح جديد واختر Keycard لتخزين المفتاح",
-    "keycard-recovery-phrase-confirm-header": "تاكيد عبارة \"البذور\"",
+    "keycard-recovery-phrase-confirm-header": "تأكيد العبارة الأولية",
-    "keycard-recovery-phrase-confirmation-text": "لا يمكنك القيام بذلك لاحقًا. بدون العبارة الأولية ، لن تتمكن من الوصول إلى مفتاحك أو أي أصول مرتبطة به إذا فقدت جهازك.",
+    "keycard-recovery-phrase-confirmation-text": "لا يمكنك القيام بذلك لاحقًا. بدون العبارة الأولية، لن تتمكن من الوصول إلى مفتاحك أو أي أصول مرتبطة به إذا فقدت جهازك.",
     "keycard-recovery-phrase-confirmation-title": "هل كتبت عبارة seed ؟ ",
-    "keycard-recovery-success-header": "المفتاح الخاص بك تم استرجاعه بنجاح",
+    "keycard-recovery-success-header": "المفتاح الخاص تم استرجاعه بنجاح",
     "keycard-unauthorized-operation": "أنت غير مصرح له بإجراء هذه العملية. \n يرجى الضغط على بطاقة صالحة والمحاولة مرة أخرى.",
     "language": "لغة",
     "learn-more": "أعرف أكثر",
@@ -651,9 +673,11 @@
     "logout-app-content": "سيتم تسجيل الحساب عند إلغاء قفلها مرة أخرى ، سيتم استخدام الشبكة المحددة",
     "logout-are-you-sure": "هل انت متأكد أنك تريد \n لتسجيل الخروج؟",
     "logout-title": "تسجيل الخروج ؟",
+    "mail-should-be-configured": "يجب تغيير  البريد",
     "mailserver-address": "عنوان خادم البريد",
     "mailserver-automatic": "الاختيار التلقائي",
     "mailserver-connection-error": "لا يمكن الاتصال بـ mailserver",
+    "mailserver-content": "عقدة في شبكة Status  تقوم بتوجيه الرسائل وتخزينها لمدة تصل إلى 30 يومًا.",
     "mailserver-details": "تفاصيل mailserver",
     "mailserver-error-content": "تعذر الوصول إلى mailserver  الذي حددته.",
     "mailserver-error-title": "خطأ في الاتصال mailserver",
@@ -665,6 +689,7 @@
     "mailserver-request-error-title": "خطا في طلب mailserver",
     "mailserver-request-retry": "إعادة محاولة الطلب",
     "mailserver-retry": "إعادة المحاولة",
+    "mailserver-title": "Mailserver",
     "main-currency": "العملة الرئيسية",
     "main-networks": "الشبكات الرئيسية",
     "main-wallet": "المحفظة الرئيسية",
@@ -716,10 +741,10 @@
     "mobile-network-stop-syncing": "إيقاف المزامنة",
     "mobile-network-stop-syncing-details": "حتى الاتصال بشبكه Wi-fi ؟",
     "mobile-network-use-mobile": "استخدام بيانات المحمول",
-    "mobile-network-use-mobile-data": "Status تميل إلى استخدام الكثير من البيانات عند مزامنة الدردشات. يمكنك اختيار عدم المزامنة عند شبكة المحمول",
+    "mobile-network-use-mobile-data": "تستخدم Status  الكثير من البيانات عند مزامنة الدردشات.",
     "mobile-network-use-wifi": "Wi-Fi فقط\n",
-    "mobile-syncing-sheet-details": "Status تميل إلى استخدام الكثير من البيانات عند مزامنة الدردشات. يمكنك اختيار عدم المزامنة عند شبكة المحمول",
+    "mobile-syncing-sheet-details": "تستخدم Status  الكثير من البيانات عند مزامنة الدردشات.",
-    "mobile-syncing-sheet-title": "مزامنة باستخدام بيانات الجوال",
+    "mobile-syncing-sheet-title": "هل تريد المزامنة باستخدام بيانات الجوال؟",
     "more": "المزيد",
     "multiaccount-exists-content": "هذا الحساب المتعدد موجود بالفعل. تحتاج فقط لفتحها",
     "multiaccount-exists-title": "الحساب المتعدد موجود بالفعل",
@@ -735,6 +760,7 @@
     "network-details": "تفاصيل الشبكة",
     "network-fee": "رسوم الشبكة",
     "network-id": "عنوان الشبكة",
+    "network-info": "معلومات الشبكة",
     "network-invalid-network-id": "معرف الشبكة المحدد لا يتوافق مع معرف الشبكة بواسطة عنوان RPC",
     "network-invalid-status-code": "رمز status غير صالح: {{code}}",
     "network-invalid-url": "عنوان URL للشبكة غير صالح",
@@ -780,8 +806,8 @@
     "offline-messaging": "Mailserver",
     "offline-messaging-settings": "إعدادات mailserver",
     "ok": "حسنا",
-    "ok-continue": "حسنا، تابع",
+    "ok-continue": "حسنا ، تابع",
-    "ok-got-it": "حسنا ، حصلت عليه",
+    "ok-got-it": "حسنا، حصلت عليه",
     "ok-save-pass": "حسنا ، احفظ كلمة المرور",
     "okay": "حسنا",
     "on": "على",
@@ -795,6 +821,7 @@
     "or": "او",
     "or-choose-a-contact": "أو اختر جهة اتصال",
     "outgoing": "المنتهية",
+    "outgoing-transaction": "المعاملات الصادرة",
     "pair": "إقران الأجهزة",
     "pair-card": "إقران إلى هذا الجهاز",
     "pair-card-question": "البطاقة جاهزة للاقتران",
@@ -816,12 +843,14 @@
     "passphrase": "عبارة المرور",
     "password": "كلمه المرور",
     "password_error1": "كلمات المرور غير متطابقة.",
-    "password-description": "على الأقل 6 خانات. ستحتاج إلى كلمة المرور هذه لفتح الحالة وتأكيد المعاملات",
+    "password-description": "على الأقل 6 خانات. ستحتاج إلى كلمة المرور هذه لفتح Status  وتأكيد المعاملات",
     "password-placeholder": "6 أحرف علي الأقل",
     "password-placeholder2": "تأكيد كلمة المرور الخاصة بك",
     "paste": "لصق",
     "paste-json": "لصق JSON",
     "pay-to-chat": "الدفع للدردشة",
+    "peer-content": "جهاز متصل بشبكة دردشة Status. يمكن لكل مستخدم تمثيل واحد أو أكثر من أقرانه، اعتمادًا على عدد أجهزتهم.",
+    "peer-title": "الند",
     "peers": "الأقران",
     "pending": "المعلقه",
     "pending-confirmation": "في انتظار التأكيد...",
@@ -837,13 +866,13 @@
     "preview-privacy": "معاينة وضع الخصوصية",
     "privacy": "الخصوصيه",
     "privacy-and-security": "الخصوصية والأمان",
-    "privacy-policy": "سياسة الخصوصية",
+    "privacy-policy": "سياسة خاصة",
-    "processing": "معالجة",
+    "processing": "لحظة واحدة",
     "product-information": "معلومات المنتج",
     "profile": "الملف الشخصي",
     "profile-details": "تفاصيل الملف الشخصي",
     "public-chat": "دردشة عامة",
-    "public-chat-description": "المحادثة العامة هي المكان الذي يمكنك فيه الخروج مع الآخرين وتكوين صداقات والتحدث عن مواضيع تهمك.",
+    "public-chat-description": "المحادثة  هي المكان الذي يمكنك فيه الخروج مع الآخرين وتكوين صداقات والتحدث عن مواضيع تهمك.",
     "public-chats": "الدردشات العامة",
     "public-group-status": "عامة",
     "public-group-topic": "الموضوع",
@@ -853,10 +882,10 @@
     "puk-code": "رمز PUK",
     "puk-code-explanation": "إذا نسيت رمز المرور المكون من 6 أرقام أو أدخلته بشكل غير صحيح 3 مرات ، فستحتاج إلى هذا الرمز لإلغاء قفل بطاقتك.",
     "puk-mismatch": "رمز PUK غير متطابق",
-    "qr-code-public-key-hint": "شارك هذا الرمز لبدء الدردشة",
+    "qr-code-public-key-hint": "مشاركة هذا المفتاح لبدء الدردشة",
     "quiet-days": "{{quiet-days}} أيام",
     "quiet-hours": "{{quiet-hours}} ساعات",
-    "re-encrypt-key": "إعادة تشفير المفتاح الخاص بك",
+    "re-encrypt-key": "إعادة تشفير المفتاح الخاص",
     "ready-to-import-keycard-multiaccount": "نحن مستعدون لاستيراد بطاقة المفتاح متعددة الحسابات",
     "receive": "تلقي",
     "receive-transaction": "تلقي المعاملة",
@@ -865,25 +894,26 @@
     "recently-used-stickers": "ستظهر الملصقات المستخدمة مؤخرًا هنا",
     "recipient": "المستلم",
     "recipient-code": "أدخل عنوان المستلم",
+    "recipient-code-placeholder": "0x ... أو username.domain.eth",
     "recover": "استعادة",
-    "recover-key": "مفتاح الوصول",
+    "recover-key": "الوصول إلى المفاتيح الحالية",
     "recover-keycard-multiaccount-not-supported": "استرداد بطاقة المفتاح متعددة مع كلمه المرور غير معتمد",
     "recover-multiaccount-warning": "سيتم كشف معلومات محفظتك عن طريق استيراد هذا الحساب المتعدد.",
     "recover-password-invalid": "هذا الحساب المتعدد موجود بالفعل ولكن كلمات المرور غير متطابقة",
     "recover-password-too-short": "كلمة المرور قصيرة جدا",
     "recover-with-keycard": "استرداد مع بطاقة المفتاح",
-    "recovering-key": "يتم الآن الوصول إلى المفتاح...",
+    "recovering-key": "يتم الآن محاولة الوصول إلى المفتاح...",
     "recovery-confirm-phrase": "تأكيد العبارة الأولية",
     "recovery-phrase": " العبارة الأولية",
     "recovery-phrase-invalid": "العبارة الأولية غير صالحة",
     "recovery-phrase-unknown-words": "بعض الكلمات قد يكون بها أخطاء إملائية",
     "recovery-phrase-wrong-length": "يرجى التأكد من أن العبارة الأولية التي تدخلها تحتوي على 12 أو 15 أو 18 أو 21 أو 24 كلمة.",
-    "recovery-success-text": "سيكون عليك إنشاء رمز أو كلمة مرور جديدة لإعادة تشفير المفتاح",
+    "recovery-success-text": "سيكون عليك إنشاء رمز أو كلمة مرور جديدة لإعادة تشفير المفتاح الخاص بك",
     "recovery-typo-dialog-description": "إذا أدخلت الكلمات الخاطئة ، فستقوم بإنشاء حساب جديد متعدد الحسابات بدلاً من استرداد كلمة قديمة.",
     "recovery-typo-dialog-title": "هل عبارة البذور صحيحة؟",
     "remaining-steps": "الخطوات المتبقية",
     "remember-me": "تذكرني",
-    "remind-me-later": "ذكرني لاحقا",
+    "remind-me-later": "أرني هذا مرة أخرى",
     "remove": "ازاله",
     "remove-from-chat": "إزالة من الدردشة",
     "remove-from-contacts": "إزالة من الاتصالات",
@@ -918,7 +948,12 @@
     "security": "الأمان",
     "see-details": "انظر التفاصيل",
     "see-it-again": "شاهدها مره أخرى",
+    "seed-phrase-content": "مجموعة من الكلمات سهلة القراءة، تم اختيارها عشوائيًا من قائمة BIP39 القياسية وتستخدم لاسترداد أو الوصول إلى حساب Ethereum الخاص بك في محافظ وأجهزة أخرى. يشار إليها أيضًا باسم \"عبارة ذاكرة\" أو \"عبارة الاسترداد\" أو \"المحفظة الاحتياطية\" عبر نظام التشفير البيئي. تستخدم معظم تطبيقات التشفير نفس المعيار لإنشاء حسابات.",
+    "seed-phrase-title": " العبارة الأولية",
+    "select": "حدد",
+    "select-account": "حدد حساب",
     "select-account-dapp": "حدد الحساب الذي ترغب في استخدامه مع Dapps",
+    "select-account-first": "تحديد حساب أولاً",
     "select-chat": "اختر الدردشة لبدء المراسلة",
     "selected": "مختارة",
     "selected-for-you": "مختارة لك",
@@ -940,7 +975,7 @@
     "sending": "إرسال",
     "sent-at": "أرسلت في",
     "set-a-topic": "إنشاء موضوع",
-    "set-currency": "تعيين العملة",
+    "set-currency": "ضبط العملة الافتراضية",
     "set-dapp-access-permissions": "تعيين أذونات الوصول إلى DApp",
     "settings": "الإعدادات",
     "share": "مشاركه",
@@ -953,6 +988,7 @@
     "share-profile": "مشاركة الملف الشخصي",
     "share-profile-link": "مشاركة رابط الملف الشخصي",
     "share-public-chat-text": "تحقق من هذه الدردشة العامة على تطبيق Status: {{link}}",
+    "shared": "المشتركة",
     "sharing-copied-to-clipboard": "نسخ",
     "sharing-copy-to-clipboard": "نسخ",
     "sharing-share": "مشاركه...",
@@ -960,6 +996,7 @@
     "show-more": "عرض المزيد",
     "show-qr": "عرض رمز الاستجابة السريعة",
     "sidechain-text": "أنت على {{sidechain}} Sidechain.",
+    "sign-and-send": "التوقيع والإرسال",
     "sign-in": "فتح",
     "sign-in-to-another": "فتح حساب آخر متعدد",
     "sign-in-to-status": "فتح Status",
@@ -1010,11 +1047,11 @@
     "testnet-text": "أنت في {{testnet}} Testnet. لا ترسل ETH الحقيقي أو SNT إلى عنوانك",
     "text-input-disabled": "رجاءً انتظر لحظة...",
     "this-device": "هذا الجهاز",
-    "this-device-desc": "سيتم تشفير المفتاح الخاص بك وتخزينها بشكل آمن",
+    "this-device-desc": "سيتم تشفير المفتاح الخاص بك وتخزينه بشكل آمن",
     "this-is-you-signing": "هذه هي عبارة توقيعك",
     "this-will-take-few-seconds": "هذا سيستغرق بضع ثوان",
-    "three-words-description": "يجب أن تشاهد هذه الكلمات 3 قبل توقيع كل معاملة",
+    "three-words-description": "يجب أن تشاهد هذه الكلمات 3 قبل توقيع  المعاملة",
-    "three-words-description-2": "إذا رأيت مجموعة تحرير وسرد مختلفة ، فقم بإلغاء المعاملة وتسجيل الخروج.",
+    "three-words-description-2": "إذا رأيت مجموعة تحرير وإدراج مختلفة، فقم بإلغاء المعاملة وتسجيل الخروج.",
     "to": "إلى",
     "to-block": "حظر",
     "to-enable-biometric": "لتمكين {{bio-type-label}} ، يجب حفظ كلمة مرورك على شاشة إلغاء القفل",
@@ -1026,6 +1063,7 @@
     "token-details": "تفاصيل token",
     "topic-name-error": "استخدم الأحرف الصغيرة فقط (من أ إلى ي) والأرقام والشرطات (-). لا تستخدم مفاتيح الدردشة",
     "transaction": "المعاملات",
+    "transaction-declined": "تم رفض الصفقة",
     "transaction-description": "اعتبرها مكتملة بعد 12 تاكيد علي الشبكة.",
     "transaction-details": "تفاصيل المعاملات",
     "transaction-failed": "فشلت المعاملة",
@@ -1037,6 +1075,7 @@
     "transactions-filter-title": "سجل التصفية",
     "transactions-history": "سجل المعاملات",
     "transactions-history-empty": "لا توجد معاملات في تاريخك حتى الآن",
+    "transactions-load-more": "التعرف على المزيد",
     "transactions-sign": "تسجيل",
     "transactions-sign-transaction": "توقيع المعاملة",
     "tribute-required-by-multiaccount": "{{multiaccount-name}} يتطلب SNT لبدء الدردشة.",
@@ -1097,14 +1136,14 @@
     "view-profile": "عرض الصفحة الشخصية",
     "view-signing": "عرض عبارة التوقيع",
     "view-superrare": "عرض في SuperRare",
-    "waiting-for-wifi": "مزامنة السجل في وضع عدم الاتصال ، في انتظار اتصال Wi-Fi.",
+    "waiting-for-wifi": "مزامنة السجل في وضع عدم الاتصال، في انتظار اتصال Wi-Fi.",
     "waiting-for-wifi-change": "تغيير",
     "waiting-to-sign": "في انتظار توقيع المعاملة ...",
     "wallet": "المحفظه",
     "wallet-address": "عنوان المحفظة",
     "wallet-asset": "الأصول",
     "wallet-assets": "الأصول",
-    "wallet-backup-recovery-title": "النسخ الاحتياطي للعبارة الاولية الخاصة بك",
+    "wallet-backup-recovery-title": "النسخ الاحتياطي للعبارة الاولية الخاصة",
     "wallet-choose-recipient": "اختيار المستلم",
     "wallet-collectibles": "قابلة للجمع",
     "wallet-insufficient-funds": "رصيد غير كاف",
@@ -1112,6 +1151,8 @@
     "wallet-invalid-address": "عنوان خاطئ: \n {{data}}",
     "wallet-invalid-address-checksum": "خطأ في العنوان: \n {{data}}",
     "wallet-invalid-chain-id": "الشبكة غير متطابقة: \n {{data}} لكن السلسلة الحالية هي {{chain}}",
+    "wallet-key-content": "عنوان سداسي عشري مكون من 64 حرفًا يستند إلى معيار Ethereum ويبدأ بـ 0x. في مواجهة الجمهور، تتم مشاركة مفتاح محفظتك مع الآخرين عندما تريد تلقي الأموال. يشار إليها أيضًا باسم \"عنوان Ethereum\" أو \"عنوان المحفظة\".",
+    "wallet-key-title": "مفتاح المحفظة",
     "wallet-manage-assets": "إدارة الأصول",
     "wallet-offline": "محفظة غير متصلة بالانترنت",
     "wallet-request": "طلب",

translations/fr.json

@@ -367,7 +367,7 @@
     "ens-displayed-with": "Vos messages sont affichés aux autres avec",
     "ens-get-name": "Obtenir un nom d'utilisateur universel",
     "ens-got-it": "Ok, j'ai compris",
-    "ens-locked": "Nom d'utilisateur verrouillé. Vous ne pourrez pas le déverrouiller avant le 25.05.2020",
+    "ens-locked": "Nom d'utilisateur verrouillé. Vous ne pourrez pas le déverrouiller avant le {{date}}",
     "ens-network-restriction": "Disponible uniquement sur Mainnet",
     "ens-no-usernames": "Vous n'avez aucun nom d'utilisateur connecté",
     "ens-powered-by": "Propulsé par Ethereum Name Services",
@@ -1129,4 +1129,4 @@
     "your-data-belongs-to-you-description": "Status ne peut pas vous aider à récupérer votre multi-compte si vous perdez votre phrase de récupération. Vous êtes responsable de la sécurité de vos données. La sauvegarde de votre phrase de récupération constitue la meilleure protection.",
     "your-recovery-phrase": "Votre phrase de récupération",
     "your-recovery-phrase-description": "Ceci est votre phrase de récupération. Vous l'utilisez pour prouver qu'il s'agit de votre portefeuille. Vous ne le voyez qu'une fois! Ecrivez-le sur du papier et conservez-le dans un endroit sûr. Vous en aurez besoin si vous perdez ou réinstallez votre portefeuille."
-}
+}

translations/it.json

@@ -2,13 +2,16 @@
     "about-app": "A proposito di",
     "about-key-storage-content": "Status non accederà mai alla tua chiave privata. Assicurati di eseguire il backup della tua frase di recupero. Se si perde il telefono è l'unico modo per accedere alle tue chiavi .",
     "about-key-storage-title": "Informazioni sulla memorizzazione delle chiavi",
-    "about-names-content": "Il sistema è progettato per mantenere la tua identità sicura e privata. La coppia di chiavi crittografiche associata al tuo account viene generata localmente. Il nome e l'immagine sono generate in funzione di questa coppia di chiavi: sono univoci e anonimi. Nessuno può fingere di essere te. Nessuno può vedere il tuo vero nome a meno che tu non glielo fornisca.",
+    "about-names-content": "Nessuno può fingere di essere te! Sei anonimo di default e non dovrai mai rivelare il tuo vero nome. È possibile registrare un nome personalizzato per una piccola quota.",
-    "about-names-title": "Informazioni sui nomi",
+    "about-names-title": "I nomi non possono essere cambiati",
-    "access-key": "Chiave di accesso",
+    "accept-and-share-address": "Accetta e condividi indirizzo",
+    "access-key": "Accedi a chiavi esistenti",
     "account-added": "Account aggiunto",
     "account-color": "Colore dell'account",
+    "account-content": "Il tuo account Status, accessibile dalla frase di recupero che crei o importi durante l'onboarding. Un account Status può contenere più di un indirizzo Ethereum, oltre a quello creato durante l'onboarding. Ci riferiamo a questi come account aggiuntivi all'interno del portafoglio.",
     "account-name": "Nome utente",
     "account-settings": "Impostazioni account",
+    "account-title": "Account",
     "accounts": "Accounts",
     "active-online": "In linea",
     "active-unknown": "Sconosciuto",
@@ -28,13 +31,16 @@
     "add-to-contacts": "Aggiungi ai contatti",
     "add-to-contacts-text": "Aggiungendo un utente all'elenco dei contatti, condividi l'indirizzo del tuo portafoglio",
     "address": "Indirizzo",
+    "address-received": "Indirizzo ricevuto",
+    "address-request-accepted": "Richiesta di indirizzo accettata",
+    "address-requested": "Indirizzo richiesto",
     "advanced": "Avanzate",
     "advanced-settings": "Impostazioni avanzate",
     "agree-by-continuing": "Continuando accetti \n i nostri",
     "all": "Tutti",
-    "allow": "Consentire",
+    "allow": "Consenti",
     "allowing-authorizes-this-dapp": "Autorizzare questo DApp a recuperare l'indirizzo del tuo portafoglio e abilitare Web3",
-    "already-have-asset": "Hai già questa risorsa",
+    "already-have-asset": "Hai già questo cryptoasset",
     "always-allow": "Consenti sempre",
     "amount": "Importo",
     "amount-placeholder": "Specifica importo ...",
@@ -48,13 +54,13 @@
     "available": "Disponibile",
     "available-participants": {
         "one": "Puoi selezione solo un'altro partecipante",
-        "other": "Puoi selezionare {{count}} participanti ancora"
+        "other": "Puoi selezionare ancora {{count}} participanti"
     },
     "back": "Indietro",
     "back-up-seed-phrase": "Backup frase di recupero",
     "back-up-your-seed-phrase": "Backup frase di recupero",
-    "backup-recovery-phrase": "Backup frase di recupero",
+    "backup-recovery-phrase": "Backup della frase di recupero",
-    "backup-your-recovery-phrase": "Backup frase di recupero",
+    "backup-your-recovery-phrase": "Backup della frase di recupero",
     "balance": "Saldo",
     "begin-set-up": "Inizia la configurazione",
     "biometric-auth-android-sensor-desc": "Sensore tattile",
@@ -73,15 +79,15 @@
     "biometric-disable-bioauth": "disabilita {{bio-type-label}}",
     "biometric-disable-password-description": "Disabilitando questa opzione, si ",
     "biometric-disable-password-title": "Disabilita il salvataggio della password",
-    "biometric-enable": "Se non si desidera utilizzare la Keycard ogni volta per accedere all'app, abilitare ",
+    "biometric-enable": "Se non vuoi digitare ogni volta la password per accedere all'app, abilita l'accesso via {{bio-type-label}}",
     "biometric-enable-button": "Abilita {{bio-type-label}}",
-    "biometric-enable-keycard": "Se non si desidera utilizzare la Keycard ogni volta per accedere all'app, abilitare ",
+    "biometric-enable-keycard": "Se non vuoi utilizzare ogni volta la Keycard per accedere all'app, abilita l'accesso via {{bio-type-label}}",
     "biometric-secure-with": "Proteggi con {{bio-type-label}}",
     "blank-keycard-text": "È possibile procedere con la tua keycard una volta che hai generato le tue chiavi ed il tuo nome",
-    "blank-keycard-title": "Sembra che tu abbia toccato \nuna keycard vuota",
+    "blank-keycard-title": "Sembra che tu abbia usato \nuna keycard vuota",
     "block": "Blocco",
     "block-contact": "Blocca questo utente",
-    "block-contact-details": "Il blocco eliminerà i messaggi precedenti di questo utente e impedirà a quelli nuovi di raggiungerti",
+    "block-contact-details": "Il blocco eliminerà i messaggi già ricevuti da questo utente e impedirà di riceverne altri",
     "blocked-users": "Utenti bloccati",
     "bootnode-address": "Indirizzo bootnode",
     "bootnode-details": "Dettagli bootnode",
@@ -89,7 +95,7 @@
     "bootnodes": "Bootnodes",
     "bootnodes-enabled": "Bootnodes abilitati",
     "bootnodes-settings": "Impostazioni dei bootnode",
-    "browsed-websites": "I siti Web visitati verranno visualizzati qui.",
+    "browsed-websites": "La cronologia del browser verrà visualizzata qui",
     "browser": "Browser",
     "browser-not-secure": "La connessione non è sicura! Non firmare transazioni o inviare dati personali su questo sito.",
     "browser-secure": "La connessione è sicura. Assicurati di fidarti davvero a questo sito prima di firmare transazioni o di inserire dati personali.",
@@ -98,7 +104,7 @@
     "browsing-open-in-android-web-browser": "Apri in Android",
     "browsing-open-in-ios-web-browser": "Apri in iOS",
     "browsing-open-in-status": "Apri in Status",
-    "browsing-site-blocked-description1": "Abbiamo rilevato potenziali attività dannose da questo indirizzo. Per proteggere te e il tuo portafoglio, stiamo impedendo un'ulteriore navigazione. \n\n Se ritieni che si tratti di un errore, faccelo sapere in",
+    "browsing-site-blocked-description1": "Abbiamo rilevato potenziali attività malevole da questo indirizzo. Per proteggere te e il tuo portafoglio, stiamobloccando la navigazione. \n\n Se ritieni che si tratti di un errore, faccelo sapere in",
     "browsing-site-blocked-description2": "chat pubblica.",
     "browsing-site-blocked-go-back": "Torna indietro",
     "browsing-site-blocked-title": "Questo sito è bloccato",
@@ -111,6 +117,7 @@
     "cannot-use-default-pin": "Il codice di accesso 000000 non è consentito.\nSi prega di utilizzare un altro numero",
     "cant-read-card": "Non riesco a leggere la carta",
     "cant-read-card-error-explanation": "La scheda deve rimanere in contatto con il telefono durante l'installazione in modo che possa connettersi al lettore NFC",
+    "cant-report-bug": "Impossibile segnalare un bug",
     "card-already-linked": "La carta è già collegata a un altro Multi-Account",
     "card-is-blank": "Questa carta è vuota",
     "card-is-empty": "La carta è vuota",
@@ -130,11 +137,16 @@
     "chaos-unicorn-day": "Chaos Unicorn Day",
     "chaos-unicorn-day-details": "🦄🦄🦄🦄🦄🦄🦄🚀!",
     "chat": "Chat",
-    "chat-and-transact": "Chatta ed esegui transazioni privatamente con i tuoi amici.",
+    "chat-and-transact": "Chatta ed effettua transazioni in privato con gli amici",
     "chat-key": "Chiave chat",
+    "chat-key-content": "I messaggi sul protocollo Status vengono inviati e ricevuti tramite chiavi di cifratura. La chiave di chat pubblica è una stringa di caratteri che condividete con gli altri in modo che possano inviarvi messaggi.",
+    "chat-key-title": "Chiave di chat",
     "chat-name": "Nome chat",
+    "chat-name-content": "Tre parole casuali, derivate algoritmicamente dalla chiave della chat e utilizzate come alias predefinito nella chat. I nomi delle chat sono unici; nessun altro utente può avere le stesse tre parole.",
+    "chat-name-title": "Nome della chat",
     "chat-settings": "Impostazioni chat",
     "chats": "Chat",
+    "check-on-etherscan": "Controlla su etherscan",
     "check-your-recovery-phrase": "Controlla la tua frase di recupero",
     "choose-authentication-method": "Scegli un metodo di autenticazione per proteggere il tuo Multi-Account",
     "clear": "Cancella tutto",
@@ -151,7 +163,7 @@
     "command-button-sent": "Inviato",
     "command-requesting": "Richiesta di {{amount}} {{asset}}",
     "command-sending": "Invia transazione {{amount}} {{asset}}",
-    "complete-exclamation": "Completo!",
+    "complete-exclamation": "Completato!",
     "complete-hardwallet-setup": "Questa carta è ora una parte essenziale della sicurezza del tuo Multi-Account. Le transazioni non possono essere inviate senza di essa.",
     "completed": "Completato",
     "completing-card-setup": "Completamento della configurazione della scheda",
@@ -161,11 +173,11 @@
     "confirmations-helper-text": "Quando la transazione ha 12 conferme si può considerare conclusa.",
     "connect": "Collega",
     "connect-mailserver-content": "Connettersi a {{name}} ?",
-    "connected": "Collegato",
+    "connected": "Connesso",
     "connecting": "Connessione in corso...",
     "connecting-requires-login": "La connessione ad un'altra rete richiede il login",
     "connection-with-the-card-lost": "La connessione con la carta \n è stata persa",
-    "connection-with-the-card-lost-setup-text": "Per riprendere l'installazione, tenere la scheda sulla \n parte posteriore del telefono e mantenere \n contatto scheda-telefono",
+    "connection-with-the-card-lost-setup-text": "Per riprendere l'installazione, tenere\nla scheda appoggiata alla parte posteriore\ndel telefono e mantenere contatto.",
     "connection-with-the-card-lost-text": "Per procedere, tieni la scheda sul retro del telefono",
     "contact-code": "Chiave chat",
     "contact-s": {
@@ -187,7 +199,7 @@
     "create-a-pin": "Crea un codice di accesso a 6 cifre",
     "create-group-chat": "Crea chat di gruppo",
     "create-multiaccount": "Crea un Multi-Account",
-    "create-new-key": "Crea una nuova chiave",
+    "create-new-key": "Ottieni nuove chiavi",
     "create-pin": "Crea un codice di accesso a 6 cifre",
     "create-pin-description": "Per sbloccare Status e confermare le transazioni avrai bisogno della tua carta + questo codice di accesso a 6 cifre",
     "created-group-chat-description": "Hai creato il gruppo {{group-name}}",
@@ -205,7 +217,7 @@
     "currency-display-name-bnd": "Dollaro del Brunei",
     "currency-display-name-bob": "Boliviano",
     "currency-display-name-brl": "Real brasiliano\n",
-    "currency-display-name-btn": "Ngultrum bhutanese",
+    "currency-display-name-btn": "Ngultrum del Bhutan",
     "currency-display-name-cad": "Dollaro canadese",
     "currency-display-name-chf": "Franco Svizzero",
     "currency-display-name-clp": "Peso Cileno",
@@ -278,9 +290,8 @@
     "current-pin-description": "Inserisci il tuo codice di accesso a 6 cifre per procedere",
     "custom": "Personalizzato",
     "custom-networks": "Reti personalizzate",
-    "custom-seed-phrase": "Frase di recupero personalizzata",
+    "custom-seed-phrase": "Frase di recupero errata",
-    "custom-seed-phrase-text-1": "Sembra una frase seed personalizzata e non corrisponde al dizionario di Status. Questo potrebbe anche significare",
+    "custom-seed-phrase-text-1": "Questa frase di recupero contiene parole non presenti nel nostro dizionario. Controlla se ci sono errori.",
-    "custom-seed-phrase-text-2": "alcune parole sono scritte male.",
     "dapp": "ÐApp",
     "dapp-would-like-to-connect-wallet": "vorrebbe connettersi a",
     "dapps": "ÐApps",
@@ -311,6 +322,7 @@
     "datetime-today": "oggi",
     "datetime-yesterday": "Ieri",
     "decimals": "Decimali",
+    "decline": "Rifiuta",
     "decryption-failed-confirm": "Applica",
     "decryption-failed-content": "Non siamo stati in grado di decrittografare i tuoi dati, potresti dover creare un nuovo Multi-Account e cancellare i tuoi vecchi dati toccando “Applica”. Facendo clic su \"Annulla\", riproveremo",
     "decryption-failed-title": "Non siamo stati in grado di decrittografare i tuoi dati",
@@ -332,10 +344,10 @@
     "delete-network-confirmation": "Sei sicuro di voler eliminare questa rete?",
     "delete-network-error": "Si prega di connettersi ad un'altra rete prima di cancellare questa",
     "delete-network-title": "Cancellare la rete?",
-    "deny": "Negare",
+    "deny": "Nega",
     "derivation-path": "Percorso di derivazione",
     "description": "Descrizione",
-    "desktop-alpha-release-warning": "Grazie per aver provato Status Desktop! Questa è una prima versione alfa focalizzata sulla chat e manca alcune funzionalità presenti nel client mobile e può contenere bug e altri problemi. Si prega di notare che si tratta di una versione alfa e vi consigliamo di utilizzare questa app solo a scopo di test e si assume la piena responsabilità per tutti i rischi relativi ai dati e ai fondi. Status non fa rivendicazioni di sicurezza o integrità dei fondi in queste build.",
+    "desktop-alpha-release-warning": "Grazie per aver provato Status Desktop! Questa è una prima versione alfa focalizzata sulla chat. Mancano alcune funzionalità presenti nel client mobile e può contenere bug e altri problemi. Si prega di notare che si tratta di una versione alfa e ti consigliamo di utilizzare questa app solo a scopo di test. Usandola ti assumerai la piena responsabilità per tutti rischi relativi ai dati e ai fondi. Status, in queste build, non garantisce la sicurezza o l'integrità dei fondi.",
     "dev-mode": "Modalità di sviluppo",
     "dev-mode-settings": "Impostazioni modalità di sviluppo",
     "device-pairing": "Associazione del dispositivo",
@@ -350,7 +362,7 @@
     "done": "Fatto",
     "edit": "Modifica",
     "edit-profile": "Modifica Profilo",
-    "empty-chat-description": "Non ci sono messaggi \n in questa chat ancora",
+    "empty-chat-description": "Non ci sono ancora\n messaggi in questa chat",
     "empty-chat-description-one-to-one": "Tutti i messaggi che invii qui sono crittografati e possono essere letti solo da te e",
     "empty-chat-description-public": "È stato tranquillo qui per le ultime {{quiet-hours}}. Avviare la conversazione o",
     "empty-chat-description-public-share-this": "Condividi questa chat.",
@@ -367,8 +379,10 @@
     "ens-displayed-with": "I tuoi messaggi vengono visualizzati agli altri con",
     "ens-get-name": "Ottieni un nome utente universale",
     "ens-got-it": "Ok capito",
-    "ens-locked": "Nome utente bloccato. Non sarà possibile rilasciarlo fino al 25.05.2020",
+    "ens-locked": "Nome utente bloccato. Non sarà possibile rilasciarlo fino al {{date}}",
-    "ens-network-restriction": "Disponibile solo su Rete Principale",
+    "ens-name-content": "Alias personalizzato per la tua chiave di chat che puoi registrare usando Ethereum Name Service. I nomi ENS sono nomi utente decentralizzati.",
+    "ens-name-title": "Nome ENS",
+    "ens-network-restriction": "Disponibile solo su Mainnet",
     "ens-no-usernames": "Non hai nessun nome utente collegato",
     "ens-powered-by": "Offerto da Ethereum Name Services",
     "ens-primary-username": "Nome utente principale",
@@ -378,12 +392,12 @@
     "ens-release-username": "Rilascia nome utente",
     "ens-remove-hints": "La rimozione scollegherà il nome utente dalla chiave.",
     "ens-remove-username": "Rimuovi nome utente",
-    "ens-saved": "è ora collegato con la tua chiave e può essere utilizzato in Status.",
+    "ens-saved": "è ora collegato con la chiave di chat e può essere utilizzato in Status.",
     "ens-saved-title": "Nome utente aggiunto",
     "ens-show-username": "Mostra il mio nome utente ENS nelle chat",
     "ens-terms-header": "Termini di registrazione del nome",
     "ens-terms-point-1": "I fondi vengono depositati per 1 anno. Il tuo SNT sarà bloccato, ma non speso.",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b (Registro ENS).",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e (Registro ENS).",
     "ens-terms-point-2": "Dopo 1 anno, puoi rilasciare il nome e riavere il tuo deposito oppure non agire per mantenerlo.",
     "ens-terms-point-3": "Se i termini del contratto cambiano - ad es. Status effettua aggiornamenti del contratto - l'utente ha il diritto di rilasciare il nome utente indipendentemente dal tempo trascorso.",
     "ens-terms-point-4": "Il controllore del contract non può accedere ai fondi depositati. Possono solo essere spostati indietro all'indirizzo che li ha inviati.",
@@ -397,16 +411,16 @@
     "ens-transaction-pending": "Transazione in attesa...",
     "ens-understand": "Comprendo che il mio indirizzo di portafoglio sarà collegato pubblicamente al mio nome utente.",
     "ens-username": "Nome ENS",
-    "ens-username-already-added": "Il nome utente è già collegato alla tua chiave e può essere utilizzato all'interno di Status.",
+    "ens-username-already-added": "Il nome utente è già collegato alla tua chiave di chat e può essere utilizzato all'interno di Status.",
     "ens-username-available": "✓ Nome utente disponibile!",
-    "ens-username-connected": "Questo nome utente è di tua proprietà e connesso con la tua chiave Chat.",
+    "ens-username-connected": "Questo nome utente è di tua proprietà ed è associato alla tua chiave di chat.",
     "ens-username-connected-continue": "Continua a impostare `Mostra il mio nome utente ENS nelle chat`.",
-    "ens-username-connected-with-different-key": "Per continuare sarà necessaria una transazione per collegare il nome utente con la chiave corrente.",
+    "ens-username-connected-with-different-key": "Per continuare sarà necessaria una transazione per collegare il nome utente con la tua chiave di chat.",
     "ens-username-connection-confirmation": "{{username}} verrà collegato una volta completata la transazione.",
     "ens-username-hints": "Almeno 4 caratteri. Solo lettere latine, numeri e lettere minuscole.",
     "ens-username-invalid": "Solo lettere e numeri.",
     "ens-username-owned": "✓ Il nome utente è di tua proprietà.",
-    "ens-username-owned-continue": "Continuando assocerai questo nome utente con la tua chiave.",
+    "ens-username-owned-continue": "Continuando assocerai questo nome utente alla tua chiave di chat.",
     "ens-username-registration-confirmation": "Bello! Una volta completata la transazione possiederai {{username}}.",
     "ens-username-taken": "Nome utente già preso :(",
     "ens-username-you-can-follow-progress": "Puoi seguire i progressi nella sezione Cronologia transazioni del tuo portafoglio.",
@@ -415,18 +429,21 @@
     "ens-want-custom-domain": "Possiedo un nome su un altro dominio",
     "ens-want-domain": "Voglio un dominio stateofus.eth",
     "ens-welcome-hints": "I nomi ENS trasformano quei lunghi e folli indirizzi in nomi utente unici.",
-    "ens-welcome-point-1": "Il tuo indirizzo di portafoglio complesso (0x ...) diventa un URL facile da leggere, ricordare e condividere:",
+    "ens-welcome-point-1": "Il tuo complicato indirizzo di portafoglio (0x...) diventa un URL facile da leggere, ricordare e condividere: ",
     "ens-welcome-point-1-title": "Semplifica il tuo indirizzo ETH",
     "ens-welcome-point-2": "Registrati una volta per conservare il nome per sempre. Dopo 1 anno, puoi rilasciare il nome e riavere il tuo SNT.",
     "ens-welcome-point-2-title": "10 SNT per la registrazione",
     "ens-welcome-point-3": "Condividi il tuo nome per chattare su Status o ricevere ETH e token",
-    "ens-welcome-point-3-title": "Connetti e ricevi pagamenti",
+    "ens-welcome-point-3-title": "Connettiti e ricevi pagamenti",
-    "ens-welcome-point-4": "Puoi verificare e aggiungere qualsiasi nome utente che possiedi nei passaggi successivi.",
+    "ens-welcome-point-4": "Puoi verificare e aggiungere qualsiasi nome utente che già possiedi.",
     "ens-welcome-point-4-title": "Possiedi già un nome utente?",
     "ens-your-username": "Il tuo nome utente",
     "ens-your-usernames": "I tuoi nomi utente",
     "ens-your-your-name": "Il tuo nome ENS",
     "enter-12-words": "Inserisci le 12 parole della frase di recupero, separate da spazi singoli",
+    "enter-a-private-key": "Inserisci una chiave privata",
+    "enter-a-seed-phrase": "Inserisci la tua frase di recupero",
+    "enter-address": "Inserisci indirizzo",
     "enter-contact-code": "Inserisci il nome utente ENS o la chiave chat",
     "enter-ens-or-contact-code": "Inserisci il nome utente ENS o la chiave chat",
     "enter-pair-code": "Inserisci il tuo codice di accoppiamento",
@@ -435,13 +452,15 @@
     "enter-pin": "Inserisci il codice di accesso a 6 cifre",
     "enter-puk-code": "Inserisci il codice PUK",
     "enter-puk-code-description": "Il codice di accesso a 6 cifre è stato bloccato.\n Inserisci il codice PUK per sbloccare il codice di accesso.",
+    "enter-recipient-address-or-username": "Immettere l'indirizzo o il nome utente del destinatario",
     "enter-seed-phrase": "Inserisci la tua frase di recupero",
     "enter-url": "Inserisci l'URL",
+    "enter-watch-account-address": "Inserisci l'indirizzo da guardare",
     "enter-word": "Inserisci parola",
     "enter-your-code": "Inserisci il tuo codice a 6 cifre",
     "enter-your-password": "Inserisci la tua password...",
     "error": "Errore",
-    "error-unable-to-get-balance": "Impossibile ottenere saldo",
+    "error-unable-to-get-balance": "Impossibile ottenere il saldo",
     "error-unable-to-get-prices": "Errore di conversione valuta. Aggiorna lo schermo per riprovare.",
     "error-unable-to-get-token-balance": "Impossibile ottenere il saldo token",
     "errors": "Errori",
@@ -457,10 +476,10 @@
     "extension-hooks-cannot-be-added": "I seguenti hook di questa estensione non possono essere aggiunti: {{hooks}}",
     "extension-install-alert": "La modalità di sviluppo è necessaria per installare un'estensione. Vuoi abilitare e continuare l'installazione?",
     "extension-is-already-added": "L'estensione è già installata",
-    "extension-url": "Inserisci un URL di estensione",
+    "extension-url": "Inserisci l'URL di un'estensione",
     "extensions": "Estensioni",
     "extensions-camera-send-picture": "Invia immagine",
-    "extensions-chain-id-not-found": "chain-id non trovato o non creato da questa estensione",
+    "extensions-chain-id-not-found": "chain-id non trovato o non è stato creato da questa estensione",
     "extensions-disclaimer": "Questa estensione è di terze parti e non è stata creata da Status. Assicurati di fidarti dello sviluppatore prima dell'installazione",
     "extensions-network-not-found": "rete non trovata per chain-id specificato",
     "failed": "Fallita",
@@ -473,23 +492,24 @@
     "finishing-card-setup-steps": "> Caricamento delle chiavi sulla scheda \n > Generazione di più account",
     "fleet": "Fleet",
     "fleet-settings": "Impostazioni Fleet",
-    "follow-your-interests": "Segui i tuoi interessi in una delle tante chat pubbliche.",
+    "follow-your-interests": "Entra in una chat pubblica e incontra nuove persone",
     "free": "Gratis",
     "from": "Da",
     "gas-limit": "Limite di gas",
     "gas-price": "Prezzo del gas",
     "gas-used": "Gas utilizzato",
-    "generate-a-key": "Genera una nuova chiave",
+    "generate-a-key": "Genera le chiavi",
-    "generate-a-new-account": "Genera un nuovo account",
+    "generate-a-new-account": "Genera le chiavi",
-    "generate-a-new-key": "Genera una nuova chiave",
+    "generate-a-new-key": "Genera nuove chiavi",
-    "generate-account": "Genera account",
+    "generate-account": "Genera le chiavi",
-    "generate-new-key": "Genera una nuova chiave",
+    "generate-new-key": "Genera le chiavi",
-    "generating-codes-for-pairing": "> Download del software del prodotto sulla scheda \n > Generazione di codici di sblocco e associazione",
+    "generating-codes-for-pairing": "> Download del software di prodotto sulla scheda \n > Generazione di codici di sblocco e associazione",
     "generating-keys": "Generazione delle chiavi in corso...",
-    "generating-mnemonic": "Generazione della frase mnemonica",
+    "generating-mnemonic": "Generazione della frase di recupero",
     "get-started": "Iniziare",
-    "get-status-at": "Ottieni Status su http:\/\/status.im",
+    "get-status-at": "Scarica Status su http:\/\/status.im",
-    "get-stickers": "Ottieni adesivi",
+    "get-stickers": "Scarica adesivi",
+    "glossary": "Glossario",
     "go-to-settings": "Vai alle impostazioni...",
     "got-it": "Ho capito",
     "grant-face-id-permissions": "Per concedere l'autorizzazione Face ID richiesta, andare alle impostazioni del sistema e assicurarsi che Status > Face ID sia selezionato",
@@ -511,7 +531,7 @@
     "help": "aiuto",
     "help-capitalized": "Aiuto",
     "help-center": "Centro Assistenza",
-    "hide-content-when-switching-apps": "Nascondere il contenuto quando si passa da un'applicazione all'altra",
+    "hide-content-when-switching-apps": "Nascondere il contenuto di Status quando si passa da un'applicazione all'altra",
     "history": "Cronologia",
     "hold-card": "Tieni la carta sul retro \n del tuo telefono",
     "home": "Home",
@@ -524,6 +544,7 @@
     "importing-keycard-multiaccount": "Importazione di un Multi-Account dalla keycard in corso",
     "in-contacts": "Nei contatti",
     "incoming": "In arrivo",
+    "incoming-transaction": "Transazione in entrata",
     "incorrect-code": [
         "str",
         "Spiacenti, il codice non è corretto, ti preghiamo di inserirlo di nuovo"
@@ -533,28 +554,28 @@
     "install": "Installa",
     "install-the-extension": "installa l'estensione",
     "intro-message1": "Benvenuto in Status! \n Tocca questo messaggio per impostare la password e iniziare.",
-    "intro-privacy-policy-note1": "Status non raccoglie, non condivide e non vende dati personali. Continuando siete d'accordo con il ",
+    "intro-privacy-policy-note1": "Status non raccoglie, non condivide e non vende dati personali. Continuando siete d'accordo con l'",
     "intro-privacy-policy-note2": "Informativa sulla privacy",
     "intro-text": "Status è la tua porta di accesso al web decentralizzato",
-    "intro-text1": "Una piattaforma open source per chattare e effettuare transazioni in sicurezza sulla blockchain di Ethereum",
+    "intro-text1": "Chat su una rete peer-to-peer, criptata, dove i messaggi non possono essere censurati o hackerati",
-    "intro-text2": "Il tuo Multi-Account è stato configurato. Non dimenticarti di andare sul tuo profilo e fare il backup della frase di recupero",
+    "intro-text2": "Invia e ricevi cryptoasset in qualsiasi parte del mondo, non è necessario un conto bancario",
-    "intro-text3": "Il tuo Multi-Account è stato configurato. Non dimenticarti di andare sul tuo profilo e fare il backup della frase di recupero",
+    "intro-text3": "Esplora giochi, exchange e social network dove solo tu possiedi i tuoi dati",
-    "intro-title1": "Comunicazione privata e sicura",
+    "intro-title1": "Comunicazione veramente privata",
     "intro-title2": "Proteggi il tuo portafoglio crypto",
     "intro-title3": "App decentralizzate",
-    "intro-wizard-text1": "Il sistema è progettato per mantenere la tua identità sicura e privata. La coppia di chiavi crittografiche associata al tuo account viene generata localmente. Il nome e l'immagine sono generate in funzione di questa coppia di chiavi: sono univoci e anonimi. Nessuno può fingere di essere te. Nessuno può vedere il tuo vero nome a meno che tu non glielo fornisca.",
+    "intro-wizard-text1": "Una serie di chiavi controlla il tuo account. Le tue chiavi vivono sul tuo telefono, quindi solo tu puoi usarle",
-    "intro-wizard-text2": "Questo nome è la tua identità all'interno di Status, dopo averlo scelto non potrà più essere cambiato.",
+    "intro-wizard-text2": "Una chiave è per la chat. Ha un nome leggibile che non può essere modificato.",
-    "intro-wizard-text3": "La tua chiave è memorizzata localmente. Non ne esiste alcuna copia oltre questa. Solo tu hai accesso.",
+    "intro-wizard-text3": "Se possiedi una Keycard, memorizzaci tue chiavi per una maggiore sicurezza",
-    "intro-wizard-text4": "Proteggi e crittografa la tua chiave",
+    "intro-wizard-text4": "Proteggi e cripta le tue chiavi",
-    "intro-wizard-text6": "Facilita la firma e l'invio delle transazioni abilitando la firma attraverso le impronte digitali",
+    "intro-wizard-text6": "Status ti avviserà di nuovi messaggi. Puoi modificare le tue preferenze di notifica in un secondo momento nelle impostazioni",
     "intro-wizard-title-alt4": "Crea una password",
     "intro-wizard-title-alt5": "Conferma la tua password",
-    "intro-wizard-title1": "Procuratevi una chiave prima di tutto",
+    "intro-wizard-title1": "Ottieni le tue chiavi",
-    "intro-wizard-title2": "Scegli una chiave e un nome",
+    "intro-wizard-title2": "Scegli un nome per la chat",
     "intro-wizard-title3": "Selezionare l'archivio delle chiavi",
     "intro-wizard-title4": "Crea un codice a 6 cifre",
     "intro-wizard-title5": "Conferma il codice",
-    "intro-wizard-title6": "Abilitare l'impronta digitale",
+    "intro-wizard-title6": "Abilita le notifiche",
     "invalid-extension": "Estensione URI non valida",
     "invalid-format": "Formato non valido \n Deve essere {{format}}",
     "invalid-key-confirm": "Applica",
@@ -572,39 +593,39 @@
     "keycard": "Keycard",
     "keycard-applet-install-instructions": "Per installare l'applet si prega di seguire le istruzioni su https:\/\/github.com\/status-im\/keycard-cli#keycard-applet-installation",
     "keycard-blocked": "Keycard è stata bloccata. \n È necessario ripristinare la scheda per continuare a utilizzarla.",
-    "keycard-cancel-setup-text": "Questa operazione annullerà la configurazione della keycard. Si consiglia vivamente di completare la configurazione per utilizzare la chiave. Vuoi davvero cancellare?",
+    "keycard-cancel-setup-text": "Questa operazione annullerà la configurazione della keycard. Si consiglia vivamente di completare la configurazione per utilizzare la chiave. Vuoi davvero annullare?",
     "keycard-cancel-setup-title": "Operazione pericolosa",
-    "keycard-desc": "Solo Android. È necessario ottenere prima una Keycard",
+    "keycard-desc": "Possiedi una Keycard? Memorizzaci tue chiavi; ne avrai bisogno per le transazioni",
     "keycard-existing-multiaccount": "Non è possibile ripristinare questo Multi-Account perché è già sul telefono",
     "keycard-free-pairing-slots": "La scheda chiave ha {{n}} slot di accoppiamento liberi",
     "keycard-has-multiaccount-on-it": "Questa Keycard contiene già un Multi-Account. Se vuoi cambiarlo fai prima login e poi procedi al reset. Se invece vuoi importare l'account presente, usa \"Aggiungi un Multi-Account esistente\".",
     "keycard-onboarding-finishing-header": "Finendo",
-    "keycard-onboarding-intro-header": "Conservare la chiave su Keycard",
+    "keycard-onboarding-intro-header": "Conservare le tue chiavi su Keycard",
     "keycard-onboarding-intro-text": "Preparati, potrebbero essere necessari alcuni minuti, ma è importante proteggere il tuo account",
     "keycard-onboarding-pairing-header": "Accoppiamento della carta in corso...",
     "keycard-onboarding-preparing-header": "Preparazione della carta in corso...",
     "keycard-onboarding-puk-code-header": "Scrivi i codici \n e conservarli in modo sicuro",
-    "keycard-onboarding-recovery-phrase-description": "Con questa frase di recupero puoi sempre riavere la tua chiave. Scrivi la frase di recupero. Tienila al sicuro, offline e separata da questo dispositivo.",
+    "keycard-onboarding-recovery-phrase-description": "Per riaccedere alle tue chiavi serve questa frase di recupero. Scrivila. Tienila al sicuro, offline e separata da questo dispositivo.",
-    "keycard-onboarding-recovery-phrase-header": "Backup frase di recupero",
+    "keycard-onboarding-recovery-phrase-header": "Backup della frase di recupero",
-    "keycard-onboarding-recovery-phrase-text": "Solo per i tuoi occhi. Questo è la magica frase di recupero usato per generare la tua chiave.",
+    "keycard-onboarding-recovery-phrase-text": "Solo per i tuoi occhi. Questa è la magica frase di recupero usata per generare le tue chiavi.",
     "keycard-onboarding-start-header": "Tieni la carta sul retro \n del tuo telefono per iniziare",
     "keycard-onboarding-start-step1": "Crea un codice di accesso",
-    "keycard-onboarding-start-step1-text": "Circa 1 minuto. Creare un codice di accesso a 6 cifre per crittografare la chiave.",
+    "keycard-onboarding-start-step1-text": "Circa 1 minuto. Creare un codice di accesso a 6 cifre per cifrare le tue chiavi",
     "keycard-onboarding-start-step2": "Scrivi PUK e il codice di accoppiamento",
     "keycard-onboarding-start-step2-text": "Circa 1 minuto. Avrai bisogno di un pezzo di carta e una matita per questo",
     "keycard-onboarding-start-step3": "Eseguire il backup della frase di recupero",
     "keycard-onboarding-start-step3-text": "Circa 1 minuto. Sono necessari anche un pezzo di carta e una matita.",
     "keycard-onboarding-start-text": "E mantieni il contatto da carta a telefono \n durante l'installazione. L'installazione richiederà circa 4 minuti",
     "keycard-recovery-intro-button-text": "Inizia il recupero",
-    "keycard-recovery-intro-header": "Recupera una chiave memorizzata sulla keycard",
+    "keycard-recovery-intro-header": "Recupera le chiavi memorizzata sulla keycard",
-    "keycard-recovery-intro-text": "Se in precedenza hai generato una chiave utilizzando una Keycard e ora desideri utilizzare questa chiave su questo dispositivo",
+    "keycard-recovery-intro-text": "Se in precedenza hai generato le chiavi utilizzando una Keycard e ora desideri utilizzare le stesse chiave su questo dispositivo",
     "keycard-recovery-no-key-header": "Non c'è niente da \nrecuperare qui",
-    "keycard-recovery-no-key-text": "La tua Keycard non contiene alcuna chiave memorizzata. Per utilizzarla, genera una nuova chiave e scegli la tua Keycard per memorizzarci la chiave",
+    "keycard-recovery-no-key-text": "La tua Keycard non contiene alcuna chiave. Per utilizzarla, genera una nuova chiave e scegli la tua Keycard come supporto di memorizzazione",
-    "keycard-recovery-phrase-confirm-header": "Conferma frase di recupero",
+    "keycard-recovery-phrase-confirm-header": "Conferma la frase di recupero",
-    "keycard-recovery-phrase-confirmation-text": "Non puoi farlo più tardi. Senza la frase di recupero non sarai in grado di accedere alla tua chiave o alle risorse associate se perdi il dispositivo.",
+    "keycard-recovery-phrase-confirmation-text": "Potresti non avere una seconda occasione! Se perdi o cambi telefono, senza la frase di recupero non potrai più accedere alle tue chiavi ed ai tuoi cryptoasset ad esse associati.",
     "keycard-recovery-phrase-confirmation-title": "Hai scritto la frase di recupero ?",
-    "keycard-recovery-success-header": "La tua chiave è stata\n recuperata con successo",
+    "keycard-recovery-success-header": "Le tue chiavi sono state\n recuperate con successo",
-    "keycard-unauthorized-operation": "Non sei autorizzato ad eseguire questa operazione.\n Toccare una carta valida e riprovare.",
+    "keycard-unauthorized-operation": "Non sei autorizzato ad eseguire questa operazione.\n Usa una carta valida e riprovare.",
     "language": "Lingua",
     "learn-more": "Per saperne di più",
     "learn-more-about-keycard": "Per saperne di più sulla Keycard",
@@ -623,13 +644,15 @@
     "logging": "Logging",
     "logging-enabled": "Registrazione abilitata?",
     "login-pin-description": "Inserisci il tuo codice di accesso a 6 cifre per sbloccare\n il tuo Multi-Account",
-    "logout": "Disconnetti",
+    "logout": "Esci",
     "logout-app-content": "L'account verrà disconnesso. Quando lo sblocchi di nuovo, verrà utilizzata la rete selezionata",
-    "logout-are-you-sure": "Sei sicuro di volere \n disconnettersi?",
+    "logout-are-you-sure": "Sei sicuro di voler uscire?",
-    "logout-title": "Disconnettersi?",
+    "logout-title": "Uscire?",
+    "mail-should-be-configured": "Il client di posta deve essere configurato",
     "mailserver-address": "Indirizzo Mailserver",
     "mailserver-automatic": "Selezione automatica",
     "mailserver-connection-error": "Impossibile connettersi al mailserver",
+    "mailserver-content": "Un nodo nella rete Status che instrada e archivia i messaggi, per un massimo di 30 giorni.",
     "mailserver-details": "Dettagli Mailserver",
     "mailserver-error-content": "Impossibile raggiungere il mailserver selezionato.",
     "mailserver-error-title": "Errore durante la connessione al mailserver",
@@ -641,11 +664,12 @@
     "mailserver-request-error-title": "Errore di richiesta del mailserver",
     "mailserver-request-retry": "Riprova richiesta",
     "mailserver-retry": "Riprova",
+    "mailserver-title": "Mailserver",
     "main-currency": "Valuta principale",
     "main-networks": "Reti principali",
     "main-wallet": "Portafoglio principale",
     "mainnet-network": "Rete principale",
-    "mainnet-text": "Sei sulla Mainnet. Verrà inviato ETH reale",
+    "mainnet-text": "Sei sulla Mainnet. Verranno inviati ETH reali",
     "maintain-card-to-phone-contact": "Mantenere il contatto carta-telefono durante il processo.",
     "make-admin": "Rendi amministratore",
     "maybe-later": "Ricordamelo più tardi",
@@ -663,7 +687,7 @@
     "message": "Messaggio",
     "message-not-sent": "Messaggio non inviato",
     "message-options-cancel": "Annulla",
-    "message-reply": "Rispondere",
+    "message-reply": "Rispondi",
     "message-syncing": "Sincronizzazione dei messaggi",
     "messages": "Messaggi",
     "might-break": "Potrebbe rompere alcune ÐApps",
@@ -684,14 +708,14 @@
     "mobile-network-stop-syncing": "Interrompere la sincronizzazione",
     "mobile-network-stop-syncing-details": "Fino a quando non si è connessi al Wi-Fi?",
     "mobile-network-use-mobile": "Usa i dati mobili",
-    "mobile-network-use-mobile-data": "Status tende a utilizzare molti dati durante la sincronizzazione delle chat. Puoi scegliere di non sincronizzare quando sei su rete mobile",
+    "mobile-network-use-mobile-data": "Status utilizza molti dati durante la sincronizzazione delle chat.",
     "mobile-network-use-wifi": "Solo Wi-Fi",
-    "mobile-syncing-sheet-details": "Status tende a utilizzare molti dati durante la sincronizzazione delle chat. Puoi scegliere di non sincronizzare quando sei su rete mobile",
+    "mobile-syncing-sheet-details": "Status utilizza molti dati durante la sincronizzazione delle chat.",
-    "mobile-syncing-sheet-title": "Sincronizza utilizzando i dati mobili",
+    "mobile-syncing-sheet-title": "Sincronizza utilizzando i dati della rete mobile?",
     "more": "di più",
     "multiaccount-exists-content": "Questo Multi-Account esiste già. Devi solo sbloccarlo",
     "multiaccount-exists-title": "Il Multi-Account esiste già",
-    "multiaccounts-recover-enter-phrase-text": "Inserisci 12, 15, 18, 21, 24 parole. Separale con un singolo spazio.",
+    "multiaccounts-recover-enter-phrase-text": "Inserisci 12, 15, 18, 21 o 24 parole.\nSeparale con un singolo spazio.",
     "multiaccounts-recover-enter-phrase-title": "Inserisci la tua frase di recupero",
     "name": "Nome",
     "name-description": "Cambia questo in qualsiasi momento nel tuo profilo.",
@@ -703,6 +727,7 @@
     "network-details": "Dettagli della rete",
     "network-fee": "Commissione di rete",
     "network-id": "ID di rete",
+    "network-info": "Informazioni sulla rete",
     "network-invalid-network-id": "L'ID di rete specificato non corrisponde all'ID della rete accessibile all'url RCP",
     "network-invalid-status-code": "Codice Status non valido: {{code}}",
     "network-invalid-url": "L'URL di rete non è valido",
@@ -716,7 +741,7 @@
     "new-group-chat": "Nuova chat di gruppo",
     "new-network": "Nuova rete",
     "new-pin-description": "Inserisci un nuovo codice di accesso a 6 cifre",
-    "new-public-group-chat": "Partecipa alla chat pubblica",
+    "new-public-group-chat": "Entra in una chat pubblica",
     "new-request": "Nuova richiesta",
     "next": "Prossimo",
     "next-step-entering-mnemonic": "Il prossimo passo è inserire la frase mnemonica per importare il tuo Multi-Account",
@@ -763,6 +788,7 @@
     "or": "O",
     "or-choose-a-contact": "Oppure scegli un contatto",
     "outgoing": "In uscita",
+    "outgoing-transaction": "Transazione in uscita",
     "pair": "Associare dispositivi",
     "pair-card": "Associa a questo dispositivo",
     "pair-card-question": "La carta è pronta per l'accoppiamento",
@@ -777,19 +803,21 @@
     "pairing-go-to-installation": "Vai alle impostazioni di accoppiamento",
     "pairing-maximum-number-reached-content": "Disabilita uno dei tuoi dispositivi prima di abilitarne uno nuovo.",
     "pairing-maximum-number-reached-title": "Numero massimo di dispositivi raggiunto",
-    "pairing-new-installation-detected-content": "È stato rilevato un nuovo dispositivo. \n Per utilizzare correttamente i tuoi dispositivi, è importante associarli e abilitarli prima di utilizzarli. \n Vai alla sezione del dispositivo in Impostazioni per associare i tuoi dispositivi.",
+    "pairing-new-installation-detected-content": "È stato rilevato un nuovo dispositivo. \n Per utilizzare correttamente i tuoi dispositivi, è importante associarli e abilitarli prima di utilizzarli. \n Vai in Profilo->Impostazioni di sincronizzazione->Dispositivi per associare i tuoi dispositivi.",
     "pairing-new-installation-detected-title": "Nuovo dispositivo rilevato",
     "pairing-no-info": "Nessuna informazione",
     "pairing-please-set-a-name": "Si prega di impostare un nome per il dispositivo.",
     "passphrase": "Frase d'accesso",
     "password": "Password",
     "password_error1": "Le password non corrispondono.",
-    "password-description": "Almeno 6 caratteri. Avrai bisogno di questa password per aprire Status e confermare le transazioni.",
+    "password-description": "Almeno 6 caratteri. La tua password protegge le tue chiavi. Ne hai bisogno per sbloccare Status e per effettuare transazioni.",
     "password-placeholder": "Almeno 6 caratteri",
     "password-placeholder2": "Conferma la tua password",
     "paste": "Incolla",
     "paste-json": "Incolla JSON",
     "pay-to-chat": "Paga per chattare",
+    "peer-content": "Un dispositivo collegato alla rete di chat di Status. Ogni utente può rappresentare uno o più peer, a seconda del numero di dispositivi.",
+    "peer-title": "Peer",
     "peers": "Peers",
     "pending": "In attesa",
     "pending-confirmation": "In attesa di conferma...",
@@ -806,12 +834,12 @@
     "privacy": "Privacy",
     "privacy-and-security": "Privacy e sicurezza",
     "privacy-policy": "Informativa sulla privacy",
-    "processing": "Elaborazione",
+    "processing": "Solo un momento",
     "product-information": "Informazioni sul prodotto",
     "profile": "Profilo",
     "profile-details": "Dettagli del profilo",
     "public-chat": "Chat pubblica",
-    "public-chat-description": "Una chat pubblica ti consente di uscire con gli altri, fare amicizia e parlare di argomenti di tuo interesse.",
+    "public-chat-description": "Partecipa a chat pubbliche sui tuoi interessi! Chiunque può iniziare una nuova.",
     "public-chats": "Chat pubbliche",
     "public-group-status": "Pubblico",
     "public-group-topic": "Argomento",
@@ -821,10 +849,10 @@
     "puk-code": "Codice PUK",
     "puk-code-explanation": "Se dimentichi il tuo codice di accesso a 6 cifre o lo inserisci in modo errato per 3 volte, avrai bisogno di questo codice per sbloccare la tua carta.",
     "puk-mismatch": "Il codice PUK non corrisponde",
-    "qr-code-public-key-hint": "Condividi questo codice per iniziare a chattare",
+    "qr-code-public-key-hint": "Condividi questa chiave per iniziare a chattare",
     "quiet-days": "{{quiet-days}} giorni",
     "quiet-hours": "{{quiet-hours}} ore",
-    "re-encrypt-key": "Cripta nuovamente la tua chiave",
+    "re-encrypt-key": "Cripta nuovamente la tue chiavi",
     "ready-to-import-keycard-multiaccount": "Siamo pronti per importare il Multi-Account keycard",
     "receive": "Ricevi",
     "receive-transaction": "Ricevi transazione",
@@ -833,20 +861,21 @@
     "recently-used-stickers": "Gli adesivi utilizzati di recente appariranno qui",
     "recipient": "Destinatario",
     "recipient-code": "Inserisci l'indirizzo del destinatario",
+    "recipient-code-placeholder": "0x ... o username.domain.eth",
     "recover": "Recupera",
-    "recover-key": "Chiave di recupero",
+    "recover-key": "Accedi a chiavi esistenti",
     "recover-keycard-multiaccount-not-supported": "Il recupero del Multi-Account keycard con password non è supportato",
     "recover-multiaccount-warning": "Le informazioni sul tuo portafoglio saranno esposte importando questo Multi-Account.",
     "recover-password-invalid": "Questo Multi-Account esiste già ma le password non corrispondono",
     "recover-password-too-short": "La password è troppo corta",
     "recover-with-keycard": "Ripristina con Keycard",
-    "recovering-key": "Recupero della chiave in corso...",
+    "recovering-key": "Recupero delle chiavi in corso...",
     "recovery-confirm-phrase": "Conferma frase di recupero",
     "recovery-phrase": "Frase di recupero",
     "recovery-phrase-invalid": "La frase di recupero non è valida",
     "recovery-phrase-unknown-words": "Alcune parole potrebbero essere scritte male",
     "recovery-phrase-wrong-length": "Assicurati che la frase di recupero che hai inserito sia di 12, 15, 18, 21 o 24 parole.",
-    "recovery-success-text": "Dovrai creare un nuovo codice o una nuova password per criptare nuovamente la tua chiave",
+    "recovery-success-text": "Dovrai creare un nuovo codice o password per criptare nuovamente le tue chiavi",
     "recovery-typo-dialog-description": "Se inserisci le parole sbagliate, creerai un nuovo Multi-Account invece di recuperarne uno vecchio.",
     "recovery-typo-dialog-title": "La frase di recupero è corretta?",
     "remaining-steps": "Passaggi rimanenti",
@@ -859,8 +888,8 @@
     "remove-network": "Rimuovi rete",
     "remove-token": "Rimuovi token",
     "removed": "rimosso",
-    "repeat-pin": "Ripeti il nuovo PIN",
+    "repeat-pin": "Ripeti il codice a 6 cifre",
-    "report-bug-email-template": "1. Descrizione del problema \n (Descrivi la funzionalità che desideri o riassumi brevemente il bug e cosa hai fatto, cosa ti aspettavi che succedesse e cosa effettivamente accade. Sezioni seguenti) \n\n\n 2. Passaggi per riprodurre \n (Descrivi come possiamo replicare il bug passo dopo passo.) \n -Apri Status\n -... \n -Passo 3, ecc. \n\n\n 3. Comportamento previsto \n (Descrivi cosa ti aspettavi che succedesse.) \n\n\n 4. Comportamento reale \n (Descrivi cosa è realmente accaduto.) \n\n\n 5. Allegare schermate che possono dimostrare il problema, per favore \n",
+    "report-bug-email-template": "1. Descrizione del problema \n (Descrivi la funzionalità che desideri o riassumi brevemente il bug e cosa hai fatto, cosa ti aspetti che succeda e cosa effettivamente accade. Sezioni seguenti) \n\n\n 2. Passaggi per riprodurre \n (Descrivi come possiamo replicare il bug passo dopo passo.) \n -Apri Status\n -... \n -Passo 3, ecc. \n\n\n 3. Comportamento previsto \n (Descrivi cosa ti aspetti che succeda.) \n\n\n 4. Comportamento reale \n (Descrivi cosa è realmente accaduto.) \n\n\n 5. Allegare schermate che possono dimostrare il problema, per favore \n",
     "request-command-payment": "Richiedi un pagamento",
     "request-feature": "Richiedi una funzionalità",
     "request-transaction": "Richiedi transazione",
@@ -886,7 +915,12 @@
     "security": "Sicurezza",
     "see-details": "Vedi dettagli",
     "see-it-again": "VEDI DI NUOVO",
+    "seed-phrase-content": "Un insieme di parole facili da leggere, selezionate casualmente dall'elenco standard BIP39 e utilizzate per recuperare o accedere al tuo account Ethereum su altri portafogli e dispositivi. Definita anche \"frase mnemonica\", \"frase di recupero\" o \"backup del portafoglio\" in tutto l'ecosistema crittografico. La maggior parte delle app di crittografia utilizza questo stesso standard per generare account.",
+    "seed-phrase-title": "Frase di recupero",
+    "select": "Seleziona",
+    "select-account": "Seleziona un account",
     "select-account-dapp": "Seleziona l'account che desideri utilizzare con le Dapps",
+    "select-account-first": "Seleziona prima un account",
     "select-chat": "Seleziona chat per avviare la messaggistica",
     "selected": "Selezionato",
     "selected-for-you": "Selezionato per te",
@@ -908,7 +942,7 @@
     "sending": "Inviando",
     "sent-at": "Inviato alle",
     "set-a-topic": "Crea un argomento",
-    "set-currency": "Imposta la valuta",
+    "set-currency": "Imposta la valuta predefinita",
     "set-dapp-access-permissions": "Impostare le autorizzazioni di accesso alle DApp",
     "settings": "Impostazioni",
     "share": "Condividi",
@@ -921,6 +955,7 @@
     "share-profile": "Condividi profilo",
     "share-profile-link": "Condividi il link del profilo",
     "share-public-chat-text": "Dai un'occhiata a questa chat pubblica sull'app Status: {{link}}",
+    "shared": "Condiviso",
     "sharing-copied-to-clipboard": "Copiato",
     "sharing-copy-to-clipboard": "Copia",
     "sharing-share": "Condividi...",
@@ -928,6 +963,7 @@
     "show-more": "Mostra di più",
     "show-qr": "Mostra codice QR",
     "sidechain-text": "Sei sulla {{sidechain}} Sidechain.",
+    "sign-and-send": "Firma e invia",
     "sign-in": "Sblocca",
     "sign-in-to-another": "Sblocca un altro Multi-Account",
     "sign-in-to-status": "Accedi a Status",
@@ -952,11 +988,11 @@
     "start-group-chat": "Inizia chat di gruppo",
     "start-new-chat": "Inizia una nuova chat",
     "status": "Status",
-    "status-confirmed": "Confermato",
+    "status-confirmed": "Confermata",
     "status-hardwallet": "Status hardwallet",
     "status-keycard": "Status Keycard",
-    "status-not-sent-click": "Non confermato. Clicca per le opzioni",
+    "status-not-sent-click": "Non confermata. Clicca per le opzioni",
-    "status-not-sent-tap": "Non confermato. Tocca per le opzioni",
+    "status-not-sent-tap": "Non confermata. Tocca per le opzioni",
     "status-pending": "In attesa",
     "status-sent": "Inviato",
     "status-tx-not-found": "TX non trovata",
@@ -978,11 +1014,11 @@
     "testnet-text": "Sei su {{testnet}} Testnet. Non inviare ETH o SNT reali al tuo indirizzo",
     "text-input-disabled": "Per favore aspetta un momento...",
     "this-device": "Questo dispositivo",
-    "this-device-desc": "La tua chiave sarà crittografata e archiviata in modo sicuro",
+    "this-device-desc": "Le tue chiavi saranno criptate e conservate in modo sicuro nel tuo dispositivo",
     "this-is-you-signing": "Questa è la tua frase di firma",
     "this-will-take-few-seconds": "Richiederà alcuni secondi",
-    "three-words-description": "Dovresti vedere queste 3 parole prima di firmare ogni transazione",
+    "three-words-description": "Queste tre parole dimostrano che una transazione è sicura.",
-    "three-words-description-2": "Se viene visualizzata una combinazione diversa, annullare la transazione e disconnettersi.",
+    "three-words-description-2": "Dovresti vedere queste parole prima di firmare ogni transazione. In caso contrario, annulla ed esci.",
     "to": "A",
     "to-block": "Blocco",
     "to-enable-biometric": "Per abilitare {{bio-type-label}} , devi salvare la password nella schermata di sblocco",
@@ -994,6 +1030,7 @@
     "token-details": "Dettagli token",
     "topic-name-error": "Usa solo lettere minuscole (dalla a alla z), numeri e trattini (-). Non utilizzare le chiavi chat",
     "transaction": "Transazione",
+    "transaction-declined": "Transazione rifiutata",
     "transaction-description": "Consideralo completo dopo 12 conferme sulla rete.",
     "transaction-details": "Dettagli della transazione",
     "transaction-failed": "Transazione fallita",
@@ -1005,6 +1042,7 @@
     "transactions-filter-title": "Filtra cronologia",
     "transactions-history": "Cronologia delle transazioni",
     "transactions-history-empty": "Nessuna transazione nella tua cronologia",
+    "transactions-load-more": "Caricane ancora",
     "transactions-sign": "Firma",
     "transactions-sign-transaction": "Firma la transazione",
     "tribute-required-by-multiaccount": "{{multiaccount-name}} richiede degli SNT per avviare una chat.",
@@ -1065,7 +1103,7 @@
     "view-profile": "Visualizza profilo",
     "view-signing": "Visualizza la frase di firma",
     "view-superrare": "Visualizza in SuperRare",
-    "waiting-for-wifi": "Sincronizzazione della cronologia offline, in attesa di Wi-Fi.",
+    "waiting-for-wifi": "Offline, in attesa di Wi-Fi.",
     "waiting-for-wifi-change": "Cambia",
     "waiting-to-sign": "In attesa di firmare la transazione...",
     "wallet": "Portafoglio",
@@ -1080,7 +1118,9 @@
     "wallet-invalid-address": "Indirizzo non valido: \n {{data}}",
     "wallet-invalid-address-checksum": "Errore nell'indirizzo: \n {{data}}",
     "wallet-invalid-chain-id": "La rete non corrisponde: \n {{data}} ma la rete attuale è {{chain}}",
-    "wallet-manage-assets": "Gestisci Monete",
+    "wallet-key-content": "Un indirizzo esadecimale di 64 caratteri basato sullo standard Ethereum e che inizia con 0x. In pubblico, la chiave del tuo portafoglio è condivisa con gli altri quando desideri ricevere fondi. Chiamato anche \"indirizzo di Ethereum\" o \"indirizzo di portafoglio\".",
+    "wallet-key-title": "Chiave del portafoglio",
+    "wallet-manage-assets": "Gestisci cryptoasset",
     "wallet-offline": "Portafoglio offline",
     "wallet-request": "Richiedi",
     "wallet-send": "Invia",
@@ -1096,7 +1136,7 @@
     "web3-opt-in": "Modalità privata del browser",
     "welcome-blank-message": "Le tue chat appariranno qui. Per iniziare nuove chat, premi il tasto ⊕",
     "welcome-screen-text": "Configura il tuo portafoglio, invita gli amici a chattare\n ed a sfogliare app popolari!",
-    "welcome-to-status": "Benvenuto in Status",
+    "welcome-to-status": "Benvenuto in Status!",
     "welcome-to-status-description": "Configura il tuo portafoglio, invita gli amici a chattare\n ed a sfogliare app decentralizzate!",
     "word-count": "Conteggio parole",
     "word-n": "Parola # {{number}}",
@@ -1108,16 +1148,16 @@
     "write-down-and-store-securely": "Scrivi i codici \n e conservali in modo sicuro",
     "wrong-address": "Indirizzo errato",
     "wrong-card": "Carta sbagliata",
-    "wrong-card-text": "Hai sfruttato una carta che non corrisponde al Multi-Account che hai selezionato. Si prega di riprovare.",
+    "wrong-card-text": "Hai usato una carta che non corrisponde al Multi-Account che hai selezionato. Si prega di riprovare.",
     "wrong-contract": "Contract errato",
-    "wrong-keycard-text": "La Keycard che hai toccato non è associata a questo telefono",
+    "wrong-keycard-text": "La Keycard che hai usato non è associata a questo telefono",
-    "wrong-keycard-title": "Sembra che tu abbia toccato \nuna chiave sbagliata",
+    "wrong-keycard-title": "Sembra che tu abbia usato \nuna chiave sbagliata",
     "wrong-password": "Password errata",
     "wrong-word": "Parola sbagliata",
     "yes": "Si",
     "You": "Tu",
     "you": "tu",
-    "you-already-have-an-asset": "Hai già un asset {{value}}",
+    "you-already-have-an-asset": "Hai già un cryptoasset {{value}}",
     "you-are-all-set": "È tutto pronto!",
     "you-are-all-set-description": "Ora, se perdi il telefono, puoi ripristinare il tuo Multi-Account usando la frase di recupero.",
     "you-can-change-account": "È possibile modificare il nome e il colore dell'account in base alle proprie esigenze",

translations/ja.json

@@ -339,7 +339,7 @@
     "ens-displayed-with": "あなたのメッセージは他の人に表示されます",
     "ens-get-name": "ユニバーサルユーザー名を取得",
     "ens-got-it": "わかりました",
-    "ens-locked": "ユーザー名がロックされています。あなたは25.05.2020まで手放すことはできません",
+    "ens-locked": "ユーザー名がロックされています。あなたは{{date}}まで手放すことはできません",
     "ens-network-restriction": "Mainnetまたはropstenでのみ利用可能",
     "ens-no-usernames": "接続しているユーザー名がありません",
     "ens-powered-by": "Ethereum Name Servicesを利用しています",
@@ -355,7 +355,7 @@
     "ens-show-username": "チャットで自分のENSユーザー名を表示する",
     "ens-terms-header": "ENSユーザー名登録の規約",
     "ens-terms-point-1": "資金は1年間デポジットされます。あなたのSNTはロックされますが消費はされません。",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b (ENSレジストリ).",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e (ENSレジストリ).",
     "ens-terms-point-2": "1年後にENSユーザー名を手放し、デポジットを取り戻すことができます。何もしなければ名前は維持されます。",
     "ens-terms-point-3": "もしStatusがコントラクトをアップグレードするなど、コントラクトの規約が変更された場合はユーザーはデポジット期間に関係なくENS名を手放す権利を持ちます。",
     "ens-terms-point-4": "コントラクトの管理者はあなたがデポジットした資金にアクセスすることはできません。コントラクトは資金を送信元のアドレスに送り返すことしかできません。",

translations/ko.json

@@ -39,17 +39,16 @@
     "agree-by-continuing": "계속함으로써 아래 약관에 동의합니다.\n 스테이터스 ",
     "all": "전체",
     "allow": "허용",
-    "allowing-authorizes-this-dapp": "지갑 주소를 검색하고 웹3를 사용하기 위해 디앱에 권한을 허용합니다.",
+    "allowing-authorizes-this-dapp": "웹3를 활용하기 위해, 디앱이 사용자의 지갑 주소를 검색하는 것을 허용합니다.",
     "already-have-asset": "이미 해당 자산을 가지고 있습니다",
     "always-allow": "항상 허용",
     "amount": "수량",
     "amount-placeholder": "수량 입력...",
     "apply": "적용",
-    "are-you-sure-description": "지금부터 시드 시드 구문을 다시 확인할 수 없습니다",
+    "are-you-sure-description": "지금부터 시드 구문을 다시 확인할 수 없습니다",
     "are-you-sure-to-cancel": "정말 취소하시겠어요?",
     "are-you-sure?": "정말 삭제하시겠어요?",
     "ask-in-status": "질문 및 버그 신고",
-    "at": "",
     "authorize": "거래 확인",
     "available": "이용 가능",
     "available-participants": {
@@ -116,6 +115,7 @@
     "cannot-use-default-pin": "비밀번호 000000은 허용되지 않습니다. \n다른 번호를 사용해주세요",
     "cant-read-card": "카드를 읽을 수 없습니다",
     "cant-read-card-error-explanation": "설정 중에 카드는 NFC 리더와 연결될 수 있도록, 스마트폰과 계속 접촉되어 있어야합니다.",
+    "cant-report-bug": "버그를 리포트할 수 없습니다",
     "card-already-linked": "카드가 이미 다른 계정에 연결되어 있습니다.",
     "card-is-blank": "카드가 비어 있습니다",
     "card-is-empty": "카드가 비어 있습니다.",
@@ -144,6 +144,7 @@
     "chat-name-title": "채팅 이름",
     "chat-settings": "채팅방 설정",
     "chats": "채팅",
+    "check-on-etherscan": "이더스캔에서 확인",
     "check-your-recovery-phrase": "시드 구문 확인",
     "choose-authentication-method": "계정을 인증할 방법을 선택해주세요",
     "clear": "지우기",
@@ -196,7 +197,7 @@
     "create-group-chat": "그룹 채팅 생성",
     "create-multiaccount": "계정 만들기",
     "create-new-key": "키 생성",
-    "create-pin": "비밀번호 만들기",
+    "create-pin": "6자리 비밀번호 만들기",
     "create-pin-description": "로그인하고 거래를 진행하려면 카드와 비밀번호가 필요합니다",
     "created-group-chat-description": "{{group-name}} 그룹을 생성했습니다",
     "creating-your-multiaccount": "계정 생성 중...",
@@ -283,14 +284,13 @@
     "currency-display-name-zar": "남아프리카 공화국 랜드",
     "current-network": "현재 네트워크",
     "current-pin": "6자리 비밀번호",
-    "current-pin-description": "계속 진행하려면 비밀번호를 입력하세요",
+    "current-pin-description": "계속 진행하려면 6자리 비밀번호를 입력하세요",
     "custom": "사용자 정의",
     "custom-networks": "사용자 정의 네트워크",
     "custom-seed-phrase": "잘못된 시드 구문",
     "custom-seed-phrase-text-1": "시드 구문 단어들이 스테이터스 딕셔너리와 일치하지 않습니다. 철자를 확인해주세요.",
-    "custom-seed-phrase-text-2": "",
     "dapp": "디앱",
-    "dapp-would-like-to-connect-wallet": "(이)가 사용자 다음에 연결합니다",
+    "dapp-would-like-to-connect-wallet": "를 아래 지갑에 연결합니다",
     "dapps": "디앱",
     "dapps-can-access": "디앱이 내 지갑 및 채팅키에 접근 할 수 있습니다.",
     "dapps-permissions": "디앱 권한 관리",
@@ -372,7 +372,7 @@
     "ens-displayed-with": "귀하의 메시지가 다른 사용자에게 다음과 같이 표시됩니다",
     "ens-get-name": "사용자 이름 등록",
     "ens-got-it": "알겠습니다",
-    "ens-locked": "사용자 이름이 등록되었습니다. 2020.05.25까지 해지 할 수 없습니다.",
+    "ens-locked": "사용자 이름이 등록되었습니다. {{date}}까지 해지 할 수 없습니다.",
     "ens-name-content": "이더리움 네임 서비스(Ethereum Name Service)로 채팅키와 연결되는 커스텀 닉네임. ENS 이름은 탈중앙화된 사용자 명입니다.",
     "ens-name-title": "ENS 이름",
     "ens-network-restriction": "Mainnet에서만 사용 가능",
@@ -390,7 +390,7 @@
     "ens-show-username": "채팅창에 내 ENS 이름 표시",
     "ens-terms-header": "이름 등록 약관",
     "ens-terms-point-1": "계약금은 1년 동안 예치됩니다. 여러분의 SNT는 잠기게 되며, 별도로 지출되지 않습니다.",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b (ENS 레지스트리).",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e (ENS 레지스트리).",
     "ens-terms-point-2": "1년 후, 등록한 이름의 계약을 해지하고 보증금을 돌려받을 수 있습니다. 이름을 유지하기 위해 별도의 조치를 할 필요는 없습니다.",
     "ens-terms-point-3": "스테이터스가 컨트랙트를 업그레이드 하는 등으로 이용 약관을 변경하는 경우, 사용자는 남은 기간에 상관 없이 계약한 이름을 해지할 수 있습니다.",
     "ens-terms-point-4": "계약 관리자는 사용자의 계약금에 접근 할 수 없습니다. 계약금은 등록된 주소로만 반환됩니다.",
@@ -434,6 +434,9 @@
     "ens-your-usernames": "사용자 이름",
     "ens-your-your-name": "ENS 이름",
     "enter-12-words": "12 단어의 시드 구문을 입력하시고, 스페이스로 띄어 써주세요",
+    "enter-a-private-key": "개인 키 입력",
+    "enter-a-seed-phrase": "시드 구문 입력",
+    "enter-address": "주소 입력",
     "enter-contact-code": "채팅 키 또는 ENS 이름 입력",
     "enter-ens-or-contact-code": "ENS 이름 또는 채팅 키를 입력하세요",
     "enter-pair-code": "페어 코드 입력",
@@ -441,9 +444,11 @@
     "enter-password": "비밀번호 입력",
     "enter-pin": "6자리 비밀번호 입력",
     "enter-puk-code": "PUK 코드 입력",
-    "enter-puk-code-description": "비밀번호가 차단되었습니다. \n비밀번호를 차단 해제하려면 PUK 코드를 입력하세요",
+    "enter-puk-code-description": "6자리 비밀번호가 차단되었습니다. \n비밀번호 차단을 해제하려면 PUK 코드를 입력하세요",
+    "enter-recipient-address-or-username": "받는 분의 채팅 키 주소 또는 사용자 명을 입력하세요",
     "enter-seed-phrase": "시드 구문 입력",
     "enter-url": "URL 입력",
+    "enter-watch-account-address": "열람용 주소를 입력하세요",
     "enter-word": "단어 입력",
     "enter-your-code": "6자리 비밀번호 입력",
     "enter-your-password": "비밀번호 입력",
@@ -520,7 +525,7 @@
     "help-capitalized": "도움말",
     "help-center": "도움말 센터",
     "hide-content-when-switching-apps": "앱 전환시 미리보기 숨기기",
-    "history": "히스토리",
+    "history": "거래 내역",
     "hold-card": "카드를 휴대전화 뒷면에 위치해주세요",
     "home": "홈",
     "hooks": "후크 (Hooks)",
@@ -532,7 +537,7 @@
     "importing-keycard-multiaccount": "키카드 계정 가져오기",
     "in-contacts": "연락처에 등록됨",
     "incoming": "입금",
-    "incoming-transaction": "수신 트랜잭션",
+    "incoming-transaction": " 입금 트랜잭션",
     "incorrect-code": [
         "str",
         "잘못된 코드입니다. 다시 입력해 주세요"
@@ -553,7 +558,7 @@
     "intro-title3": "탈중앙 앱",
     "intro-wizard-text1": "키는 사용자의 스마트폰에 저장됩니다. 저장된 키는 스테이터스 계정을 관리합니다.",
     "intro-wizard-text2": "익명으로 사용하는 채팅 이름을 선택합니다. 채팅 이름은 앞으로 변경할 수 없습니다.",
-    "intro-wizard-text3": "키카드를 가지고 계시다면, 키카드에 키를 저장 해보세요. 키는 트랜잭션에 사용됩니다.",
+    "intro-wizard-text3": "키카드를 가지고 계시다면, 더 안전한 보안을 위해 키카드에 키를 저장 해보세요.",
     "intro-wizard-text4": "키 보안 및 암호화",
     "intro-wizard-text6": "스테이터스는 새로운 메시지를 수신하면 사용자에게 알림을 전달합니다. 사용자는 설정에서 옵션을 변경할 수 있습니다.",
     "intro-wizard-title-alt4": "비밀번호 만들기",
@@ -636,6 +641,7 @@
     "logout-app-content": "계정이 로그 아웃됩니다. 다시 로그인하면 선택한 네트워크를 사용합니다",
     "logout-are-you-sure": "로그아웃 하시겠습니까?",
     "logout-title": "로그 아웃",
+    "mail-should-be-configured": "메일 클라이언트를 구성해야합니다",
     "mailserver-address": "메일서버 주소",
     "mailserver-automatic": "자동 선택",
     "mailserver-connection-error": "메일 서버에 연결할 수 없습니다.",
@@ -712,6 +718,7 @@
     "network-details": "네트워크 세부정보",
     "network-fee": "수수료",
     "network-id": "네트워크 ID",
+    "network-info": "네트워크 정보",
     "network-invalid-network-id": "지정된 네트워크 ID가 RPC url의 네트워크 ID와 대응되지 않습니다",
     "network-invalid-status-code": "잘못된 스테이터스 코드 : {{code}}",
     "network-invalid-url": "네트워크 URL이 잘못되었습니다",
@@ -738,7 +745,7 @@
     "no-messages": "메시지 없음",
     "no-messages-yet": "메시지 없음",
     "no-pairing-slots-available": "이용 가능한 페어링 슬롯이 없습니다. 이미 카드로 페어된 기기의 페어링을 해제해주세요",
-    "no-recent-chats": "홈 화면에 최근 채팅 및 디앱 히스토리가 저장됩니다. 시작하려면 플러스 (+) 버튼을 터치하십시오.",
+    "no-recent-chats": "최근 채팅 내역이 없습니다. 채팅을 시작하려면 (+) 버튼을 눌러주세요",
     "no-result": "결과 없음",
     "no-tokens-found": "토큰 없음",
     "node-info": "노드 정보",
@@ -761,7 +768,6 @@
     "ok-got-it": "확인",
     "ok-save-pass": "동의, 패스워드를 저장합니다",
     "okay": "예",
-    "on": "",
     "on-status-tree": "스테이터스 트리 계정",
     "open": "열기",
     "open-dapp": "디앱 브라우저",
@@ -772,7 +778,7 @@
     "or": "또는",
     "or-choose-a-contact": "또는 연락처 선택",
     "outgoing": "송금",
-    "outgoing-transaction": "발신 트랜잭션",
+    "outgoing-transaction": "출금 트랜잭션",
     "pair": "페어 디바이스",
     "pair-card": "페어 카드",
     "pair-card-question": "디바이스에 카드를 페어링 하시겠습니까?",
@@ -845,6 +851,7 @@
     "recently-used-stickers": "최근 사용한 이모티콘이 여기에 나타납니다",
     "recipient": "받는 주소",
     "recipient-code": "수신인 주소 입력",
+    "recipient-code-placeholder": "0x ... 또는 username.domain.eth",
     "recover": "복구",
     "recover-key": "계정 불러오기",
     "recover-keycard-multiaccount-not-supported": "비밀번호를 통한 키카드 계정 복구는 지원되지 않습니다",
@@ -871,7 +878,7 @@
     "remove-network": "네트워크 삭제",
     "remove-token": "토큰 제거",
     "removed": "퇴장 됨",
-    "repeat-pin": "비밀번호 다시 입력",
+    "repeat-pin": "6자리 비밀번호 다시 입력",
     "report-bug-email-template": "1. 이슈 설명 \n (원하는 기능을 설명하거나 버그와 버그가 발생하기 까지 수행한 내용, 버그 대신 예상한 내용 및 실제로 발생한 내용을 간략하게 요약해해주세요. 아래 섹션 참조) \n\n\n 2. 재현 단계 \n(버그를 단계별로 재현 할 수있는 방법을 설명해주세요)\n - 스테이터스 실행 \n - ... \n - ... \n\n\n 3. 예상되는 행동 \n (일어날 것으로 예상되는 것을 설명해주세요) \n\n\n 4. 실제 행동 \n (실제로 일어난 일을 설명해주세요) \n\n\n 5. 이슈를 확인 할 수있는 스크린 샷을 첨부해주세요. \n",
     "request-command-payment": "결제 요청",
     "request-feature": "기능 요청",
@@ -888,7 +895,7 @@
     "rpc-url": "RPC URL",
     "save": "저장",
     "save-password": "로그아웃 할 때까지 자동 로그인",
-    "save-password-unavailable": "비밀번호를 저장하기 위해 디바이스 비밀번호를 설정하십시오",
+    "save-password-unavailable": "비밀번호를 저장하기 위해 디바이스 비밀번호를 설정해주세요",
     "save-password-unavailable-android": "비밀번호 저장을 사용할 수 없습니다. 사용자의 기기가 루트이거나, 필요한 보안 기능이 없을 수 있습니다.",
     "scan-qr": "QR코드 스캔",
     "scan-qr-code": "지갑주소 QR 코드 스캔",
@@ -1025,6 +1032,7 @@
     "transactions-filter-title": "거래내역 필터",
     "transactions-history": "거래 내역",
     "transactions-history-empty": "거래 내역이 없습니다",
+    "transactions-load-more": "더 불러오기",
     "transactions-sign": "승인",
     "transactions-sign-transaction": "거래 승인",
     "tribute-required-by-multiaccount": "{{multiaccount-name}}님과 채팅을 시작하려면 SNT가 필요합니다.",
@@ -1094,7 +1102,7 @@
     "wallet-assets": "자산",
     "wallet-backup-recovery-title": "시드 구문 백업",
     "wallet-choose-recipient": "수신인 선택",
-    "wallet-collectibles": "목록",
+    "wallet-collectibles": "수집품",
     "wallet-insufficient-funds": "자산 부족",
     "wallet-insufficient-gas": "가스로 사용될 ETH가 충분하지 않습니다.",
     "wallet-invalid-address": "잘못된 주소: \n {{data}}",
@@ -1147,7 +1155,7 @@
     "you-will-start-from-scratch": "처음부터 새로운 키로 다시 시작합니다",
     "your-contact-code": "디앱에 접근 권한을 부여하여 채팅 키를 검색합니다",
     "your-data-belongs-to-you": "시드 구문을 잃어 버리면 데이터와 자산을 분실하게 됩니다",
-    "your-data-belongs-to-you-description": "스테이터스는 사용자가 시드 시드 구문을 잃어버릴 경우, 계정을 복구하는 것을 도와드릴 수 없습니다. 데이터 보안을 위해 시드 구문을 따로 백업해 두시는 것을 권장합니다.",
+    "your-data-belongs-to-you-description": "스테이터스는 사용자가 시드 구문을 잃어버릴 경우, 계정을 복구하는 것을 도와드릴 수 없습니다. 데이터 보안을 위해 시드 구문을 반드시 따로 백업해 두시는 것을 권장합니다.",
     "your-recovery-phrase": "시드 구문",
     "your-recovery-phrase-description": "위 12단어가 사용자의 시드 구문입니다. 이 구문은 사용자의 지갑을 증명하기 위해 반드시 필요하며, 이번 한번만 확인할 수 있습니다. 지갑을 분실하거나 재설치하는 경우 반드시 필요하므로 안전한 장소에 보관하세요."
-}
+}

translations/ru.json

@@ -382,7 +382,7 @@
     "ens-displayed-with": "Ваши сообщения остальным пользователям показываются с ",
     "ens-get-name": "Получить универсальное имя пользователя",
     "ens-got-it": "Ок, понятно",
-    "ens-locked": "Имя пользователя зарезервировано. Вы не сможете освободить его до 25.05.2020",
+    "ens-locked": "Имя пользователя зарезервировано. Вы не сможете освободить его до {{date}} ",
     "ens-network-restriction": "Доступно только на Mainnet или Ropsten",
     "ens-no-usernames": "Нет присоединенного имени пользователя",
     "ens-powered-by": "При поддержке Ethereum Name Services",
@@ -398,7 +398,7 @@
     "ens-show-username": "Показать моё имя пользователя ENS в чатах",
     "ens-terms-header": "Условия регистрации имени",
     "ens-terms-point-1": "Средства депонируются на 1 год. Ваши SNT будут заблокированы, но не потрачены.",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b (Реестр ENS).",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e (Реестр ENS).",
     "ens-terms-point-2": "Через 1 год вы можете освободить имя и получить свой депозит обратно или ничего не делать и тогда имя останется вашим.",
     "ens-terms-point-3": "Если условия контракта меняются (например, Status обновляет контракт), то пользователь имеет право освободить имя пользователя без учета времени прошедшего с момента его регистрации.",
     "ens-terms-point-4": "Контролер контракта не может получить доступ к вашим депонированным средствам. Их можно переместить только обратно на адрес, который их отправил.",
@@ -1147,4 +1147,4 @@
     "your-data-belongs-to-you-description": "Status не сможет помочь восстановить ваш мультиаккаунт, если вы потеряете фразу восстановления. Вы отвечаете за безопасность своих данных и резервная копия фразы восстановления - лучшая защита.",
     "your-recovery-phrase": "Ваша фраза восстановления",
     "your-recovery-phrase-description": "Это ваша фраза восстановления. Используйте её, чтобы доказать, что это ваш кошелёк. Вы увидите её только один раз. Запишите все слова на бумаге и держите в надежном месте. Они вам понадобятся, если вы потеряете или переустановите свой кошелёк."
-}
+}

translations/zh.json

@@ -33,7 +33,7 @@
     "address": "地址",
     "address-received": "已收到的地址",
     "address-request-accepted": "已接受地址请求",
-    "address-requested": "地址请求",
+    "address-requested": "收款地址",
     "advanced": "高级",
     "advanced-settings": "高级设置",
     "agree-by-continuing": "继续同意我们",
@@ -116,6 +116,7 @@
     "cannot-use-default-pin": "密码000000是无效的。 \n请使用其他数字",
     "cant-read-card": "不能读卡",
     "cant-read-card-error-explanation": "在安装过程中，卡必须与手机保持连接，以便连接到NFC读取器",
+    "cant-report-bug": "无法报告错误",
     "card-already-linked": "卡已经连接到其他的多帐户",
     "card-is-blank": "这是一张空白卡",
     "card-is-empty": "卡是空的",
@@ -144,6 +145,7 @@
     "chat-name-title": "聊天名称",
     "chat-settings": "聊天设置",
     "chats": "聊天",
+    "check-on-etherscan": "在etherscan中查看",
     "check-your-recovery-phrase": "确认您的助记词",
     "choose-authentication-method": "选择一种身份验证方法来保护您的帐户",
     "clear": "清空",
@@ -288,7 +290,6 @@
     "custom-networks": "自定义网络",
     "custom-seed-phrase": "无效的助记词",
     "custom-seed-phrase-text-1": "该助记词与我们支持的词库不匹配。检查拼写错误的单词。",
-    "custom-seed-phrase-text-2": "",
     "dapp": "ÐApp",
     "dapp-would-like-to-connect-wallet": "想要连接到",
     "dapps": "ÐApp",
@@ -327,7 +328,7 @@
     "delete-bootnode-are-you-sure": "您确定要删除这个引导节点吗？",
     "delete-bootnode-title": "删除引导节点",
     "delete-chat": "刪除聊天",
-    "delete-chat-confirmation": "您确定要删除此聊天记录吗？",
+    "delete-chat-confirmation": "您确定要删除此聊天吗？",
     "delete-confirmation": "刪除",
     "delete-mailserver": "删除邮件服务器",
     "delete-mailserver-are-you-sure": "您确定要删除此邮件服务器吗？",
@@ -372,7 +373,7 @@
     "ens-displayed-with": "您的消息会显示给其他人",
     "ens-get-name": "获取用户名",
     "ens-got-it": "好的, 知道了",
-    "ens-locked": "用户名已锁定。您将无法在25.05.2020之前释放它",
+    "ens-locked": "用户名已锁定。您将无法在{{date}}之前释放它",
     "ens-name-content": "您可以为您的聊天码使用以太坊名称服务（ENS）注册的自定义昵称。 ENS名称是去中心化的用户名。",
     "ens-name-title": "ENS名称",
     "ens-network-restriction": "仅适用于主网",
@@ -390,7 +391,7 @@
     "ens-show-username": "在聊天中显示我的ENS用户名",
     "ens-terms-header": "名称注册条款",
     "ens-terms-point-1": "资金存入1年。您的 snt 将被锁定, 但不会被花费。",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b（ENS注册表）。",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e（ENS注册表）。",
     "ens-terms-point-2": "1 年后,您可以释放名称并赎回您的押金,或者不采取任何措施保留该名称。",
     "ens-terms-point-3": "如果合约条款发生变化(例如,Status升级合约),用户有权释放用户名,无论持有时间长短。",
     "ens-terms-point-4": "合约控制者无法访问您缴纳的押金。它们只能原路返回发送它们的钱包地址。",
@@ -434,6 +435,9 @@
     "ens-your-usernames": "您的用户名",
     "ens-your-your-name": "您的ENS名称",
     "enter-12-words": "输入您的12个助记词，并使用单个空格隔开",
+    "enter-a-private-key": "输入私钥",
+    "enter-a-seed-phrase": "输入助记词",
+    "enter-address": "输入地址",
     "enter-contact-code": "输入聊天码或ENS用户名",
     "enter-ens-or-contact-code": "输入聊天码或ENS用户名",
     "enter-pair-code": "输入配对码",
@@ -442,8 +446,10 @@
     "enter-pin": "输入6位数字密码",
     "enter-puk-code": "输入PUK码",
     "enter-puk-code-description": "6位数字密码已锁定。 \n请输入PUK码以解锁密码。",
+    "enter-recipient-address-or-username": "输入收款人的地址或用户名",
     "enter-seed-phrase": "输入助记词",
     "enter-url": "输入网址",
+    "enter-watch-account-address": "输入要观察的地址",
     "enter-word": "输入单词",
     "enter-your-code": "输入您的6位数密码",
     "enter-your-password": "输入密码......",
@@ -551,9 +557,9 @@
     "intro-title1": "真正的隐私交流",
     "intro-title2": "安全加密钱包",
     "intro-title3": "去中心化应用程序",
-    "intro-wizard-text1": "您的帐户由一组密钥控制。您的密钥位于手机上，因此只有您可以使用它们",
+    "intro-wizard-text1": "您的帐户由一组密钥控制。您的密钥存储在手机上，只有您可以使用它们",
     "intro-wizard-text2": "一个密钥用于聊天。它带有一个无法更改的易读名称。",
-    "intro-wizard-text3": "有Keycard？将密钥存储在Keycard上；进行交易时，您将需要用到它",
+    "intro-wizard-text3": "如果您有 Keycard，将私钥存储在上面可以增强安全性。",
     "intro-wizard-text4": "保护并加密您的密钥",
     "intro-wizard-text6": "有新消息Status将通知您。您稍后也可以在通知选项中设置",
     "intro-wizard-title-alt4": "创建密码",
@@ -636,6 +642,7 @@
     "logout-app-content": "该帐户将被注销。再次登录时，将使用所选的网络",
     "logout-are-you-sure": "您确定要注销吗？",
     "logout-title": "注销？",
+    "mail-should-be-configured": "应配置邮件客户端",
     "mailserver-address": "邮件服务器地址",
     "mailserver-automatic": "自动选择",
     "mailserver-connection-error": "无法连接到邮件服务器",
@@ -647,7 +654,7 @@
     "mailserver-pick-another": "选择其他邮件服务器",
     "mailserver-reconnect": "无法连接到邮件服务器，请点击重新连接",
     "mailserver-request-error-content": "邮件服务器返回以下错误： {{error}}",
-    "mailserver-request-error-status": "获取历史消息时发生错误，请检查日志以获取详细信息",
+    "mailserver-request-error-status": "获取历史消息时发生错误，请查看日志以获取详细信息",
     "mailserver-request-error-title": "邮件服务器请求错误",
     "mailserver-request-retry": "重试请求",
     "mailserver-retry": "重试",
@@ -712,6 +719,7 @@
     "network-details": "网络详细信息",
     "network-fee": "网络费",
     "network-id": "网络 ID",
+    "network-info": "网络信息",
     "network-invalid-network-id": "指定的网络ID与RPC url的网络ID不对应",
     "network-invalid-status-code": "无效状态码： {{code}}",
     "network-invalid-url": "无效网络网址",
@@ -738,7 +746,7 @@
     "no-messages": "无消息",
     "no-messages-yet": "暂无消息",
     "no-pairing-slots-available": "没有可用配对位。 \n您可以解除已经与卡配对的设备配对",
-    "no-recent-chats": "你的主界面将显示最近的聊天和Dapp历史记录。点击加号 (+) 按钮开始。",
+    "no-recent-chats": "最近这里没有聊天。 \n使用（+）按钮找人聊天",
     "no-result": "没有结果",
     "no-tokens-found": "没有找到代币",
     "node-info": "节点信息",
@@ -758,7 +766,7 @@
     "offline-messaging-settings": "邮件服务器设置",
     "ok": "确定",
     "ok-continue": "好的，继续",
-    "ok-got-it": "好的, 明白",
+    "ok-got-it": "好的, 知道了",
     "ok-save-pass": "保存密码",
     "okay": "确定",
     "on": "开启",
@@ -794,13 +802,13 @@
     "passphrase": "密码",
     "password": "密码",
     "password_error1": "密码不匹配。",
-    "password-description": "至少6个字符。您的密码可以保护您的密钥。您需要它来解锁Status并进行交易。",
+    "password-description": "至少6个字符。您的密码可以保护您的密钥。您需要它来解锁Status并进行签名交易。",
     "password-placeholder": "至少6个字符",
     "password-placeholder2": "确认您的密码",
     "paste": "粘贴",
     "paste-json": "粘贴 JSON",
     "pay-to-chat": "付费聊天",
-    "peer-content": "连接到Status聊天网络的设备。每个用户可以代表一个或多个对等设备，具体取决于他们的设备数量。",
+    "peer-content": "连接到Status聊天网络的设备。每个用户可以拥有一个或多个对等设备，具体取决于他们的设备数量。",
     "peer-title": "对等点",
     "peers": "对等方",
     "pending": "等待中",
@@ -845,6 +853,7 @@
     "recently-used-stickers": "最近使用的贴纸将出现在这里",
     "recipient": "接收方",
     "recipient-code": "输入收款地址",
+    "recipient-code-placeholder": "0x ...或用户名.域名.eth",
     "recover": "恢复",
     "recover-key": "使用已有密钥",
     "recover-keycard-multiaccount-not-supported": "不支持使用密码恢复keycard多帐户",
@@ -863,7 +872,7 @@
     "recovery-typo-dialog-title": "此助记词正确吗？",
     "remaining-steps": "剩余步骤",
     "remember-me": "记住我的选择",
-    "remind-me-later": "再看一次",
+    "remind-me-later": "下次再看",
     "remove": "删除",
     "remove-from-chat": "从聊天中删除",
     "remove-from-contacts": "从联系人中删除",
@@ -971,7 +980,7 @@
     "start-group-chat": "开始群聊",
     "start-new-chat": "开始新聊天",
     "status": "Status",
-    "status-confirmed": "确定",
+    "status-confirmed": "已确认",
     "status-hardwallet": "Status硬件钱包",
     "status-keycard": "Status Keycard",
     "status-not-sent-click": "未确认。点击选项",
@@ -1025,6 +1034,7 @@
     "transactions-filter-title": "筛选记录",
     "transactions-history": "交易记录",
     "transactions-history-empty": "暂无交易历史记录",
+    "transactions-load-more": "加载更多",
     "transactions-sign": "签名",
     "transactions-sign-transaction": "签名交易",
     "tribute-required-by-multiaccount": "{{multiaccount-name}}需要收到SNT才能开始聊天",
@@ -1150,4 +1160,4 @@
     "your-data-belongs-to-you-description": "如果您丢失了助记词，Status无法帮助您恢复多帐户。您需对数据的安全性负责，备份助记词是最佳保障。",
     "your-recovery-phrase": "您的助记词",
     "your-recovery-phrase-description": "这是您的助记词。您需要用它来证明这个钱包属于您。您只能查看一次！请将其写在纸上并保存在安全的地方。如果丢失或重新安装钱包，您将需要用到这些助记词。"
-}
+}

translations/zh_Hans_CN.json

@@ -349,7 +349,7 @@
     "ens-displayed-with": "您的消息会显示给其他人",
     "ens-get-name": "获取通用用户名",
     "ens-got-it": "好的, 明白了",
-    "ens-locked": "用户名已锁定。您将无法在25.05.2020之前释放它",
+    "ens-locked": "用户名已锁定。您将无法在{{date}}之前释放它",
     "ens-network-restriction": "仅适用于主网或ropsten",
     "ens-no-usernames": "您没有关联任何用户名",
     "ens-powered-by": "由以太坊名称服务提供支持",
@@ -365,7 +365,7 @@
     "ens-show-username": "在聊天中显示我的ENS用户名",
     "ens-terms-header": "名称注册条款",
     "ens-terms-point-1": "资金存入1年。您的 snt 将被锁定, 但不会被花费。",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b（ENS注册表）。",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e（ENS注册表）。",
     "ens-terms-point-2": "1 年后,您可以释放名称并赎回您的押金,或者不采取任何措施保留该名称。",
     "ens-terms-point-3": "如果合约条款发生变化(例如,Status升级合约),用户有权释放用户名,无论持有时间长短。",
     "ens-terms-point-4": "合约控制者无法访问您缴纳的押金。它们只能原路返回发送它们的钱包地址。",

translations/zh_hans.json

@@ -323,7 +323,7 @@
     "ens-displayed-with": "您的消息会显示给其他人",
     "ens-get-name": "获取通用用户名",
     "ens-got-it": "好的, 明白了",
-    "ens-locked": "用户名已锁定。您将无法在25.05.2020之前释放它",
+    "ens-locked": "用户名已锁定。您将无法在{{date}}之前释放它",
     "ens-network-restriction": "仅适用于主网或ropsten",
     "ens-no-usernames": "您没有关联任何用户名",
     "ens-powered-by": "由以太坊名称服务提供支持",
@@ -339,7 +339,7 @@
     "ens-show-username": "在聊天中显示我的ENS用户名",
     "ens-terms-header": "名称注册条款",
     "ens-terms-point-1": "资金存入1年。您的 snt 将被锁定, 但不会被花费。",
-    "ens-terms-point-10": "0x314159265dd8dbb310642f98f50c066173c1259b（ENS注册表）。",
+    "ens-terms-point-10": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e（ENS注册表）。",
     "ens-terms-point-2": "1 年后,您可以释放名称并赎回您的押金,或者不采取任何措施保留该名称。",
     "ens-terms-point-3": "如果合约条款发生变化(例如,Status升级合约),用户有权释放用户名,无论持有时间长短。",
     "ens-terms-point-4": "合约控制者无法访问您缴纳的押金。它们只能原路返回发送它们的钱包地址。",