Merge pull request #281 from cosmos/fabo/265-fix-validation

fixed form msgs showing badly
luniehq · Dec 29, 2017 · 9b519dd · 9b519dd
2 parents 857bbeb + a741b1a
commit 9b519dd
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 23 deletions.
diff --git a/app/src/renderer/components/common/NiSessionAccountDelete.vue b/app/src/renderer/components/common/NiSessionAccountDelete.vue
@@ -32,7 +32,7 @@ import Btn from '@nylira/vue-button'
 import Field from '@nylira/vue-field'
 import FieldGroup from 'common/NiFieldGroup'
 import FormGroup from 'common/NiFormGroup'
-import FormMsg from '@nylira/vue-form-msg'
+import FormMsg from 'common/NiFormMsg'
 import FormStruct from 'common/NiFormStruct'
 export default {
   name: 'ni-session-account-delete',

diff --git a/app/src/renderer/components/common/NiSessionImport.vue b/app/src/renderer/components/common/NiSessionImport.vue
@@ -27,7 +27,7 @@
         type="password"
         placeholder="at least 10 characters"
         v-model="fields.importPassword")
-      form-msg(body="Create a password to secure your imported account")
+      form-msg Create a password to secure your imported account
       form-msg(name='Password' type='required' v-if='!$v.fields.importPassword.required')
       form-msg(name='Password' type='minLength' min="10" v-if='!$v.fields.importPassword.minLength')
   .ni-session-footer
@@ -41,7 +41,7 @@ import Field from '@nylira/vue-field'
 import FieldGroup from 'common/NiFieldGroup'
 import FieldSeed from 'common/NiFieldSeed'
 import FormGroup from 'common/NiFormGroup'
-import FormMsg from '@nylira/vue-form-msg'
+import FormMsg from 'common/NiFormMsg'
 import FormStruct from 'common/NiFormStruct'
 export default {
   name: 'ni-session-import',

diff --git a/app/src/renderer/components/common/NiSessionSignUp.vue b/app/src/renderer/components/common/NiSessionSignUp.vue
@@ -15,15 +15,17 @@
 
     form-group(field-id='sign-up-seed' field-label='Seed (write it down)')
       field-seed#sign-up-seed(v-model="fields.signUpSeed" disabled)
-      form-msg(body='Please back up this seed phrase. These words cannot be recovered!')
+      form-msg
+        | Please back up the seed phrase for this account. These words cannot be recovered!
 
     form-group(:error='$v.fields.signUpPassword.$error'
       field-id='sign-in-password' field-label='Password')
       field#sign-in-password(
         type="password"
         placeholder="at least 10 characters"
         v-model="fields.signUpPassword")
-      form-msg(body="Create a password to secure your new account")
+      form-msg
+        | Create a password to secure your new account
       form-msg(name='Password' type='required' v-if='!$v.fields.signUpPassword.required')
       form-msg(name='Password' type='minLength' min="10" v-if='!$v.fields.signUpPassword.minLength')
 
@@ -55,7 +57,7 @@ import Field from '@nylira/vue-field'
 import FieldSeed from 'common/NiFieldSeed'
 import FieldGroup from 'common/NiFieldGroup'
 import FormGroup from 'common/NiFormGroup'
-import FormMsg from '@nylira/vue-form-msg'
+import FormMsg from 'common/NiFormMsg'
 import FormStruct from 'common/NiFormStruct'
 export default {
   name: 'ni-session-sign-up',

diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue
@@ -51,7 +51,7 @@ import Field from '@nylira/vue-field'
 import FieldAddon from 'common/NiFieldAddon'
 import FieldGroup from 'common/NiFieldGroup'
 import FormGroup from 'common/NiFormGroup'
-import FormMsg from '@nylira/vue-form-msg'
+import FormMsg from 'common/NiFormMsg'
 import FormStruct from 'common/NiFormStruct'
 import Page from 'common/NiPage'
 import Part from 'common/NiPart'

diff --git a/test/unit/specs/__snapshots__/NISessionAccountDelete.spec.js.snap b/test/unit/specs/__snapshots__/NISessionAccountDelete.spec.js.snap
@@ -18,7 +18,7 @@ exports[`NiSessionAccountDelete has the expected html structure 1`] = `
             <label for=\\"sign-in-password\\" class=\\"ni-form-group__label\\">Password</label>
             <div class=\\"ni-form-group__field\\">
                <input type=\\"password\\" placeholder=\\"Enter your password\\" class=\\"ni-field\\" id=\\"sign-in-password\\">
-               <div class=\\"ni-form-msg ni-form-msg-error\\">
+               <div class=\\"ni-form-msg sm ni-form-msg--error\\">
                   Password is required
                </div>
                   <!---->
@@ -33,7 +33,7 @@ exports[`NiSessionAccountDelete has the expected html structure 1`] = `
                </div>
       <label for=\\"sign-up-warning\\" class=\\"ni-field-checkbox-label\\">I understand that Cosmos cannot recover deleted accounts without the passphrase.</label>
    </div>
-      <div class=\\"ni-form-msg ni-form-msg-error\\">
+      <div class=\\"ni-form-msg sm ni-form-msg--error\\">
          Deletion confirmation is required
       </div>
 </div>

diff --git a/test/unit/specs/__snapshots__/NISessionSignUp.spec.js.snap b/test/unit/specs/__snapshots__/NISessionSignUp.spec.js.snap
@@ -18,7 +18,7 @@ exports[`NISessionSignUp has the expected html structure 1`] = `
             <label for=\\"sign-up-name\\" class=\\"ni-form-group__label\\">Account Name</label>
             <div class=\\"ni-form-group__field\\">
                <input type=\\"text\\" placeholder=\\"at least 5 characters\\" class=\\"ni-field\\" id=\\"sign-up-name\\">
-               <div class=\\"ni-form-msg ni-form-msg-error\\">
+               <div class=\\"ni-form-msg sm ni-form-msg--error\\">
                   Name is required
                </div>
                   <!---->
@@ -28,19 +28,19 @@ exports[`NISessionSignUp has the expected html structure 1`] = `
          <label for=\\"sign-up-seed\\" class=\\"ni-form-group__label\\">Seed (write it down)</label>
          <div class=\\"ni-form-group__field\\">
             <textarea class=\\"ni-field-seed ni-field\\" id=\\"sign-up-seed\\" disabled=\\"disabled\\"></textarea>
-            <div class=\\"ni-form-msg ni-form-msg-desc\\">
-               Please back up this seed phrase. These words cannot be recovered!
+            <div class=\\"ni-form-msg sm ni-form-msg--desc\\">
+               Please back up the seed phrase for this account. These words cannot be recovered!
             </div>
 </div>
 </div>
       <div class=\\"ni-form-group\\">
          <label for=\\"sign-in-password\\" class=\\"ni-form-group__label\\">Password</label>
          <div class=\\"ni-form-group__field\\">
             <input type=\\"password\\" placeholder=\\"at least 10 characters\\" class=\\"ni-field\\" id=\\"sign-in-password\\">
-            <div class=\\"ni-form-msg ni-form-msg-desc\\">
+            <div class=\\"ni-form-msg sm ni-form-msg--desc\\">
                Create a password to secure your new account
             </div>
-      <div class=\\"ni-form-msg ni-form-msg-error\\">
+      <div class=\\"ni-form-msg sm ni-form-msg--error\\">
          Password is required
       </div>
          <!---->
@@ -55,7 +55,7 @@ exports[`NISessionSignUp has the expected html structure 1`] = `
                </div>
       <label for=\\"sign-up-warning\\" class=\\"ni-field-checkbox-label\\">I understand that lost seeds cannot be recovered.</label>
    </div>
-      <div class=\\"ni-form-msg ni-form-msg-error\\">
+      <div class=\\"ni-form-msg sm ni-form-msg--error\\">
          Recovery confirmation is required
       </div>
 </div>
@@ -69,7 +69,7 @@ exports[`NISessionSignUp has the expected html structure 1`] = `
                </div>
       <label for=\\"sign-up-backup\\" class=\\"ni-field-checkbox-label\\">I have securely written down my seed.</label>
    </div>
-      <div class=\\"ni-form-msg ni-form-msg-error\\">
+      <div class=\\"ni-form-msg sm ni-form-msg--error\\">
          Backup confirmation is required
       </div>
 </div>

diff --git a/test/unit/specs/__snapshots__/NiSessionImport.spec.js.snap b/test/unit/specs/__snapshots__/NiSessionImport.spec.js.snap
@@ -18,7 +18,7 @@ exports[`NiSessionImport has the expected html structure 1`] = `
             <label for=\\"import-name\\" class=\\"ni-form-group__label\\">Account Name</label>
             <div class=\\"ni-form-group__field\\">
                <input type=\\"text\\" placeholder=\\"at least 5 characters\\" class=\\"ni-field\\" id=\\"import-name\\">
-               <div class=\\"ni-form-msg ni-form-msg-error\\">
+               <div class=\\"ni-form-msg sm ni-form-msg--error\\">
                   Name is required
                </div>
                   <!---->
@@ -28,7 +28,7 @@ exports[`NiSessionImport has the expected html structure 1`] = `
          <label for=\\"import-seed\\" class=\\"ni-form-group__label\\">Seed</label>
          <div class=\\"ni-form-group__field\\">
             <textarea class=\\"ni-field-seed ni-field\\" id=\\"import-seed\\" placeholder=\\"must be exactly 12 words\\"></textarea>
-            <div class=\\"ni-form-msg ni-form-msg-error\\">
+            <div class=\\"ni-form-msg sm ni-form-msg--error\\">
                Seed is required
             </div>
 </div>
@@ -37,10 +37,10 @@ exports[`NiSessionImport has the expected html structure 1`] = `
          <label for=\\"import-password\\" class=\\"ni-form-group__label\\">Password</label>
          <div class=\\"ni-form-group__field\\">
             <input type=\\"password\\" placeholder=\\"at least 10 characters\\" class=\\"ni-field\\" id=\\"import-password\\">
-            <div class=\\"ni-form-msg ni-form-msg-desc\\">
+            <div class=\\"ni-form-msg sm ni-form-msg--desc\\">
                Create a password to secure your imported account
             </div>
-      <div class=\\"ni-form-msg ni-form-msg-error\\">
+      <div class=\\"ni-form-msg sm ni-form-msg--error\\">
          Password is required
       </div>
          <!---->

diff --git a/test/unit/specs/__snapshots__/PageSend.spec.js.snap b/test/unit/specs/__snapshots__/PageSend.spec.js.snap
@@ -390,7 +390,7 @@ exports[`PageSend has the expected html structure 1`] = `
                       </div>
                     </div>
                     <div
-                      class="ni-form-msg ni-form-msg-error"
+                      class="ni-form-msg sm ni-form-msg--error"
                     >
                       Denomination is required
                     </div>
@@ -447,7 +447,7 @@ exports[`PageSend has the expected html structure 1`] = `
                       />
                     </div>
                     <div
-                      class="ni-form-msg ni-form-msg-error"
+                      class="ni-form-msg sm ni-form-msg--error"
                     >
                       Address is required
                     </div>
@@ -478,7 +478,7 @@ exports[`PageSend has the expected html structure 1`] = `
                       />
                     </div>
                     <div
-                      class="ni-form-msg ni-form-msg-error"
+                      class="ni-form-msg sm ni-form-msg--error"
                     >
                       Amount is required
                     </div>