Merge pull request #2255 from rashmi73/issue_2083

Issue 2083 fix

Author: ThomasKranitsas

src/shared/components/Settings/Tools/Devices/index.jsx

@@ -488,6 +488,9 @@ export default class Devices extends ConsentComponent {
               </div>
             </div>
           </form>
+          <div styleName={`error-message ${formInvalid ? 'active' : ''}`}>
+            {errorMessage}
+          </div>
           <div styleName="button-save">
             <PrimaryButton
               styleName="complete"

src/shared/components/Settings/Tools/ServiceProviders/index.jsx

@@ -371,6 +371,9 @@ export default class ServiceProviders extends ConsentComponent {
               </div>
             </div>
           </form>
+          <div styleName={`error-message ${formInvalid ? 'active' : ''}`}>
+            { errorMessage }
+          </div>
           <div styleName="button-save">
             <PrimaryButton
               styleName="complete"

src/shared/components/Settings/Tools/Software/index.jsx

@@ -371,6 +371,9 @@ export default class Software extends ConsentComponent {
               </div>
             </div>
           </form>
+          <div styleName={`error-message ${formInvalid ? 'active' : ''}`}>
+            {errorMessage}
+          </div>
           <div styleName="button-save">
             <PrimaryButton
               styleName="complete"

src/shared/components/Settings/Tools/Subscriptions/index.jsx

@@ -321,6 +321,9 @@ export default class Subscription extends ConsentComponent {
               </div>
             </div>
           </form>
+          <div styleName={`error-message ${formInvalid ? 'active' : ''}`}>
+            { errorMessage }
+          </div>
           <div styleName="button-save">
             <PrimaryButton
               theme={{ button: styles.complete }}