From 1c51731aea85d47633f114f17ed4ef9d6c954efe Mon Sep 17 00:00:00 2001 From: Andrey Shovkoplyas Date: Thu, 10 Oct 2019 13:39:18 +0200 Subject: [PATCH] [#8446] [Multi-Account] Build account settings for individual wallet Signed-off-by: Andrey Shovkoplyas --- src/status_im/subs.cljs | 7 + .../ui/components/text_input/styles.cljs | 3 +- .../ui/components/text_input/view.cljs | 4 +- src/status_im/ui/screens/ens/views.cljs | 4 +- src/status_im/ui/screens/routing/screens.cljs | 6 +- .../ui/screens/routing/wallet_stack.cljs | 1 + .../ui/screens/wallet/account/views.cljs | 2 +- .../wallet/account_settings/views.cljs | 124 ++++++++++++++++++ .../ui/screens/wallet/accounts/sheets.cljs | 2 +- .../ui/screens/wallet/add_new/views.cljs | 64 +-------- .../ui/screens/wallet/request/views.cljs | 2 +- .../ui/screens/wallet/transactions/views.cljs | 2 +- src/status_im/wallet/accounts/core.cljs | 12 +- test/cljs/status_im/test/i18n.cljs | 4 +- translations/cs.json | 2 +- translations/de.json | 2 +- translations/el.json | 2 +- translations/en.json | 10 +- translations/es.json | 2 +- translations/es_419.json | 2 +- translations/fa.json | 2 +- translations/fr.json | 4 +- translations/it.json | 2 +- translations/ja.json | 4 +- translations/ko.json | 4 +- translations/lt.json | 2 +- translations/ms.json | 2 +- translations/nb.json | 2 +- translations/ne.json | 2 +- translations/pl.json | 2 +- translations/ru.json | 4 +- translations/sr_rs_cyrl.json | 2 +- translations/sr_rs_latn.json | 2 +- translations/sv.json | 2 +- translations/uk.json | 2 +- translations/zh_Hans_CN.json | 4 +- translations/zh_hans.json | 4 +- translations/zh_hant.json | 2 +- translations/zh_hant_hk.json | 2 +- translations/zh_hant_sg.json | 2 +- translations/zh_hant_tw.json | 2 +- 41 files changed, 199 insertions(+), 112 deletions(-) create mode 100644 src/status_im/ui/screens/wallet/account_settings/views.cljs diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs index ced1ac2dbd..46c8bde160 100644 --- a/src/status_im/subs.cljs +++ b/src/status_im/subs.cljs @@ -472,6 +472,13 @@ (fn [[acc address]] (some #(when (= (:address %) address) %) (:accounts acc)))) +(re-frame/reg-sub + :current-account + :<- [:multiaccount] + :<- [:get-screen-params :wallet-account] + (fn [[macc acc]] + (some #(when (= (:address %) (:address acc)) %) (:accounts macc)))) + ;;CHAT ============================================================================================================== (re-frame/reg-sub diff --git a/src/status_im/ui/components/text_input/styles.cljs b/src/status_im/ui/components/text_input/styles.cljs index 1e8272e926..1e38224628 100644 --- a/src/status_im/ui/components/text_input/styles.cljs +++ b/src/status_im/ui/components/text_input/styles.cljs @@ -3,9 +3,10 @@ [status-im.utils.platform :as p] [status-im.utils.styles :as styles])) -(defn label [editable] +(defn label [editable label-style] (merge {:margin-vertical 10} + label-style (when-not editable {:color colors/gray}))) (defn input-container [height editable] diff --git a/src/status_im/ui/components/text_input/view.cljs b/src/status_im/ui/components/text_input/view.cljs index a6e63bbd15..52886cbdf8 100644 --- a/src/status_im/ui/components/text_input/view.cljs +++ b/src/status_im/ui/components/text_input/view.cljs @@ -15,13 +15,13 @@ merged-styles))) (defn text-input-with-label - [{:keys [label content error style height container + [{:keys [label content error style height container label-style parent-container bottom-value text editable keyboard-type] :as props :or {editable true}}] [react/view {:style parent-container} (when label - [react/text {:style (styles/label editable)} + [react/text {:style (styles/label editable label-style)} label]) [react/view {:style (merge-container-styles height container editable)} [react/text-input diff --git a/src/status_im/ui/screens/ens/views.cljs b/src/status_im/ui/screens/ens/views.cljs index 27410a26aa..5d4853f753 100644 --- a/src/status_im/ui/screens/ens/views.cljs +++ b/src/status_im/ui/screens/ens/views.cljs @@ -300,7 +300,7 @@ (defn- registration [checked contract address public-key] [react/view {:style {:flex 1 :margin-top 24}} - [section {:title (i18n/label :t/ens-wallet-address) + [section {:title (i18n/label :t/wallet-address) :content address}] [react/view {:style {:margin-top 14}} [section {:title (i18n/label :t/key) @@ -498,7 +498,7 @@ (str (i18n/label :t/ens-10-SNT) ", deposit unlocked"))]]]) [react/view {:style {:margin-top 22}} (when-not pending? - [section {:title (i18n/label :t/ens-wallet-address) + [section {:title (i18n/label :t/wallet-address) :content (ethereum/normalized-address address)}]) (when-not pending? [react/view {:style {:margin-top 14}} diff --git a/src/status_im/ui/screens/routing/screens.cljs b/src/status_im/ui/screens/routing/screens.cljs index 077060bbea..4d15eda066 100644 --- a/src/status_im/ui/screens/routing/screens.cljs +++ b/src/status_im/ui/screens/routing/screens.cljs @@ -68,7 +68,8 @@ [status-im.ui.screens.wallet.custom-tokens.views :as custom-tokens] [status-im.ui.screens.wallet.accounts.views :as wallet.accounts] [status-im.ui.screens.wallet.account.views :as wallet.account] - [status-im.ui.screens.wallet.add-new.views :as add-account])) + [status-im.ui.screens.wallet.add-new.views :as add-account] + [status-im.ui.screens.wallet.account-settings.views :as account-settings])) (def all-screens {:login login/login @@ -197,7 +198,8 @@ :keycard-welcome keycard/welcome :add-new-account add-account/add-account :add-new-account-password add-account/password - :account-added add-account/account-added}) + :account-added account-settings/account-added + :account-settings account-settings/account-settings}) (defn get-screen [screen] (get all-screens screen #(throw (str "Screen " screen " is not defined.")))) diff --git a/src/status_im/ui/screens/routing/wallet_stack.cljs b/src/status_im/ui/screens/routing/wallet_stack.cljs index b7c90d52f3..97c626373e 100644 --- a/src/status_im/ui/screens/routing/wallet_stack.cljs +++ b/src/status_im/ui/screens/routing/wallet_stack.cljs @@ -7,6 +7,7 @@ :add-new-account :add-new-account-password :account-added + :account-settings :collectibles-list :wallet-onboarding-setup :contact-code diff --git a/src/status_im/ui/screens/wallet/account/views.cljs b/src/status_im/ui/screens/wallet/account/views.cljs index 077c449c8c..9825e7684d 100644 --- a/src/status_im/ui/screens/wallet/account/views.cljs +++ b/src/status_im/ui/screens/wallet/account/views.cljs @@ -121,7 +121,7 @@ [transactions address])]))) (views/defview account [] - (views/letsubs [{:keys [name address] :as account} [:get-screen-params]] + (views/letsubs [{:keys [name address] :as account} [:current-account]] [react/view {:flex 1 :background-color colors/white} [toolbar-view name] [react/scroll-view diff --git a/src/status_im/ui/screens/wallet/account_settings/views.cljs b/src/status_im/ui/screens/wallet/account_settings/views.cljs new file mode 100644 index 0000000000..00f6a7662c --- /dev/null +++ b/src/status_im/ui/screens/wallet/account_settings/views.cljs @@ -0,0 +1,124 @@ +(ns status-im.ui.screens.wallet.account-settings.views + (:require-macros [status-im.utils.views :refer [defview letsubs]]) + (:require [status-im.ui.components.react :as react] + [status-im.ui.components.status-bar.view :as status-bar] + [status-im.ui.components.toolbar.view :as topbar] + [status-im.ui.components.text-input.view :as text-input] + [re-frame.core :as re-frame] + [status-im.i18n :as i18n] + [status-im.ui.components.icons.vector-icons :as icons] + [status-im.ui.components.colors :as colors] + [status-im.ui.components.button :as button] + [clojure.string :as string] + [status-im.ui.components.toolbar :as toolbar] + [status-im.ui.components.copyable-text :as copyable-text] + [reagent.core :as reagent])) + +(defview colors-popover [selected-color on-press] + (letsubs [width [:dimensions/window-width]] + [react/view {:flex 1 :padding-bottom 16} + [react/scroll-view {:style {:margin 16}} + (doall + (for [color colors/account-colors] + ^{:key color} + [react/touchable-highlight {:on-press #(on-press color)} + [react/view {:height 52 :background-color color :border-radius 8 :width (* 0.7 width) + :justify-content :center :padding-left 12 :margin-bottom 16} + [react/view {:height 32 :width 32 :border-radius 20 :align-items :center :justify-content :center + :background-color colors/black-transparent} + (when (= selected-color color) + [icons/icon :main-icons/check {:color colors/white}])]]]))] + [toolbar/toolbar + {:center {:on-press #(re-frame/dispatch [:hide-popover]) + :label (i18n/label :t/cancel) + :type :secondary}}]])) + +(defview account-added [] + (letsubs [{:keys [account]} [:generate-account]] + [react/keyboard-avoiding-view {:flex 1} + [status-bar/status-bar] + [react/scroll-view {:keyboard-should-persist-taps :handled + :style {:margin-top 70 :flex 1}} + [react/view {:align-items :center :padding-horizontal 40} + [react/view {:height 40 :width 40 :border-radius 20 :align-items :center :justify-content :center + :background-color (:color account)} + [icons/icon :main-icons/check {:color colors/white}]] + [react/text {:style {:typography :header :margin-top 16}} + (i18n/label :t/account-added)] + [react/text {:style {:color colors/gray :text-align :center :margin-top 16 :line-height 22}} + (i18n/label :t/you-can-change-account)]] + [react/view {:height 52}] + [react/view {:margin-horizontal 16} + [text-input/text-input-with-label + {:label (i18n/label :t/account-name) + :auto-focus false + :default-value (:name account) + :on-change-text #(re-frame/dispatch [:set-in [:generate-account :account :name] %])}] + [react/text {:style {:margin-top 30}} (i18n/label :t/account-color)] + [react/touchable-highlight + {:on-press #(re-frame/dispatch [:show-popover + {:view [colors-popover (:color account) + (fn [new-color] + (re-frame/dispatch [:set-in [:generate-account :account :color] new-color]) + (re-frame/dispatch [:hide-popover]))] + :style {:max-height "60%"}}])} + [react/view {:height 52 :margin-top 12 :background-color (:color account) :border-radius 8 + :align-items :flex-end :justify-content :center :padding-right 12} + [icons/icon :main-icons/dropdown {:color colors/white}]]]]] + [toolbar/toolbar + {:right {:type :next + :label (i18n/label :t/finish) + :on-press #(re-frame/dispatch [:wallet.accounts/save-generated-account]) + :disabled? (string/blank? (:name account))}}]])) + +(defn property [label value] + [react/view {:margin-top 28} + [react/text {:style {:color colors/gray}} label] + (if (string? value) + [react/text {:style {:margin-top 6}} value] + value)]) + +(defview account-settings [] + (letsubs [{:keys [address color path] :as account} [:current-account] + new-account (reagent/atom nil)] + [react/keyboard-avoiding-view {:flex 1} + [status-bar/status-bar] + [topbar/toolbar {} + topbar/default-nav-back + [topbar/content-title (i18n/label :t/account-settings)] + (when (and @new-account (not= "" (:name @new-account))) + [button/button {:type :secondary :label (i18n/label :t/apply) + :on-press #(do + (re-frame/dispatch [:wallet.accounts/save-account account @new-account]) + (reset! new-account nil))}])] + [react/scroll-view {:keyboard-should-persist-taps :handled + :style {:flex 1}} + [react/view {:margin-horizontal 16 :padding-bottom 28 :padding-top 10} + [text-input/text-input-with-label + {:label (i18n/label :t/account-name) + :label-style {:color colors/gray} + :auto-focus false + :default-value (:name account) + :on-change-text #(swap! new-account assoc :name %)}] + [react/text {:style {:margin-top 30 :color colors/gray}} (i18n/label :t/account-color)] + [react/touchable-highlight + {:on-press #(re-frame/dispatch [:show-popover + {:view [colors-popover color + (fn [new-color] + (swap! new-account assoc :color new-color) + (re-frame/dispatch [:hide-popover]))] + :style {:max-height "60%"}}])} + [react/view {:height 52 :margin-top 12 :background-color (or (:color @new-account) color) + :border-radius 8 + :align-items :flex-end :justify-content :center :padding-right 12} + [icons/icon :main-icons/dropdown {:color colors/white}]]] + [property (i18n/label :t/type) (i18n/label :t/on-status-tree)] + [property (i18n/label :t/wallet-address) + [copyable-text/copyable-text-view + {:copied-text address} + [react/text {:style {:margin-top 6 :font-family "monospace"}} address]]] + [property (i18n/label :t/derivation-path) + [copyable-text/copyable-text-view + {:copied-text path} + [react/text {:style {:margin-top 6 :font-family "monospace"}} path]]] + [property (i18n/label :t/storage) (i18n/label :t/this-device)]]]])) \ No newline at end of file diff --git a/src/status_im/ui/screens/wallet/accounts/sheets.cljs b/src/status_im/ui/screens/wallet/accounts/sheets.cljs index 1ea76d2f8e..8e9498e9a0 100644 --- a/src/status_im/ui/screens/wallet/accounts/sheets.cljs +++ b/src/status_im/ui/screens/wallet/accounts/sheets.cljs @@ -69,7 +69,7 @@ {:theme :action :title :t/account-settings :icon :main-icons/info - :disabled? true}] + :on-press #(hide-sheet-and-dispatch [:navigate-to :account-settings])}] ;; Commented out for v1 #_[list-item/list-item {:theme :action diff --git a/src/status_im/ui/screens/wallet/add_new/views.cljs b/src/status_im/ui/screens/wallet/add_new/views.cljs index 1eaa26917d..6dde00be98 100644 --- a/src/status_im/ui/screens/wallet/add_new/views.cljs +++ b/src/status_im/ui/screens/wallet/add_new/views.cljs @@ -8,10 +8,7 @@ [status-im.ui.components.colors :as colors] [status-im.ui.components.list-item.views :as list-item] [status-im.ui.components.common.common :as components.common] - [status-im.ui.components.icons.vector-icons :as icons] - [status-im.ui.components.text-input.view :as text-input] [reagent.core :as reagent] - [clojure.string :as string] [cljs.spec.alpha :as spec] [status-im.multiaccounts.db :as multiaccounts.db])) @@ -38,65 +35,6 @@ #(re-frame/dispatch [:navigate-to :add-new-account-password])}]]]) -(defview colors-popover [selected-color] - (letsubs [width [:dimensions/window-width]] - [react/view {:padding-bottom 16} - [react/scroll-view {:style {:margin 16}} - (doall - (for [color colors/account-colors] - ^{:key color} - [react/touchable-highlight {:on-press #(do - (re-frame/dispatch [:set-in [:generate-account :account :color] color]) - (re-frame/dispatch [:hide-popover]))} - [react/view {:height 52 :background-color color :border-radius 8 :width (* 0.7 width) - :justify-content :center :padding-left 12 :margin-bottom 16} - [react/view {:height 32 :width 32 :border-radius 20 :align-items :center :justify-content :center - :background-color colors/black-transparent} - (when (= selected-color color) - [icons/icon :main-icons/check {:color colors/white}])]]]))] - [components.common/button {:on-press #(re-frame/dispatch [:hide-popover]) - :label (i18n/label :t/cancel) - :background? false}]])) - -(defview account-added [] - (letsubs [{:keys [account]} [:generate-account]] - [react/keyboard-avoiding-view {:flex 1} - [status-bar/status-bar] - [react/scroll-view {:keyboard-should-persist-taps :handled - :style {:margin-top 70 :flex 1}} - [react/view {:align-items :center :padding-horizontal 40} - [react/view {:height 40 :width 40 :border-radius 20 :align-items :center :justify-content :center - :background-color (:color account)} - [icons/icon :main-icons/check {:color colors/white}]] - [react/text {:style {:typography :header :margin-top 16}} - (i18n/label :t/account-added)] - [react/text {:style {:color colors/gray :text-align :center :margin-top 16 :line-height 22}} - (i18n/label :t/you-can-change-account)]] - [react/view {:height 52}] - [react/view {:margin-horizontal 16} - [text-input/text-input-with-label - {:label (i18n/label :t/account-name) - :auto-focus false - :default-value (:name account) - :on-change-text #(re-frame/dispatch [:set-in [:generate-account :account :name] %])}] - [react/text {:style {:margin-top 30}} (i18n/label :t/account-color)] - [react/touchable-highlight {:on-press #(re-frame/dispatch [:show-popover {:view [colors-popover (:color account)] - :style {:max-height "60%"}}])} - [react/view {:height 52 :margin-top 12 :background-color (:color account) :border-radius 8 - :align-items :flex-end :justify-content :center :padding-right 12} - [icons/icon :main-icons/dropdown {:color colors/white}]]]]] - [react/view {:style {:flex-direction :row - :justify-content :flex-end - :align-self :stretch - :padding-vertical 16 - :border-top-width 1 - :border-top-color colors/gray-lighter - :padding-right 12}} - [components.common/bottom-button {:label (i18n/label :t/finish) - :on-press #(re-frame/dispatch [:wallet.accounts/save-generated-account]) - :disabled? (string/blank? (:name account)) - :forward? true}]]])) - (defview password [] (letsubs [{:keys [error]} [:generate-account] entered-password (reagent/atom "")] @@ -130,4 +68,4 @@ :on-press #(re-frame/dispatch [:wallet.accounts/generate-new-account @entered-password]) :disabled? (not (spec/valid? ::multiaccounts.db/password @entered-password)) - :forward? true}]]]])) + :forward? true}]]]])) \ No newline at end of file diff --git a/src/status_im/ui/screens/wallet/request/views.cljs b/src/status_im/ui/screens/wallet/request/views.cljs index 2cfd2aab39..dbae2eef50 100644 --- a/src/status_im/ui/screens/wallet/request/views.cljs +++ b/src/status_im/ui/screens/wallet/request/views.cljs @@ -69,7 +69,7 @@ (- @width 32) (eip681/generate-uri address {:chain-id chain-id})]) [copyable-text/copyable-text-view - {:label :t/ens-wallet-address + {:label :t/wallet-address :container-style {:margin-top 12 :margin-bottom 4} :copied-text (eip55/address->checksum address)} [react/text {:number-of-lines 1 diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs index 2cc0fd0157..f6f517fd5a 100644 --- a/src/status_im/ui/screens/wallet/transactions/views.cljs +++ b/src/status_im/ui/screens/wallet/transactions/views.cljs @@ -129,7 +129,7 @@ [react/view {:style (merge {:background-color :white} components.styles/flex)} [list/section-list {:sections [{:title - (i18n/label :t/transactions-filter-type) + (i18n/label :t/type) :key :type :render-fn render-item-filter :data filters}] diff --git a/src/status_im/wallet/accounts/core.cljs b/src/status_im/wallet/accounts/core.cljs index ea7914c64f..ade2c8c973 100644 --- a/src/status_im/wallet/accounts/core.cljs +++ b/src/status_im/wallet/accounts/core.cljs @@ -87,6 +87,16 @@ (navigation/navigate-to-cofx :account-added nil))) (fx/defn save-account + {:events [:wallet.accounts/save-account]} + [{:keys [db] :as cofx} account {:keys [name color]}] + (let [{:keys [accounts]} (:multiaccount db) + new-account (cond-> account + name (assoc :name name) + color (assoc :color color)) + new-accounts (replace {account new-account} accounts)] + (multiaccounts.update/multiaccount-update cofx {:accounts new-accounts} nil))) + +(fx/defn save-generated-account {:events [:wallet.accounts/save-generated-account]} [{:keys [db] :as cofx}] (let [{:keys [accounts latest-derived-path]} (:multiaccount db) @@ -100,4 +110,4 @@ (multiaccounts.update/multiaccount-update {:accounts (conj accounts account) :latest-derived-path (inc latest-derived-path)} nil) (wallet/update-balances nil) - (navigation/navigate-to-cofx :wallet nil))))) + (navigation/navigate-to-cofx :wallet nil))))) \ No newline at end of file diff --git a/test/cljs/status_im/test/i18n.cljs b/test/cljs/status_im/test/i18n.cljs index 081d1f0fd4..1bab4c89f1 100644 --- a/test/cljs/status_im/test/i18n.cljs +++ b/test/cljs/status_im/test/i18n.cljs @@ -416,7 +416,7 @@ :ens-username-taken :ens-usernames :ens-usernames-details - :ens-wallet-address + :wallet-address :ens-want-custom-domain :ens-want-domain :ens-welcome-hints @@ -979,7 +979,7 @@ :transactions :transactions-filter-select-all :transactions-filter-title - :transactions-filter-type + :type :transactions-history :transactions-history-empty :transactions-sign diff --git a/translations/cs.json b/translations/cs.json index 8d0bc09b24..12270b3254 100644 --- a/translations/cs.json +++ b/translations/cs.json @@ -81,7 +81,7 @@ "one": "kontakt", "other": "kontakty(ů)" }, - "transactions-filter-type": "Typ", + "type": "Typ", "next": "Další", "recent": "Poslední", "status": "Status", diff --git a/translations/de.json b/translations/de.json index 4587d91ced..d827c5266d 100644 --- a/translations/de.json +++ b/translations/de.json @@ -118,7 +118,7 @@ "other": "Kontakte" }, "gas-used": "Gas verbraucht", - "transactions-filter-type": "Typ", + "type": "Typ", "next": "Weiter", "recent": "Kürzliche Status", "open-on-etherscan": "Auf Etherscan.io öffnen", diff --git a/translations/el.json b/translations/el.json index 6affa75fe0..1b2a361c17 100644 --- a/translations/el.json +++ b/translations/el.json @@ -124,7 +124,7 @@ "other": "επαφές" }, "gas-used": "χρησιμοποιημένο Gas", - "transactions-filter-type": "Τύπος", + "type": "Τύπος", "next": "Επόμενο", "recent": "Πρόσφατες καταστάσεις", "open-on-etherscan": "Άνοιγμα στο Etherscan.io", diff --git a/translations/en.json b/translations/en.json index 9d773fa63f..39d5295b25 100644 --- a/translations/en.json +++ b/translations/en.json @@ -394,7 +394,7 @@ "ens-username-you-can-follow-progress": "You can follow the progress in the Transaction History section of your wallet.", "ens-usernames": "ENS usernames", "ens-usernames-details": "Register a universal username to be easily recognized by other users", - "ens-wallet-address": "Wallet address", + "wallet-address": "Wallet address", "ens-want-custom-domain": "I own a name on another domain", "ens-want-domain": "I want a stateofus.eth domain", "ens-welcome-hints": "ENS names transform those crazy-long addresses into unique usernames.", @@ -979,7 +979,7 @@ "transactions": "Transactions", "transactions-filter-select-all": "Select all", "transactions-filter-title": "Filter history", - "transactions-filter-type": "Type", + "type": "Type", "transactions-history": "Transaction history", "transactions-history-empty": "No transactions in your history yet", "transactions-sign": "Sign", @@ -1113,5 +1113,9 @@ "lock-app-with": "Lock app with", "grant-face-id-permissions": "To grant the required Face ID permission, please go to your system settings and make sure that Status > Face ID is selected", "request-feature": "Request a feature", - "select-account-dapp": "Select the account you wish to use with Dapps" + "select-account-dapp": "Select the account you wish to use with Dapps", + "apply": "Apply", + "on-status-tree": "On Status tree", + "derivation-path": "Derivation path", + "storage": "Storage" } diff --git a/translations/es.json b/translations/es.json index f7c37e9690..b13a42d7b7 100644 --- a/translations/es.json +++ b/translations/es.json @@ -117,7 +117,7 @@ "other": "contactos" }, "gas-used": "Gas usado", - "transactions-filter-type": "Tipo", + "type": "Tipo", "next": "Siguiente", "recent": "Estados recientes", "open-on-etherscan": "Abrir en Etherscan.io", diff --git a/translations/es_419.json b/translations/es_419.json index 39f37f2b10..2ee3f1282c 100644 --- a/translations/es_419.json +++ b/translations/es_419.json @@ -466,7 +466,7 @@ "transactions": "Transacciones", "transactions-filter-select-all": "Seleccionar todo", "transactions-filter-title": "Filtrar historial", - "transactions-filter-type": "Tipo", + "type": "Tipo", "transactions-history": "Historial de transacciones", "transactions-history-empty": "Aún no hay transacciones en tu historial", "transactions-sign": "Firmar", diff --git a/translations/fa.json b/translations/fa.json index 6a9c7053c5..b79257d914 100644 --- a/translations/fa.json +++ b/translations/fa.json @@ -469,7 +469,7 @@ "transactions": "تراکنش ها", "transactions-filter-select-all": "انتخاب همه", "transactions-filter-title": "فیلتر تاریخچه", - "transactions-filter-type": "نوع", + "type": "نوع", "transactions-history": "سابقه تراکنش", "transactions-history-empty": "هنوز هیچ تراکنشی در تاریخچه ثبت نشده", "transactions-sign": "امضا کردن", diff --git a/translations/fr.json b/translations/fr.json index ad4d9da249..72d6f58351 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -382,7 +382,7 @@ "ens-username-taken": "Nom d'utilisateur déjà pris :(", "ens-usernames": "Noms d'utilisateurs ENS", "ens-usernames-details": "Enregistrer un nom d'utilisateur universel pour être facilement reconnu par les autres utilisateurs", - "ens-wallet-address": "Adresse portefeuille", + "wallet-address": "Adresse portefeuille", "ens-want-custom-domain": "Je possède un nom sur un autre domaine", "ens-want-domain": "Je veux un domaine stateofus.eth", "ens-welcome-hints": "Les noms ENS transforment ces adresses d'une longueur insensée en noms d'utilisateur uniques.", @@ -937,7 +937,7 @@ "transactions": "Transactions", "transactions-filter-select-all": "Tout sélectionner", "transactions-filter-title": "Filtrer l'historique", - "transactions-filter-type": "Type", + "type": "Type", "transactions-history": "Historique des transactions", "transactions-history-empty": "Aucune transaction dans votre historique pour le moment", "transactions-sign": "Connecter", diff --git a/translations/it.json b/translations/it.json index a0e4079815..ec527e16de 100644 --- a/translations/it.json +++ b/translations/it.json @@ -117,7 +117,7 @@ "other": "contatti" }, "gas-used": "Gas usato", - "transactions-filter-type": "Tipo", + "type": "Tipo", "next": "Avanti", "recent": "Stati recenti", "open-on-etherscan": "Apri su Etherscan.io", diff --git a/translations/ja.json b/translations/ja.json index 5ebbc8f547..e4ddf2b994 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -380,7 +380,7 @@ "ens-username-taken": "ユーザー名はすでに使用されています :(", "ens-usernames": "ENSユーザー名", "ens-usernames-details": "他のユーザーが簡単に認識できるユニバーサルユーザー名を登録する", - "ens-wallet-address": "ウォレットアドレス", + "wallet-address": "ウォレットアドレス", "ens-want-custom-domain": "他のドメイン名を所有しています", "ens-want-domain": "stateofus.ethのドメインが欲しい", "ens-welcome-hints": "ENSユーザー名は長すぎるアドレスを固有のユーザー名に変換します", @@ -940,7 +940,7 @@ "transactions": "トランザクション", "transactions-filter-select-all": "すべて選択", "transactions-filter-title": "履歴をフィルタする", - "transactions-filter-type": "タイプ", + "type": "タイプ", "transactions-history": "トランザクション履歴", "transactions-history-empty": "トランザクション履歴がまだありません", "transactions-sign": "署名", diff --git a/translations/ko.json b/translations/ko.json index 5326e7e612..d4e7cc2152 100644 --- a/translations/ko.json +++ b/translations/ko.json @@ -391,7 +391,7 @@ "ens-username-taken": "이미 사용 중인 이름입니다 :(", "ens-usernames": "ENS 사용자 이름", "ens-usernames-details": "검색 가능한 아이디 등록", - "ens-wallet-address": "지갑 주소", + "wallet-address": "지갑 주소", "ens-want-custom-domain": "이미 다른 도메인의 이름을 가지고 있습니다", "ens-want-domain": "stateofus.eth 도메인을 원합니다.", "ens-welcome-hints": "ENS 이름은 복잡하고 긴 해시 주소를 직관적인 별칭으로 변환합니다", @@ -965,7 +965,7 @@ "transactions": "거래", "transactions-filter-select-all": "모두 선택", "transactions-filter-title": "거래내역 필터", - "transactions-filter-type": "종류", + "type": "종류", "transactions-history": "거래 내역", "transactions-history-empty": "거래 내역이 없습니다", "transactions-sign": "승인", diff --git a/translations/lt.json b/translations/lt.json index e0bc97b09f..ba1c622576 100644 --- a/translations/lt.json +++ b/translations/lt.json @@ -117,7 +117,7 @@ "other": "kontaktai" }, "gas-used": "Gas sunaudota", - "transactions-filter-type": "Tipas", + "type": "Tipas", "next": "Sekantis", "recent": "Paskiausios būsenos", "open-on-etherscan": "Atidaryti Etherscan", diff --git a/translations/ms.json b/translations/ms.json index d6e59fc023..c161696db4 100644 --- a/translations/ms.json +++ b/translations/ms.json @@ -512,7 +512,7 @@ "transactions": "Transaksi", "transactions-filter-select-all": "Pilih semua", "transactions-filter-title": "Tapis sejarah", - "transactions-filter-type": "Jenis", + "type": "Jenis", "transactions-history": "Sejarah transaksi", "transactions-history-empty": "Tiada transaksi dalam sejarah anda lagi", "transactions-sign": "Ditandatangan", diff --git a/translations/nb.json b/translations/nb.json index ce7e00deab..b535ed6d6a 100644 --- a/translations/nb.json +++ b/translations/nb.json @@ -82,7 +82,7 @@ "one": "kontakt", "other": "kontaker" }, - "transactions-filter-type": "Type", + "type": "Type", "next": "Neste", "recent": "Nylig", "status": "Status", diff --git a/translations/ne.json b/translations/ne.json index 710d9bf7e0..0801ccbc80 100644 --- a/translations/ne.json +++ b/translations/ne.json @@ -492,7 +492,7 @@ "transactions": "Transaksi", "transactions-filter-select-all": "Pilih semua", "transactions-filter-title": "Tapis sejarah", - "transactions-filter-type": "Jenis", + "type": "Jenis", "transactions-history": "Sejarah transaksi", "transactions-history-empty": "तपाईको इतिहासमा अझै कुनै लेनदेन छैन", "transactions-sign": "Ditandatangan", diff --git a/translations/pl.json b/translations/pl.json index 84d18e87a3..319c6daaad 100644 --- a/translations/pl.json +++ b/translations/pl.json @@ -450,7 +450,7 @@ "transactions": "Transakcje", "transactions-filter-select-all": "Zaznacz wszystko", "transactions-filter-title": "Filtruj", - "transactions-filter-type": "Rodzaj", + "type": "Rodzaj", "transactions-history": "Historia transakcji", "transactions-history-empty": "Brak transakcji w Twojej historii", "transactions-sign": "Podpisz", diff --git a/translations/ru.json b/translations/ru.json index d637d5d984..9335ec366e 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -408,7 +408,7 @@ "ens-username-taken": "Имя пользователя уже занято:(", "ens-usernames": "ENS имена пользователей", "ens-usernames-details": "Зарегистрируйте универсальное имя пользователя, чтобы его могли легко узнать другие пользователи.", - "ens-wallet-address": "Адрес кошелька", + "wallet-address": "Адрес кошелька", "ens-want-custom-domain": "У меня есть имя на другом домене", "ens-want-domain": "Я хочу домен stateofus.eth", "ens-welcome-hints": "ENS имена преобразуют эти невероятно длинные адреса в уникальные имена пользователей", @@ -985,7 +985,7 @@ "transactions": "Транзакции", "transactions-filter-select-all": "Выбрать все", "transactions-filter-title": "Фильтр истории", - "transactions-filter-type": "Тип", + "type": "Тип", "transactions-history": "История транзакций", "transactions-history-empty": "В вашей истории еще нет транзакций", "transactions-sign": "Подписать", diff --git a/translations/sr_rs_cyrl.json b/translations/sr_rs_cyrl.json index 0e7f704f07..0b12841d2d 100644 --- a/translations/sr_rs_cyrl.json +++ b/translations/sr_rs_cyrl.json @@ -117,7 +117,7 @@ "other": "контаката" }, "gas-used": "Искоришћени гас", - "transactions-filter-type": "Тип", + "type": "Тип", "next": "Следећи", "recent": "Нови статуси", "open-on-etherscan": "Отвори Etherscan.io", diff --git a/translations/sr_rs_latn.json b/translations/sr_rs_latn.json index 9514704e0a..8122f4e25a 100644 --- a/translations/sr_rs_latn.json +++ b/translations/sr_rs_latn.json @@ -114,7 +114,7 @@ "other": "kontakata" }, "gas-used": "Iskorišćeni gas", - "transactions-filter-type": "Tip", + "type": "Tip", "next": "Sledeći", "recent": "Novi statusi", "open-on-etherscan": "Otvori Etherscan.io", diff --git a/translations/sv.json b/translations/sv.json index 4962e315b5..b04547246e 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -118,7 +118,7 @@ "other": "kontakter" }, "gas-used": "Gas använt", - "transactions-filter-type": "Typ", + "type": "Typ", "next": "Nästa", "recent": "Senaste", "open-on-etherscan": "Öppna på Etherscan.io", diff --git a/translations/uk.json b/translations/uk.json index 9bc8b545c7..def1ae82b6 100644 --- a/translations/uk.json +++ b/translations/uk.json @@ -118,7 +118,7 @@ "other": "контакти" }, "gas-used": "Використаний Газ", - "transactions-filter-type": "Тип", + "type": "Тип", "next": "Далі", "recent": "Останні статуси", "open-on-etherscan": "Відкрити посилання на Etherscan.io", diff --git a/translations/zh_Hans_CN.json b/translations/zh_Hans_CN.json index 17529e7cc9..5603fb26ea 100644 --- a/translations/zh_Hans_CN.json +++ b/translations/zh_Hans_CN.json @@ -390,7 +390,7 @@ "ens-username-taken": "用户名已被占用：（", "ens-usernames": "ENS用户名", "ens-usernames-details": "注册通用用户名，以便其他用户轻松找到你", - "ens-wallet-address": "钱包地址", + "wallet-address": "钱包地址", "ens-want-custom-domain": "我在另一个域名上拥有一个名称", "ens-want-domain": "我想要一个stateofus.eth域名", "ens-welcome-hints": "ENS名称将那些冗长的地址转换为唯一的用户名。", @@ -961,7 +961,7 @@ "transactions": "交易", "transactions-filter-select-all": "全部选中", "transactions-filter-title": "过滤历史记录", - "transactions-filter-type": "类型", + "type": "类型", "transactions-history": "历史记录", "transactions-history-empty": "暂无交易历史记录", "transactions-sign": "签名", diff --git a/translations/zh_hans.json b/translations/zh_hans.json index ef47aa0d68..f34e3ceec8 100644 --- a/translations/zh_hans.json +++ b/translations/zh_hans.json @@ -360,7 +360,7 @@ "ens-username-taken": "用户名已被占用：（", "ens-usernames": "ENS用户名", "ens-usernames-details": "注册通用用户名，以便其他用户轻松找到你", - "ens-wallet-address": "钱包地址", + "wallet-address": "钱包地址", "ens-want-custom-domain": "我在另一个域名上拥有一个名称", "ens-want-domain": "我想要一个stateofus.eth域名", "ens-welcome-hints": "ENS名称将那些冗长的地址转换为唯一的用户名。", @@ -895,7 +895,7 @@ "transactions": "交易", "transactions-filter-select-all": "全部选中", "transactions-filter-title": "过滤历史记录", - "transactions-filter-type": "类型", + "type": "类型", "transactions-history": "历史记录", "transactions-history-empty": "暂无交易历史记录", "transactions-sign": "签名", diff --git a/translations/zh_hant.json b/translations/zh_hant.json index a5d591718e..41b860e480 100644 --- a/translations/zh_hant.json +++ b/translations/zh_hant.json @@ -117,7 +117,7 @@ "other": "聯繫人" }, "gas-used": "使用的Gas", - "transactions-filter-type": "類型", + "type": "類型", "next": "下一個", "recent": "最近", "open-on-etherscan": "打開 Etherscan.io", diff --git a/translations/zh_hant_hk.json b/translations/zh_hant_hk.json index a5d591718e..41b860e480 100644 --- a/translations/zh_hant_hk.json +++ b/translations/zh_hant_hk.json @@ -117,7 +117,7 @@ "other": "聯繫人" }, "gas-used": "使用的Gas", - "transactions-filter-type": "類型", + "type": "類型", "next": "下一個", "recent": "最近", "open-on-etherscan": "打開 Etherscan.io", diff --git a/translations/zh_hant_sg.json b/translations/zh_hant_sg.json index 3ac34de5d3..71ddaff73c 100644 --- a/translations/zh_hant_sg.json +++ b/translations/zh_hant_sg.json @@ -117,7 +117,7 @@ "other": "聯絡人" }, "gas-used": "使用的 Gas", - "transactions-filter-type": "型別", + "type": "型別", "next": "下一個", "recent": "最近", "open-on-etherscan": "開啟 Etherscan.io", diff --git a/translations/zh_hant_tw.json b/translations/zh_hant_tw.json index 3ac34de5d3..71ddaff73c 100644 --- a/translations/zh_hant_tw.json +++ b/translations/zh_hant_tw.json @@ -117,7 +117,7 @@ "other": "聯絡人" }, "gas-used": "使用的 Gas", - "transactions-filter-type": "型別", + "type": "型別", "next": "下一個", "recent": "最近", "open-on-etherscan": "開啟 Etherscan.io",