-
Notifications
You must be signed in to change notification settings - Fork 985
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[#19917] feat: rename keypair from wallet settings
- Loading branch information
1 parent
d68d048
commit d982f3d
Showing
11 changed files
with
171 additions
and
10 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
(ns status-im.common.validation.keypair | ||
(:require [clojure.string :as string] | ||
[status-im.common.validation.general :as validators] | ||
[status-im.constants :as constants] | ||
utils.emojilib | ||
[utils.i18n :as i18n])) | ||
|
||
(defn keypair-too-short? [s] (< (count (string/trim (str s))) constants/keypair-name-min-length)) | ||
(defn keypair-too-long? [s] (> (count (string/trim (str s))) constants/keypair-name-max-length)) | ||
|
||
(defn validation-keypair-name | ||
[s] | ||
(cond | ||
(string/blank? s) nil | ||
(validators/has-emojis? s) (i18n/label :t/key-name-error-emoji) | ||
(validators/has-special-characters? s) (i18n/label :t/key-name-error-special-char) | ||
(keypair-too-short? s) (i18n/label :t/your-key-pair-name-is-too-short) | ||
(keypair-too-long? s) (i18n/label :t/your-key-pair-name-is-too-long))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
(ns status-im.common.validation.keypair-test | ||
(:require | ||
[cljs.test :refer-macros [deftest are]] | ||
[status-im.common.validation.keypair :as keypair-validator] | ||
[utils.i18n :as i18n])) | ||
|
||
(deftest keypair-name-too-short-test | ||
(are [arg expected] | ||
(expected (keypair-validator/keypair-too-short? arg)) | ||
"abc" true? | ||
"abcdef" false?)) | ||
|
||
(deftest keypair-name-too-long-test | ||
(are [arg expected] | ||
(expected (keypair-validator/keypair-too-long? arg)) | ||
(apply str (repeat 25 "a")) true? | ||
"abcdef" false?)) | ||
|
||
(deftest validation-keypair-name-test | ||
(are [arg expected] | ||
(= (keypair-validator/validation-keypair-name arg) expected) | ||
nil nil | ||
"" nil | ||
"name !" (i18n/label :t/key-name-error-special-char) | ||
"Hello 😊" (i18n/label :t/key-name-error-emoji) | ||
"abc" (i18n/label :t/your-key-pair-name-is-too-short) | ||
(apply str (repeat 25 "a")) (i18n/label :t/your-key-pair-name-is-too-long))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 16 additions & 3 deletions
19
src/status_im/contexts/settings/wallet/keypairs_and_accounts/actions/view.cljs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,19 @@ | ||
(ns status-im.contexts.settings.wallet.keypairs-and-accounts.actions.view | ||
(:require [quo.core :as quo])) | ||
(:require [quo.core :as quo] | ||
[utils.i18n :as i18n] | ||
[utils.re-frame :as rf])) | ||
|
||
(defn on-rename-request | ||
[data] | ||
(rf/dispatch [:open-modal :screen/settings.rename-keypair data])) | ||
|
||
(defn view | ||
[props] | ||
[quo/drawer-top props]) | ||
[props data] | ||
[:<> | ||
[quo/drawer-top props] | ||
[quo/action-drawer | ||
[(when (= (:type props) :keypair) | ||
[{:icon :i/edit | ||
:accessibility-label :rename-key-pair | ||
:label (i18n/label :t/rename-key-pair) | ||
:on-press #(on-rename-request data)}])]]]) |
11 changes: 11 additions & 0 deletions
11
src/status_im/contexts/settings/wallet/keypairs_and_accounts/rename/style.cljs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
(ns status-im.contexts.settings.wallet.keypairs-and-accounts.rename.style) | ||
|
||
(def header-container | ||
{:margin-bottom 8}) | ||
|
||
(def bottom-action | ||
{:margin-horizontal -20}) | ||
|
||
(def error-container | ||
{:margin-left 20 | ||
:margin-vertical 8}) |
82 changes: 82 additions & 0 deletions
82
src/status_im/contexts/settings/wallet/keypairs_and_accounts/rename/view.cljs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
(ns status-im.contexts.settings.wallet.keypairs-and-accounts.rename.view | ||
(:require [clojure.string :as string] | ||
[quo.core :as quo] | ||
[react-native.core :as rn] | ||
[status-im.common.floating-button-page.view :as floating-button-page] | ||
[status-im.common.validation.keypair :as keypair-validator] | ||
[status-im.constants :as constants] | ||
[status-im.contexts.settings.wallet.keypairs-and-accounts.rename.style :as style] | ||
[utils.debounce :as debounce] | ||
[utils.i18n :as i18n] | ||
[utils.re-frame :as rf])) | ||
|
||
(defn navigation-back [] (rf/dispatch [:navigate-back])) | ||
|
||
(defn view | ||
[] | ||
(let [{:keys [name]} (rf/sub [:get-screen-params]) | ||
customization-color (rf/sub [:profile/customization-color]) | ||
[unsaved-keypair-name set-unsaved-keypair-name] (rn/use-state name) | ||
[error-msg set-error-msg] (rn/use-state nil) | ||
[typing? set-typing?] (rn/use-state false) | ||
validate-keypair-name (rn/use-callback | ||
(debounce/debounce | ||
(fn [name] | ||
(set-error-msg | ||
(keypair-validator/validation-keypair-name | ||
name)) | ||
(set-typing? false)) | ||
300)) | ||
on-change-text (rn/use-callback (fn [text] | ||
(set-typing? true) | ||
(set-unsaved-keypair-name | ||
text) | ||
(validate-keypair-name text))) | ||
on-clear (rn/use-callback (fn [] | ||
(on-change-text ""))) | ||
on-continue (rn/use-callback #(rf/dispatch | ||
[:wallet/edit-keypair-name | ||
unsaved-keypair-name]) | ||
[unsaved-keypair-name])] | ||
[floating-button-page/view | ||
{:header [quo/page-nav | ||
{:icon-name :i/close | ||
:on-press navigation-back | ||
:accessibility-label :top-bar}] | ||
:footer [quo/bottom-actions | ||
{:actions :one-action | ||
:button-one-label (i18n/label :t/save) | ||
:button-one-props {:disabled? (or typing? | ||
(string/blank? unsaved-keypair-name) | ||
(not (string/blank? error-msg))) | ||
:customization-color customization-color | ||
:on-press on-continue} | ||
:container-style style/bottom-action}]} | ||
[quo/page-top | ||
{:container-style style/header-container | ||
:title (i18n/label :t/rename-key-pair) | ||
:description :context-tag | ||
:context-tag {:type :icon | ||
:size 24 | ||
:context name | ||
:icon :i/seed-phrase}}] | ||
[quo/input | ||
{:container-style {:margin-horizontal 20} | ||
:placeholder (i18n/label :t/keypair-name-input-placeholder) | ||
:label (i18n/label :t/keypair-name) | ||
:default-value unsaved-keypair-name | ||
:char-limit constants/keypair-name-max-length | ||
:max-length constants/keypair-name-max-length | ||
:auto-focus true | ||
:clearable? (not (string/blank? unsaved-keypair-name)) | ||
:on-clear on-clear | ||
:on-change-text on-change-text | ||
:error? (not (string/blank? error-msg))}] | ||
(when-not (string/blank? error-msg) | ||
[quo/info-message | ||
{:type :error | ||
:size :default | ||
:icon :i/info | ||
:container-style style/error-container} | ||
error-msg])])) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters