From 652dd3c837a5277afbee172d20df056ff226cbbb Mon Sep 17 00:00:00 2001
From: dewanhimanshu <himanshudewan786@gmail.com>
Date: Sat, 14 Jul 2018 10:33:34 +0530
Subject: [PATCH 1/3] fixed error on edit page

---
 app/views/users/_form.html.erb | 10 ++++++++++
 app/views/users/edit.html.erb  | 12 +-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 9efafd6ce5..41132c38b3 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -28,6 +28,16 @@
     <% end %>
 
     <div class="form-group">
+     <% if Rails.env == "production" %>
+      <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0;">
+        <label> Link your Public Lab account to providers</label>
+    </div>
+    <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0; margin-bottom: 10px;">
+      <%= render :partial => "layouts/social_icons" %>
+    </div>
+    <% end %>
+    <br style="clear:both;"/>
+  
 
       <label for="email"><%= t('users._form.email') %></label>
       <%= f.text_field :email, { tabindex: 3, placeholder: "you@email.com", class: 'form-control', id: 'email' } %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index fa8160591b..dfbec65a1b 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -3,14 +3,4 @@
   <h2><%= t('users.edit.edit_profile') %></h2>
 
   <hr />
-   <% if Rails.env == "production"%>
-  <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0;">
-  <label> Link your Public Lab account to providers</label>
-  </div>
-    <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0; margin-bottom: 10px;">
-      <%= render :partial => "layouts/social_icons" %>
-   </div>
-  <% end %>
-
-
-<%= render 'form' %>
+ <%= render 'form' %>

From 937af04067118badc6c13169f201f0372fd20047 Mon Sep 17 00:00:00 2001
From: dewanhimanshu <himanshudewan786@gmail.com>
Date: Sat, 14 Jul 2018 10:55:10 +0530
Subject: [PATCH 2/3] some fixes

---
 app/views/users/_form.html.erb | 2 +-
 app/views/users/edit.html.erb  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 41132c38b3..3616115a07 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -30,7 +30,7 @@
     <div class="form-group">
      <% if Rails.env == "production" %>
       <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0;">
-        <label> Link your Public Lab account to providers</label>
+        <label> Link your Public Lab account to providers </label>
     </div>
     <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0; margin-bottom: 10px;">
       <%= render :partial => "layouts/social_icons" %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index dfbec65a1b..3d6e8eddb6 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -3,4 +3,5 @@
   <h2><%= t('users.edit.edit_profile') %></h2>
 
   <hr />
+  
  <%= render 'form' %>

From e4ae5cffd8cb2ba62dc20b99afc78a82721e8dfa Mon Sep 17 00:00:00 2001
From: dewanhimanshu <himanshudewan786@gmail.com>
Date: Sat, 14 Jul 2018 17:46:28 +0530
Subject: [PATCH 3/3] added if statement

---
 app/views/users/_form.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 3616115a07..898d98541a 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -29,6 +29,7 @@
 
     <div class="form-group">
      <% if Rails.env == "production" %>
+     <% if params[:controller] == "users" && params[:action] == "edit" %>
       <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0;">
         <label> Link your Public Lab account to providers </label>
     </div>
@@ -36,6 +37,7 @@
       <%= render :partial => "layouts/social_icons" %>
     </div>
     <% end %>
+    <% end %>
     <br style="clear:both;"/>