Merge branch 'develop' into 15378

Add NIL safety
2023-03-29 21:58:19 +02:00 · 2023-03-25 13:38:55 +02:00 · 2023-03-20 14:08:24 +02:00 · 2023-03-19 13:25:44 +02:00
1 changed files with 5 additions and 3 deletions
@@ -88,14 +88,14 @@

 (defn valid-nickname?
  [nickname]
-  (not (string/blank? nickname)))
+  (not (string/blank? (string/trim (or nickname "")))))

 (defn- nickname-input
  [nickname entered-nickname public-key]
  [quo/text-input
   {:on-change-text      #(reset! entered-nickname %)
    :on-submit-editing   #(when (valid-nickname? @entered-nickname)
-                            (save-nickname public-key @entered-nickname))
+                            (save-nickname public-key (string/trim (or @entered-nickname ""))))
    :auto-capitalize     :none
    :auto-focus          false
    :max-length          32
@@ -131,7 +131,9 @@
         :center
         [quo/button
          {:type     :secondary
-           :on-press #(save-nickname public-key @entered-nickname)}
+           :disabled (not (valid-nickname? @entered-nickname))
+           :on-press #(when (valid-nickname? @entered-nickname)
+                        (save-nickname public-key (string/trim (or @entered-nickname ""))))}
          (i18n/label :t/done)]}]])))

 (defn button-item
Author	SHA1	Message	Date
Ibrahem Khalil	0d739e4413	Merge branch 'develop' into 15378	2023-03-29 21:58:19 +02:00
Ibrahem Khalil	336c98aff9	Merge branch 'develop' into 15378	2023-03-25 13:38:55 +02:00
ibrahem	fd6c607115	Add NIL safety	2023-03-20 14:08:24 +02:00
ibrahem	82357057ed	Remove whitespace at both ends of nickname and disable button on invalid nickname	2023-03-19 13:25:44 +02:00