Code formatting corrected.

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/BaseDomain.java

@@ -21,7 +21,7 @@ import java.util.Set;
  * TODO :
  * Move BaseDomain back to appsmith-server.domain. This is done temporarily to create templates and providers in the same database as the server
  */
-@Getter 
+@Getter
 @Setter
 @ToString
 public abstract class BaseDomain implements Persistable<String> {

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Category.java

@@ -14,7 +14,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @Document
 public class Category extends BaseDomain {
 
-    @Indexed(unique=true)
+    @Indexed(unique = true)
     String name; //Category name here
 
 }

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceTestResult.java

@@ -17,6 +17,7 @@ public class DatasourceTestResult {
     /**
      * Convenience constructor to create a result object with one or more error messages. This constructor also ensures
      * that the `invalids` field is never null.
+     *
      * @param invalids String messages that explain why the test failed.
      */
     public DatasourceTestResult(String... invalids) {

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Provider.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Document
 public class Provider extends BaseDomain {
 
-    @Indexed(unique=true)
+    @Indexed(unique = true)
     String name; //Provider name here
 
     String description; //Provider company's description here

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHConnection.java

@@ -1,6 +1,10 @@
 package com.appsmith.external.models;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/SSHPrivateKey.java

@@ -1,7 +1,11 @@
 package com.appsmith.external.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
 @Getter
 @Setter

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/UploadedFile.java

@@ -2,7 +2,11 @@ package com.appsmith.external.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import reactor.core.publisher.Mono;
 
 import java.util.Base64;

app/server/appsmith-plugins/rapidApiPlugin/src/main/java/com/external/plugins/RapidApiPlugin.java

@@ -112,9 +112,9 @@ public class RapidApiPlugin extends BasePlugin {
                 List<Property> bodyFormData = actionConfiguration.getBodyFormData();
                 String jsonString = null;
                 JSONObject bodyJson;
-                for (Property property: bodyFormData) {
+                for (Property property : bodyFormData) {
 
-                    if(property.getValue()!=null) {
+                    if (property.getValue() != null) {
                         if (!property.getType().equals(JSON_TYPE)) {
                             keyValueMap.put(property.getKey(), property.getValue());
                         } else {

app/server/appsmith-server/src/main/java/com/appsmith/server/acl/PolicyGenerator.java

@@ -133,7 +133,7 @@ public class PolicyGenerator {
         // document
         Set<Policy> childPolicySet = new HashSet<>();
         Set<DefaultEdge> edges = hierarchyGraph.outgoingEdgesOf(aclPermission);
-        for (DefaultEdge edge: edges) {
+        for (DefaultEdge edge : edges) {
             AclPermission childPermission = hierarchyGraph.getEdgeTarget(edge);
             childPolicySet.add(Policy.builder().permission(childPermission.getValue())
                     .users(policy.getUsers()).build());

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ItemController.java

@@ -37,7 +37,7 @@ public class ItemController {
     }
 
     @PostMapping("/addToPage")
-    public Mono<ResponseDTO<Action>> addItemToPage (@RequestBody AddItemToPageDTO addItemToPageDTO) {
+    public Mono<ResponseDTO<Action>> addItemToPage(@RequestBody AddItemToPageDTO addItemToPageDTO) {
         log.debug("Going to add item {} to page {} with new name {}", addItemToPageDTO.getMarketplaceElement().getItem().getName(),
                 addItemToPageDTO.getPageId(), addItemToPageDTO.getName());
         return service.addItemToPage(addItemToPageDTO)

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java

@@ -46,7 +46,7 @@ public class RestApiImportController {
                                             @RequestParam String pageId,
                                             @RequestParam String name,
                                             @RequestHeader(name = "Origin", required = false) String originHeader
-                                            ) {
+    ) {
         log.debug("Going to import API");
         ApiImporter service;
 

app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Datasource.java

@@ -45,6 +45,7 @@ public class Datasource extends BaseDomain {
     /**
      * This method is here so that the JSON version of this class' instances have a `isValid` field, for backwards
      * compatibility. It may be removed, when sure that no API received is relying on this field.
+     *
      * @return boolean, indicating whether this datasource is valid or not.
      */
     public boolean getIsValid() {

app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/BeanCopyUtils.java

@@ -49,7 +49,7 @@ public final class BeanCopyUtils {
     }
 
     public static void copyNestedNonNullProperties(Object source, Object target) {
-        if (source == null || target ==  null) {
+        if (source == null || target == null) {
             return;
         }
 

app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/MustacheHelper.java

@@ -9,6 +9,7 @@ public class MustacheHelper {
 
     /**
      * Tokenize a Mustache template string into a list of plain text and Mustache interpolations.
+     *
      * @param template String Mustache template string from which to extract plain text and interpolation tokens.
      * @return A list of String tokens, which form parts of the given template String. Joining the strings in this list
      * should give the original template back. The tokens are split such that alternative strings in the list are plain
@@ -111,6 +112,7 @@ public class MustacheHelper {
     /**
      * Tokenize-s the given Mustache template string, extracts the Mustache interpolations out, strips the leading and
      * trailing double braces, trims and then returns a set of these replacement keys.
+     *
      * @param template The Mustache input template string.
      * @return A Set of strings that serve as replacement keys, with the surrounding double braces stripped and then
      * trimmed.
@@ -135,6 +137,7 @@ public class MustacheHelper {
      * JSON special characters like double-quote and backslash are escaped in the template. We need to unescape them,
      * making the JSON invalid, but the Javascript inside the Mustache double-braces will be valid. Then, our parser can
      * do its work.
+     *
      * @param jsonTemplate The template string. Usually the result of calling `objectMapper.writeValueAsString(obj)`.
      * @return A Set of strings that serve as replacement keys, with the surrounding double braces stripped and then
      * trimmed.
@@ -155,6 +158,7 @@ public class MustacheHelper {
      * instances of `\\` (two backslash characters back-to-back) with a single backslash. This is useful to undo the
      * escaping done during JSON serialization. Note that the input string is expected to be valid JSON, although this
      * is not verified. The return value will NOT be valid JSON.
+     *
      * @param jsonString Input string to apply replacements on.
      * @return String Contents of `jsonString` with the replacements applied.
      */

app/server/appsmith-server/src/main/java/com/appsmith/server/notifications/EmailSender.java

@@ -44,9 +44,9 @@ public class EmailSender {
     /**
      * This function sends an HTML email to the user from the default email address
      *
-     * @param to Single valid string email address to send to. Multiple addresses doesn't work.
+     * @param to      Single valid string email address to send to. Multiple addresses doesn't work.
      * @param subject Subject string.
-     * @param text HTML Body of the message. This method assumes UTF-8.
+     * @param text    HTML Body of the message. This method assumes UTF-8.
      */
     public void sendMail(String to, String subject, String text) {
         log.debug("Got request to send email to: {} with subject: {}", to, subject);

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/BaseAppsmithRepositoryImpl.java

@@ -11,9 +11,7 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.querydsl.core.types.Path;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.GenericTypeResolver;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomGroupRepositoryImpl.java

@@ -1,7 +1,6 @@
 package com.appsmith.server.repositories;
 
 import com.appsmith.server.domains.Group;
-import com.appsmith.server.domains.QApplication;
 import com.appsmith.server.domains.QGroup;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/GroupRepository.java

@@ -2,7 +2,6 @@ package com.appsmith.server.repositories;
 
 import com.appsmith.server.domains.Group;
 import org.springframework.stereotype.Repository;
-import reactor.core.publisher.Flux;
 
 @Repository
 public interface GroupRepository extends BaseRepository<Group, String>, CustomGroupRepository {

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java

@@ -386,30 +386,30 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
                 }))
                 .flatMap(obj -> obj)
                 .flatMap(res -> {
-                            ActionExecutionResult result = (ActionExecutionResult) res;
-                            Mono<ActionExecutionResult> resultMono = Mono.just(result);
-                            if (actionFromDto.getId() == null) {
-                                // This is a dry-run. We shouldn't query the db because it'll throw NPE on null IDs
-                                return resultMono;
-                            }
+                    ActionExecutionResult result = (ActionExecutionResult) res;
+                    Mono<ActionExecutionResult> resultMono = Mono.just(result);
+                    if (actionFromDto.getId() == null) {
+                        // This is a dry-run. We shouldn't query the db because it'll throw NPE on null IDs
+                        return resultMono;
+                    }
 
-                            Mono<Action> actionFromDbMono = repository.findById(actionFromDto.getId())
-                                    //If the action is found in the db (i.e. it is not a dry run, save the cached response
-                                    .flatMap(action -> {
-                                        if (result.getShouldCacheResponse()) {
-                                            //If the status code is 2xx, then save the cached response (aka the body) and return.
-                                            action.setCacheResponse(result.getBody().toString());
-                                            return repository.save(action);
-                                        }
-                                        log.debug("Action execution resulted in failure beyond the proxy with the result of {}", result);
-                                        return Mono.just(action);
-                                    });
-                            return actionFromDbMono.zipWith(resultMono)
-                                    .map(tuple -> {
-                                        ActionExecutionResult executionResult = tuple.getT2();
-                                        return executionResult;
-                                    });
-                        });
+                    Mono<Action> actionFromDbMono = repository.findById(actionFromDto.getId())
+                            //If the action is found in the db (i.e. it is not a dry run, save the cached response
+                            .flatMap(action -> {
+                                if (result.getShouldCacheResponse()) {
+                                    //If the status code is 2xx, then save the cached response (aka the body) and return.
+                                    action.setCacheResponse(result.getBody().toString());
+                                    return repository.save(action);
+                                }
+                                log.debug("Action execution resulted in failure beyond the proxy with the result of {}", result);
+                                return Mono.just(action);
+                            });
+                    return actionFromDbMono.zipWith(resultMono)
+                            .map(tuple -> {
+                                ActionExecutionResult executionResult = tuple.getT2();
+                                return executionResult;
+                            });
+                });
     }
 
     @Override

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApplicationServiceImpl.java

@@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import reactor.core.publisher.Flux;
@@ -25,7 +24,6 @@ import reactor.core.scheduler.Scheduler;
 import javax.validation.Validator;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
 

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemService.java

@@ -9,5 +9,6 @@ import reactor.core.publisher.Mono;
 
 public interface ItemService {
     Flux<ItemDTO> get(MultiValueMap<String, String> params);
+
     Mono<Action> addItemToPage(AddItemToPageDTO addItemToPageDTO);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java

@@ -82,7 +82,7 @@ public class ItemServiceImpl implements ItemService {
         // Set Action Fields
         action.setActionConfiguration(apiTemplate.getActionConfiguration());
         if (apiTemplate.getApiTemplateConfiguration().getSampleResponse() != null &&
-                apiTemplate.getApiTemplateConfiguration().getSampleResponse().getBody() != null ) {
+                apiTemplate.getApiTemplateConfiguration().getSampleResponse().getBody() != null) {
             action.setCacheResponse(apiTemplate.getApiTemplateConfiguration().getSampleResponse().getBody().toString());
         }
 

app/server/appsmith-server/src/main/java/com/appsmith/server/services/LayoutActionServiceImpl.java

@@ -511,7 +511,7 @@ public class LayoutActionServiceImpl implements LayoutActionService {
      * path keys.
      * <p>
      * Calling the base function would make redundant DB calls and slow down this API unnecessarily.
-     *
+     * <p>
      * At this point the user must have MANAGE_PAGE permissions because update action also leads to the page's
      * actions on load to change.
      *

app/server/appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceService.java

@@ -10,8 +10,12 @@ import java.util.List;
 
 public interface MarketplaceService {
     Mono<ProviderPaginatedDTO> getProviders(MultiValueMap<String, String> params);
+
     Mono<List<ApiTemplate>> getTemplates(MultiValueMap<String, String> params);
+
     Mono<List<String>> getCategories();
+
     Mono<Boolean> subscribeAndUpdateStatisticsOfProvider(String providerId);
+
     Mono<Provider> getProviderById(String id);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java

@@ -23,13 +23,14 @@ import java.util.List;
 @Slf4j
 public class ProviderServiceImpl extends BaseService<ProviderRepository, Provider, String> implements ProviderService {
 
-    private static final List<String> CATEGORIES = Arrays.asList("Business","Visual Recognition","Location","Science",
-            "Food","Travel, Transportation","Music","Tools","Text Analysis","Weather","Gaming","SMS","Events","Health, Fitness",
-            "Payments","Financial","Translation","Storage","Logistics","Database","Search","Reward","Mapping","Machine Learning",
-            "Email","News, Media","Video, Images","eCommerce","Medical","Devices","Business Software","Advertising","Education",
-            "Media","Social","Commerce","Communication","Other","Monitoring","Energy");
+    private static final List<String> CATEGORIES = Arrays.asList("Business", "Visual Recognition", "Location", "Science",
+            "Food", "Travel, Transportation", "Music", "Tools", "Text Analysis", "Weather", "Gaming", "SMS", "Events", "Health, Fitness",
+            "Payments", "Financial", "Translation", "Storage", "Logistics", "Database", "Search", "Reward", "Mapping", "Machine Learning",
+            "Email", "News, Media", "Video, Images", "eCommerce", "Medical", "Devices", "Business Software", "Advertising", "Education",
+            "Media", "Social", "Commerce", "Communication", "Other", "Monitoring", "Energy");
 
     private static final String DEFAULT_CATEGORY = "Business Software";
+
     public ProviderServiceImpl(Scheduler scheduler,
                                Validator validator,
                                MongoConverter mongoConverter,

app/server/appsmith-server/src/main/resources/email/forgotPasswordTemplate.html

@@ -1,189 +1,304 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html data-editor-version="2" class="sg-campaigns" xmlns="http://www.w3.org/1999/xhtml"><head>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
-      <!--[if !mso]><!-->
-      <meta http-equiv="X-UA-Compatible" content="IE=Edge">
-      <!--<![endif]-->
-      <!--[if (gte mso 9)|(IE)]>
-      <xml>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html data-editor-version="2" class="sg-campaigns" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
+    <!--[if !mso]><!-->
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <!--<![endif]-->
+    <!--[if (gte mso 9)|(IE)]>
+    <xml>
         <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
+            <o:AllowPNG/>
+            <o:PixelsPerInch>96</o:PixelsPerInch>
         </o:OfficeDocumentSettings>
-      </xml>
-      <![endif]-->
-      <!--[if (gte mso 9)|(IE)]>
-  <style type="text/css">
-    body {width: 600px;margin: 0 auto;}
-    table {border-collapse: collapse;}
-    table, td {mso-table-lspace: 0pt;mso-table-rspace: 0pt;}
-    img {-ms-interpolation-mode: bicubic;}
-  </style>
-<![endif]-->
-      <style type="text/css">
-    body, p, div {
-      font-family: arial,helvetica,sans-serif;
-      font-size: 14px;
-    }
-    body {
-      color: #000000;
-    }
-    body a {
-      color: #1188E6;
-      text-decoration: none;
-    }
-    p { margin: 0; padding: 0; }
-    table.wrapper {
-      width:100% !important;
-      table-layout: fixed;
-      -webkit-font-smoothing: antialiased;
-      -webkit-text-size-adjust: 100%;
-      -moz-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-    img.max-width {
-      max-width: 100% !important;
-    }
-    .column.of-2 {
-      width: 50%;
-    }
-    .column.of-3 {
-      width: 33.333%;
-    }
-    .column.of-4 {
-      width: 25%;
-    }
-    @media screen and (max-width:480px) {
-      .preheader .rightColumnContent,
-      .footer .rightColumnContent {
-        text-align: left !important;
-      }
-      .preheader .rightColumnContent div,
-      .preheader .rightColumnContent span,
-      .footer .rightColumnContent div,
-      .footer .rightColumnContent span {
-        text-align: left !important;
-      }
-      .preheader .rightColumnContent,
-      .preheader .leftColumnContent {
-        font-size: 80% !important;
-        padding: 5px 0;
-      }
-      table.wrapper-mobile {
-        width: 100% !important;
-        table-layout: fixed;
-      }
-      img.max-width {
-        height: auto !important;
-        max-width: 100% !important;
-      }
-      a.bulletproof-button {
-        display: block !important;
-        width: auto !important;
-        font-size: 80%;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-      }
-      .columns {
-        width: 100% !important;
-      }
-      .column {
-        display: block !important;
-        width: 100% !important;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-        margin-left: 0 !important;
-        margin-right: 0 !important;
-      }
-    }
-  </style>
-      <!--user entered Head Start--><!--End Head user entered-->
-    </head>
-    <body>
-      <center class="wrapper" data-link-color="#1188E6" data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
-        <div class="webkit">
-          <table cellpadding="0" cellspacing="0" border="0" width="100%" class="wrapper" bgcolor="#FFFFFF">
-            <tbody><tr>
-              <td valign="top" bgcolor="#FFFFFF" width="100%">
-                <table width="100%" role="content-container" class="outer" align="center" cellpadding="0" cellspacing="0" border="0">
-                  <tbody><tr>
-                    <td width="100%">
-                      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-                        <tbody><tr>
-                          <td>
-                            <!--[if mso]>
-    <center>
-    <table><tr><td width="600">
-  <![endif]-->
-                                    <table width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%; max-width:600px;" align="center">
-                                      <tbody><tr>
-                                        <td role="modules-container" style="padding:0px 0px 0px 0px; color:#000000; text-align:left;" bgcolor="#ffffff" width="100%" align="left"><table class="module preheader preheader-hide" role="module" data-type="preheader" border="0" cellpadding="0" cellspacing="0" width="100%" style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;">
-    <tbody><tr>
-      <td role="module-content">
-        <p></p>
-      </td>
-    </tr>
-  </tbody></table><table class="wrapper" role="module" data-type="image" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
-    <tbody>
-      <tr>
-        <td style="font-size:6px; line-height:10px; padding:0px 0px 0px 0px;" valign="top" align="center">
-          <a href="https://www.appsmith.com/"><img class="max-width" border="0" style="display:block; color:#000000; text-decoration:none; font-family:Helvetica, arial, sans-serif; font-size:16px; max-width:25% !important; width:25%; height:auto !important;" width="150" alt="" data-proportionally-constrained="true" data-responsive="true" src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
-        </td>
-      </tr>
-    </tbody>
-  </table><table class="module" role="module" data-type="text" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a" data-mc-module-version="2019-10-22">
-    <tbody>
-      <tr>
-        <td style="padding:0px 0px 10px 0px; line-height:22px; text-align:inherit; background-color:#ffffff;" height="100%" valign="top" bgcolor="#ffffff" role="module-content"><div><div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Hello,</span></div>
-<div style="font-family: inherit; text-align: inherit; margin-left: 0px"><br></div>
-<div style="font-family: inherit; text-align: start"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Forgot the password to your Appsmith account? No worries, we've got you covered.</span></div><div></div></div></td>
-      </tr>
-    </tbody>
-  </table><table border="0" cellpadding="0" cellspacing="0" class="module" data-role="module-button" data-type="button" role="module" style="table-layout:fixed;" width="100%" data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
-      <tbody>
-        <tr>
-          <td align="center" bgcolor="" class="outer-td" style="padding:0px 0px 0px 0px;">
-            <table border="0" cellpadding="0" cellspacing="0" class="wrapper-mobile" style="text-align:center;">
-              <tbody>
-                <tr>
-                <td align="center" bgcolor="#ff6d2d" class="inner-td" style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
-                  <a href="{{resetUrl}}" style="background-color:#ff6d2d; border:1px solid #ff6d2d; border-color:#ff6d2d; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-weight:400; letter-spacing:0px; line-height:6px; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid; font-family:tahoma,geneva,sans-serif; font-size:16px;" target="_blank">Reset Password</a>
-                </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-      </tbody>
-    </table><table class="module" role="module" data-type="text" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208" data-mc-module-version="2019-10-22">
-    <tbody>
-      <tr>
-        <td style="padding:18px 0px 18px 0px; line-height:22px; text-align:inherit;" height="100%" valign="top" bgcolor="" role="module-content"><div><div style="font-family: inherit; text-align: start"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">The link will expire in 48 hours. If you didn't request a password reset, you can safely ignore this email.</span></div>
-<div style="font-family: inherit; text-align: start"><br></div>
-<div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial">Cheers</span></div>
-<div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial">Devs at Appsmith</span></div><div></div></div></td>
-      </tr>
-    </tbody>
-  </table></td>
-                                      </tr>
-                                    </tbody></table>
-                                    <!--[if mso]>
-                                  </td>
-                                </tr>
-                              </table>
-                            </center>
-                            <![endif]-->
-                          </td>
+    </xml>
+    <![endif]-->
+    <!--[if (gte mso 9)|(IE)]>
+    <style type="text/css">
+        body {
+            width: 600px;
+            margin: 0 auto;
+        }
+
+        table {
+            border-collapse: collapse;
+        }
+
+        table, td {
+            mso-table-lspace: 0pt;
+            mso-table-rspace: 0pt;
+        }
+
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+    </style>
+    <![endif]-->
+    <style type="text/css">
+        body, p, div {
+            font-family: arial, helvetica, sans-serif;
+            font-size: 14px;
+        }
+
+        body {
+            color: #000000;
+        }
+
+        body a {
+            color: #1188E6;
+            text-decoration: none;
+        }
+
+        p {
+            margin: 0;
+            padding: 0;
+        }
+
+        table.wrapper {
+            width: 100% !important;
+            table-layout: fixed;
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-size-adjust: 100%;
+            -moz-text-size-adjust: 100%;
+            -ms-text-size-adjust: 100%;
+        }
+
+        img.max-width {
+            max-width: 100% !important;
+        }
+
+        .column.of-2 {
+            width: 50%;
+        }
+
+        .column.of-3 {
+            width: 33.333%;
+        }
+
+        .column.of-4 {
+            width: 25%;
+        }
+
+        @media screen and (max-width: 480px) {
+            .preheader .rightColumnContent,
+            .footer .rightColumnContent {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent div,
+            .preheader .rightColumnContent span,
+            .footer .rightColumnContent div,
+            .footer .rightColumnContent span {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent,
+            .preheader .leftColumnContent {
+                font-size: 80% !important;
+                padding: 5px 0;
+            }
+
+            table.wrapper-mobile {
+                width: 100% !important;
+                table-layout: fixed;
+            }
+
+            img.max-width {
+                height: auto !important;
+                max-width: 100% !important;
+            }
+
+            a.bulletproof-button {
+                display: block !important;
+                width: auto !important;
+                font-size: 80%;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+            }
+
+            .columns {
+                width: 100% !important;
+            }
+
+            .column {
+                display: block !important;
+                width: 100% !important;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+                margin-left: 0 !important;
+                margin-right: 0 !important;
+            }
+        }
+    </style>
+    <!--user entered Head Start--><!--End Head user entered-->
+</head>
+<body>
+<center class="wrapper" data-link-color="#1188E6"
+        data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
+    <div class="webkit">
+        <table cellpadding="0" cellspacing="0" border="0" width="100%" class="wrapper" bgcolor="#FFFFFF">
+            <tbody>
+            <tr>
+                <td valign="top" bgcolor="#FFFFFF" width="100%">
+                    <table width="100%" role="content-container" class="outer" align="center" cellpadding="0"
+                           cellspacing="0" border="0">
+                        <tbody>
+                        <tr>
+                            <td width="100%">
+                                <table width="100%" cellpadding="0" cellspacing="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <!--[if mso]>
+                                            <center>
+                                                <table>
+                                                    <tr>
+                                                        <td width="600">
+                                            <![endif]-->
+                                            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                                                   style="width:100%; max-width:600px;" align="center">
+                                                <tbody>
+                                                <tr>
+                                                    <td role="modules-container"
+                                                        style="padding:0px 0px 0px 0px; color:#000000; text-align:left;"
+                                                        bgcolor="#ffffff" width="100%" align="left">
+                                                        <table class="module preheader preheader-hide" role="module"
+                                                               data-type="preheader" border="0" cellpadding="0"
+                                                               cellspacing="0" width="100%"
+                                                               style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td role="module-content">
+                                                                    <p></p>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="wrapper" role="module" data-type="image"
+                                                               border="0" cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="font-size:6px; line-height:10px; padding:0px 0px 0px 0px;"
+                                                                    valign="top" align="center">
+                                                                    <a href="https://www.appsmith.com/"><img
+                                                                            class="max-width" border="0"
+                                                                            style="display:block; color:#000000; text-decoration:none; font-family:Helvetica, arial, sans-serif; font-size:16px; max-width:25% !important; width:25%; height:auto !important;"
+                                                                            width="150" alt=""
+                                                                            data-proportionally-constrained="true"
+                                                                            data-responsive="true"
+                                                                            src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="module" role="module" data-type="text" border="0"
+                                                               cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a"
+                                                               data-mc-module-version="2019-10-22">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="padding:0px 0px 10px 0px; line-height:22px; text-align:inherit; background-color:#ffffff;"
+                                                                    height="100%" valign="top" bgcolor="#ffffff"
+                                                                    role="module-content">
+                                                                    <div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Hello,</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <br></div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Forgot the password to your Appsmith account? No worries, we've got you covered.</span>
+                                                                        </div>
+                                                                        <div></div>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table border="0" cellpadding="0" cellspacing="0" class="module"
+                                                               data-role="module-button" data-type="button"
+                                                               role="module" style="table-layout:fixed;" width="100%"
+                                                               data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td align="center" bgcolor="" class="outer-td"
+                                                                    style="padding:0px 0px 0px 0px;">
+                                                                    <table border="0" cellpadding="0" cellspacing="0"
+                                                                           class="wrapper-mobile"
+                                                                           style="text-align:center;">
+                                                                        <tbody>
+                                                                        <tr>
+                                                                            <td align="center" bgcolor="#ff6d2d"
+                                                                                class="inner-td"
+                                                                                style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
+                                                                                <a href="{{resetUrl}}"
+                                                                                   style="background-color:#ff6d2d; border:1px solid #ff6d2d; border-color:#ff6d2d; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-weight:400; letter-spacing:0px; line-height:6px; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid; font-family:tahoma,geneva,sans-serif; font-size:16px;"
+                                                                                   target="_blank">Reset Password</a>
+                                                                            </td>
+                                                                        </tr>
+                                                                        </tbody>
+                                                                    </table>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="module" role="module" data-type="text" border="0"
+                                                               cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208"
+                                                               data-mc-module-version="2019-10-22">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="padding:18px 0px 18px 0px; line-height:22px; text-align:inherit;"
+                                                                    height="100%" valign="top" bgcolor=""
+                                                                    role="module-content">
+                                                                    <div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">The link will expire in 48 hours. If you didn't request a password reset, you can safely ignore this email.</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <br></div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial">Cheers</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial">Devs at Appsmith</span>
+                                                                        </div>
+                                                                        <div></div>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <!--[if mso]>
+                                            </td>
+                                            </tr>
+                                            </table>
+                                            </center>
+                                            <![endif]-->
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
                         </tr>
-                      </tbody></table>
-                    </td>
-                  </tr>
-                </tbody></table>
-              </td>
+                        </tbody>
+                    </table>
+                </td>
             </tr>
-          </tbody></table>
-        </div>
-      </center>
-    
-  
-</body></html>
+            </tbody>
+        </table>
+    </div>
+</center>
+
+
+</body>
+</html>

app/server/appsmith-server/src/main/resources/email/inviteUserCreatorTemplate.html

@@ -1,187 +1,299 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html data-editor-version="2" class="sg-campaigns" xmlns="http://www.w3.org/1999/xhtml"><head>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
-      <!--[if !mso]><!-->
-      <meta http-equiv="X-UA-Compatible" content="IE=Edge">
-      <!--<![endif]-->
-      <!--[if (gte mso 9)|(IE)]>
-      <xml>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html data-editor-version="2" class="sg-campaigns" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
+    <!--[if !mso]><!-->
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <!--<![endif]-->
+    <!--[if (gte mso 9)|(IE)]>
+    <xml>
         <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
+            <o:AllowPNG/>
+            <o:PixelsPerInch>96</o:PixelsPerInch>
         </o:OfficeDocumentSettings>
-      </xml>
-      <![endif]-->
-      <!--[if (gte mso 9)|(IE)]>
-  <style type="text/css">
-    body {width: 600px;margin: 0 auto;}
-    table {border-collapse: collapse;}
-    table, td {mso-table-lspace: 0pt;mso-table-rspace: 0pt;}
-    img {-ms-interpolation-mode: bicubic;}
-  </style>
-<![endif]-->
-      <style type="text/css">
-    body, p, div {
-      font-family: arial,helvetica,sans-serif;
-      font-size: 14px;
-    }
-    body {
-      color: #000000;
-    }
-    body a {
-      color: #1188E6;
-      text-decoration: none;
-    }
-    p { margin: 0; padding: 0; }
-    table.wrapper {
-      width:100% !important;
-      table-layout: fixed;
-      -webkit-font-smoothing: antialiased;
-      -webkit-text-size-adjust: 100%;
-      -moz-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-    img.max-width {
-      max-width: 100% !important;
-    }
-    .column.of-2 {
-      width: 50%;
-    }
-    .column.of-3 {
-      width: 33.333%;
-    }
-    .column.of-4 {
-      width: 25%;
-    }
-    @media screen and (max-width:480px) {
-      .preheader .rightColumnContent,
-      .footer .rightColumnContent {
-        text-align: left !important;
-      }
-      .preheader .rightColumnContent div,
-      .preheader .rightColumnContent span,
-      .footer .rightColumnContent div,
-      .footer .rightColumnContent span {
-        text-align: left !important;
-      }
-      .preheader .rightColumnContent,
-      .preheader .leftColumnContent {
-        font-size: 80% !important;
-        padding: 5px 0;
-      }
-      table.wrapper-mobile {
-        width: 100% !important;
-        table-layout: fixed;
-      }
-      img.max-width {
-        height: auto !important;
-        max-width: 100% !important;
-      }
-      a.bulletproof-button {
-        display: block !important;
-        width: auto !important;
-        font-size: 80%;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-      }
-      .columns {
-        width: 100% !important;
-      }
-      .column {
-        display: block !important;
-        width: 100% !important;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-        margin-left: 0 !important;
-        margin-right: 0 !important;
-      }
-    }
-  </style>
-      <!--user entered Head Start--><!--End Head user entered-->
-    </head>
-    <body>
-      <center class="wrapper" data-link-color="#1188E6" data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
-        <div class="webkit">
-          <table cellpadding="0" cellspacing="0" border="0" width="100%" class="wrapper" bgcolor="#FFFFFF">
-            <tbody><tr>
-              <td valign="top" bgcolor="#FFFFFF" width="100%">
-                <table width="100%" role="content-container" class="outer" align="center" cellpadding="0" cellspacing="0" border="0">
-                  <tbody><tr>
-                    <td width="100%">
-                      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-                        <tbody><tr>
-                          <td>
-                            <!--[if mso]>
-    <center>
-    <table><tr><td width="600">
-  <![endif]-->
-                                    <table width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%; max-width:600px;" align="center">
-                                      <tbody><tr>
-                                        <td role="modules-container" style="padding:0px 0px 0px 0px; color:#000000; text-align:left;" bgcolor="#ffffff" width="100%" align="left"><table class="module preheader preheader-hide" role="module" data-type="preheader" border="0" cellpadding="0" cellspacing="0" width="100%" style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;">
-    <tbody><tr>
-      <td role="module-content">
-        <p></p>
-      </td>
-    </tr>
-  </tbody></table><table class="wrapper" role="module" data-type="image" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
-    <tbody>
-      <tr>
-        <td style="font-size:6px; line-height:10px; padding:0px 0px 0px 0px;" valign="top" align="center">
-          <a href="https://www.appsmith.com/"><img class="max-width" border="0" style="display:block; color:#000000; text-decoration:none; font-family:Helvetica, arial, sans-serif; font-size:16px; max-width:25% !important; width:25%; height:auto !important;" width="150" alt="" data-proportionally-constrained="true" data-responsive="true" src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
-        </td>
-      </tr>
-    </tbody>
-  </table><table class="module" role="module" data-type="text" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a" data-mc-module-version="2019-10-22">
-    <tbody>
-      <tr>
-        <td style="padding:0px 0px 18px 0px; line-height:22px; text-align:inherit; background-color:#ffffff;" height="100%" valign="top" bgcolor="#ffffff" role="module-content"><div><div style="font-family: inherit; text-align: center"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959"><strong>You've been invited to collaborate.</strong></span></div>
-<div style="font-family: inherit; text-align: center"><br></div>
-            <div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">{{Inviter_First_Name}} has invited you to collaborate on the organization "<strong>{{inviter_org_name}}</strong>" in Appsmith.</span></div><div></div></div></td>
-      </tr>
-    </tbody>
-  </table><table border="0" cellpadding="0" cellspacing="0" class="module" data-role="module-button" data-type="button" role="module" style="table-layout:fixed;" width="100%" data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
-      <tbody>
-        <tr>
-          <td align="center" bgcolor="" class="outer-td" style="padding:0px 0px 0px 0px;">
-            <table border="0" cellpadding="0" cellspacing="0" class="wrapper-mobile" style="text-align:center;">
-              <tbody>
-                <tr>
-                <td align="center" bgcolor="#ff6d2d" class="inner-td" style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
-                  <a href="{{inviteUrl}}" style="background-color:#ff6d2d; border:1px solid #ff6d2d; border-color:#ff6d2d; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-weight:400; letter-spacing:0px; line-height:6px; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid; font-family:tahoma,geneva,sans-serif; font-size:16px;" target="_blank">Accept invite</a>
-                </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-      </tbody>
-    </table><table class="module" role="module" data-type="text" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208" data-mc-module-version="2019-10-22">
-    <tbody>
-      <tr>
-        <td style="padding:0px 0px 0px 0px; line-height:22px; text-align:inherit;" height="100%" valign="top" bgcolor="" role="module-content"><div><div style="font-family: inherit; text-align: start"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Cheers</span></div>
-<div style="font-family: inherit; text-align: start"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Devs at Appsmith</span></div><div></div></div></td>
-      </tr>
-    </tbody>
-  </table></td>
-                                      </tr>
-                                    </tbody></table>
-                                    <!--[if mso]>
-                                  </td>
-                                </tr>
-                              </table>
-                            </center>
-                            <![endif]-->
-                          </td>
+    </xml>
+    <![endif]-->
+    <!--[if (gte mso 9)|(IE)]>
+    <style type="text/css">
+        body {
+            width: 600px;
+            margin: 0 auto;
+        }
+
+        table {
+            border-collapse: collapse;
+        }
+
+        table, td {
+            mso-table-lspace: 0pt;
+            mso-table-rspace: 0pt;
+        }
+
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+    </style>
+    <![endif]-->
+    <style type="text/css">
+        body, p, div {
+            font-family: arial, helvetica, sans-serif;
+            font-size: 14px;
+        }
+
+        body {
+            color: #000000;
+        }
+
+        body a {
+            color: #1188E6;
+            text-decoration: none;
+        }
+
+        p {
+            margin: 0;
+            padding: 0;
+        }
+
+        table.wrapper {
+            width: 100% !important;
+            table-layout: fixed;
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-size-adjust: 100%;
+            -moz-text-size-adjust: 100%;
+            -ms-text-size-adjust: 100%;
+        }
+
+        img.max-width {
+            max-width: 100% !important;
+        }
+
+        .column.of-2 {
+            width: 50%;
+        }
+
+        .column.of-3 {
+            width: 33.333%;
+        }
+
+        .column.of-4 {
+            width: 25%;
+        }
+
+        @media screen and (max-width: 480px) {
+            .preheader .rightColumnContent,
+            .footer .rightColumnContent {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent div,
+            .preheader .rightColumnContent span,
+            .footer .rightColumnContent div,
+            .footer .rightColumnContent span {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent,
+            .preheader .leftColumnContent {
+                font-size: 80% !important;
+                padding: 5px 0;
+            }
+
+            table.wrapper-mobile {
+                width: 100% !important;
+                table-layout: fixed;
+            }
+
+            img.max-width {
+                height: auto !important;
+                max-width: 100% !important;
+            }
+
+            a.bulletproof-button {
+                display: block !important;
+                width: auto !important;
+                font-size: 80%;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+            }
+
+            .columns {
+                width: 100% !important;
+            }
+
+            .column {
+                display: block !important;
+                width: 100% !important;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+                margin-left: 0 !important;
+                margin-right: 0 !important;
+            }
+        }
+    </style>
+    <!--user entered Head Start--><!--End Head user entered-->
+</head>
+<body>
+<center class="wrapper" data-link-color="#1188E6"
+        data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
+    <div class="webkit">
+        <table cellpadding="0" cellspacing="0" border="0" width="100%" class="wrapper" bgcolor="#FFFFFF">
+            <tbody>
+            <tr>
+                <td valign="top" bgcolor="#FFFFFF" width="100%">
+                    <table width="100%" role="content-container" class="outer" align="center" cellpadding="0"
+                           cellspacing="0" border="0">
+                        <tbody>
+                        <tr>
+                            <td width="100%">
+                                <table width="100%" cellpadding="0" cellspacing="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <!--[if mso]>
+                                            <center>
+                                                <table>
+                                                    <tr>
+                                                        <td width="600">
+                                            <![endif]-->
+                                            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                                                   style="width:100%; max-width:600px;" align="center">
+                                                <tbody>
+                                                <tr>
+                                                    <td role="modules-container"
+                                                        style="padding:0px 0px 0px 0px; color:#000000; text-align:left;"
+                                                        bgcolor="#ffffff" width="100%" align="left">
+                                                        <table class="module preheader preheader-hide" role="module"
+                                                               data-type="preheader" border="0" cellpadding="0"
+                                                               cellspacing="0" width="100%"
+                                                               style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td role="module-content">
+                                                                    <p></p>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="wrapper" role="module" data-type="image"
+                                                               border="0" cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="font-size:6px; line-height:10px; padding:0px 0px 0px 0px;"
+                                                                    valign="top" align="center">
+                                                                    <a href="https://www.appsmith.com/"><img
+                                                                            class="max-width" border="0"
+                                                                            style="display:block; color:#000000; text-decoration:none; font-family:Helvetica, arial, sans-serif; font-size:16px; max-width:25% !important; width:25%; height:auto !important;"
+                                                                            width="150" alt=""
+                                                                            data-proportionally-constrained="true"
+                                                                            data-responsive="true"
+                                                                            src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="module" role="module" data-type="text" border="0"
+                                                               cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a"
+                                                               data-mc-module-version="2019-10-22">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="padding:0px 0px 18px 0px; line-height:22px; text-align:inherit; background-color:#ffffff;"
+                                                                    height="100%" valign="top" bgcolor="#ffffff"
+                                                                    role="module-content">
+                                                                    <div>
+                                                                        <div style="font-family: inherit; text-align: center">
+                                                                            <span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959"><strong>You've been invited to collaborate.</strong></span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: center">
+                                                                            <br></div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">{{Inviter_First_Name}} has invited you to collaborate on the organization "<strong>{{inviter_org_name}}</strong>" in Appsmith.</span>
+                                                                        </div>
+                                                                        <div></div>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table border="0" cellpadding="0" cellspacing="0" class="module"
+                                                               data-role="module-button" data-type="button"
+                                                               role="module" style="table-layout:fixed;" width="100%"
+                                                               data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td align="center" bgcolor="" class="outer-td"
+                                                                    style="padding:0px 0px 0px 0px;">
+                                                                    <table border="0" cellpadding="0" cellspacing="0"
+                                                                           class="wrapper-mobile"
+                                                                           style="text-align:center;">
+                                                                        <tbody>
+                                                                        <tr>
+                                                                            <td align="center" bgcolor="#ff6d2d"
+                                                                                class="inner-td"
+                                                                                style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
+                                                                                <a href="{{inviteUrl}}"
+                                                                                   style="background-color:#ff6d2d; border:1px solid #ff6d2d; border-color:#ff6d2d; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-weight:400; letter-spacing:0px; line-height:6px; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid; font-family:tahoma,geneva,sans-serif; font-size:16px;"
+                                                                                   target="_blank">Accept invite</a>
+                                                                            </td>
+                                                                        </tr>
+                                                                        </tbody>
+                                                                    </table>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="module" role="module" data-type="text" border="0"
+                                                               cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208"
+                                                               data-mc-module-version="2019-10-22">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="padding:0px 0px 0px 0px; line-height:22px; text-align:inherit;"
+                                                                    height="100%" valign="top" bgcolor=""
+                                                                    role="module-content">
+                                                                    <div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Cheers</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Devs at Appsmith</span>
+                                                                        </div>
+                                                                        <div></div>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <!--[if mso]>
+                                            </td>
+                                            </tr>
+                                            </table>
+                                            </center>
+                                            <![endif]-->
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
                         </tr>
-                      </tbody></table>
-                    </td>
-                  </tr>
-                </tbody></table>
-              </td>
+                        </tbody>
+                    </table>
+                </td>
             </tr>
-          </tbody></table>
-        </div>
-      </center>
-    
-  
-</body></html>
+            </tbody>
+        </table>
+    </div>
+</center>
+
+
+</body>
+</html>

app/server/appsmith-server/src/main/resources/email/welcomeUserTemplate.html

@@ -1,203 +1,333 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html data-editor-version="2" class="sg-campaigns" xmlns="http://www.w3.org/1999/xhtml"><head>
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
-      <!--[if !mso]><!-->
-      <meta http-equiv="X-UA-Compatible" content="IE=Edge">
-      <!--<![endif]-->
-      <!--[if (gte mso 9)|(IE)]>
-      <xml>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html data-editor-version="2" class="sg-campaigns" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1">
+    <!--[if !mso]><!-->
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
+    <!--<![endif]-->
+    <!--[if (gte mso 9)|(IE)]>
+    <xml>
         <o:OfficeDocumentSettings>
-          <o:AllowPNG/>
-          <o:PixelsPerInch>96</o:PixelsPerInch>
+            <o:AllowPNG/>
+            <o:PixelsPerInch>96</o:PixelsPerInch>
         </o:OfficeDocumentSettings>
-      </xml>
-      <![endif]-->
-      <!--[if (gte mso 9)|(IE)]>
-  <style type="text/css">
-    body {width: 600px;margin: 0 auto;}
-    table {border-collapse: collapse;}
-    table, td {mso-table-lspace: 0pt;mso-table-rspace: 0pt;}
-    img {-ms-interpolation-mode: bicubic;}
-  </style>
-<![endif]-->
-      <style type="text/css">
-    body, p, div {
-      font-family: arial,helvetica,sans-serif;
-      font-size: 14px;
-    }
-    body {
-      color: #000000;
-    }
-    body a {
-      color: #1188E6;
-      text-decoration: none;
-    }
-    p { margin: 0; padding: 0; }
-    table.wrapper {
-      width:100% !important;
-      table-layout: fixed;
-      -webkit-font-smoothing: antialiased;
-      -webkit-text-size-adjust: 100%;
-      -moz-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-    }
-    img.max-width {
-      max-width: 100% !important;
-    }
-    .column.of-2 {
-      width: 50%;
-    }
-    .column.of-3 {
-      width: 33.333%;
-    }
-    .column.of-4 {
-      width: 25%;
-    }
-    @media screen and (max-width:480px) {
-      .preheader .rightColumnContent,
-      .footer .rightColumnContent {
-        text-align: left !important;
-      }
-      .preheader .rightColumnContent div,
-      .preheader .rightColumnContent span,
-      .footer .rightColumnContent div,
-      .footer .rightColumnContent span {
-        text-align: left !important;
-      }
-      .preheader .rightColumnContent,
-      .preheader .leftColumnContent {
-        font-size: 80% !important;
-        padding: 5px 0;
-      }
-      table.wrapper-mobile {
-        width: 100% !important;
-        table-layout: fixed;
-      }
-      img.max-width {
-        height: auto !important;
-        max-width: 100% !important;
-      }
-      a.bulletproof-button {
-        display: block !important;
-        width: auto !important;
-        font-size: 80%;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-      }
-      .columns {
-        width: 100% !important;
-      }
-      .column {
-        display: block !important;
-        width: 100% !important;
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-        margin-left: 0 !important;
-        margin-right: 0 !important;
-      }
-    }
-  </style>
-      <!--user entered Head Start--><!--End Head user entered-->
-    </head>
-    <body>
-      <center class="wrapper" data-link-color="#1188E6" data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
-        <div class="webkit">
-          <table cellpadding="0" cellspacing="0" border="0" width="100%" class="wrapper" bgcolor="#FFFFFF">
-            <tbody><tr>
-              <td valign="top" bgcolor="#FFFFFF" width="100%">
-                <table width="100%" role="content-container" class="outer" align="center" cellpadding="0" cellspacing="0" border="0">
-                  <tbody><tr>
-                    <td width="100%">
-                      <table width="100%" cellpadding="0" cellspacing="0" border="0">
-                        <tbody><tr>
-                          <td>
-                            <!--[if mso]>
-    <center>
-    <table><tr><td width="600">
-  <![endif]-->
-                                    <table width="100%" cellpadding="0" cellspacing="0" border="0" style="width:100%; max-width:600px;" align="center">
-                                      <tbody><tr>
-                                        <td role="modules-container" style="padding:0px 0px 0px 0px; color:#000000; text-align:left;" bgcolor="#ffffff" width="100%" align="left"><table class="module preheader preheader-hide" role="module" data-type="preheader" border="0" cellpadding="0" cellspacing="0" width="100%" style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;">
-    <tbody><tr>
-      <td role="module-content">
-        <p></p>
-      </td>
-    </tr>
-  </tbody></table><table class="wrapper" role="module" data-type="image" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
-    <tbody>
-      <tr>
-        <td style="font-size:6px; line-height:10px; padding:0px 0px 0px 0px;" valign="top" align="center">
-          <a href="https://www.appsmith.com/"><img class="max-width" border="0" style="display:block; color:#000000; text-decoration:none; font-family:Helvetica, arial, sans-serif; font-size:16px; max-width:25% !important; width:25%; height:auto !important;" width="150" alt="" data-proportionally-constrained="true" data-responsive="true" src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
-        </td>
-      </tr>
-    </tbody>
-  </table><table class="module" role="module" data-type="text" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a" data-mc-module-version="2019-10-22">
-    <tbody>
-      <tr>
-        <td style="padding:0px 0px 18px 0px; line-height:22px; text-align:inherit; background-color:#ffffff;" height="100%" valign="top" bgcolor="#ffffff" role="module-content"><div><div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Hi {{firstName}},</span></div>
-<div style="font-family: inherit; text-align: inherit; margin-left: 0px"><br></div>
-<div style="font-family: inherit; text-align: start"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">I am really excited you signed up for Appsmith and wanted to personally reach out to welcome you.</span></div>
-<div style="font-family: inherit; text-align: inherit; margin-left: 0px"><br></div>
-<div style="font-family: inherit; text-align: inherit"><span style="color: #e8e7e3; font-family: &quot;apple color emoji&quot;, &quot;segoe ui emoji&quot;, &quot;noto color emoji&quot;, &quot;android emoji&quot;, emojisymbols, &quot;emojione mozilla&quot;, &quot;twemoji mozilla&quot;, &quot;segoe ui symbol&quot;; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline; font-size: 14px; background-color: rgb(239, 239, 239)">🚀</span><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Hope you started creating your first app already. In case you didn't and are looking for a little inspiration, you may want to </span><a href="https://docs.appsmith.com/tutorials/"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif">check out a few use cases</span></a><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959"> other developers are building.</span></div>
-<div style="font-family: inherit; text-align: inherit"><br></div>
-<div style="font-family: inherit; text-align: left"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-image: initial; background-position-x: 0px; background-position-y: 0px; background-size: initial; background-repeat-x: initial; background-repeat-y: initial; background-attachment: initial; background-origin: initial; background-clip: initial; background-color: initial; text-decoration-style: initial; text-decoration-color: initial; outline-color: initial; outline-style: initial; outline-width: 0px; color: #e8e7e3; white-space: normal; font-size: 14px">📅</span><span style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">If you would like to explore the product together or collaborate while creating your first app, </span><a href="https://calendly.com/arpit-appsmith/15min"><span style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif">schedule a time here</span></a><span style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif"> </span><span style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">and let's get building.</span></div>
-<div style="font-family: inherit; text-align: left"><br></div>
-<div style="font-family: inherit; text-align: left"><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; outline-color: initial; outline-style: initial; outline-width: 0px; vertical-align: baseline; background-image: initial; background-position-x: 0px; background-position-y: 0px; background-size: initial; background-repeat-x: initial; background-repeat-y: initial; background-attachment: initial; background-origin: initial; background-clip: initial; background-color: initial; color: #e8e7e3; font-family: &quot;apple color emoji&quot;, &quot;segoe ui emoji&quot;, &quot;noto color emoji&quot;, &quot;android emoji&quot;, emojisymbols, &quot;emojione mozilla&quot;, &quot;twemoji mozilla&quot;, &quot;segoe ui symbol&quot;; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-style: initial; text-decoration-color: initial; font-weight: 400; font-size: 14px">🙋</span><span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959"> If you need anything at all, I'm here to help. Reach out anytime you want to chat - all thoughts, questions, and feedback are welcome.</span></div><div></div></div></td>
-      </tr>
-    </tbody>
-  </table><table border="0" cellpadding="0" cellspacing="0" class="module" data-role="module-button" data-type="button" role="module" style="table-layout:fixed;" width="100%" data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
-      <tbody>
-        <tr>
-          <td align="center" bgcolor="" class="outer-td" style="padding:0px 0px 0px 0px;">
-            <table border="0" cellpadding="0" cellspacing="0" class="wrapper-mobile" style="text-align:center;">
-              <tbody>
-                <tr>
-                <td align="center" bgcolor="#ff6d2d" class="inner-td" style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
-                  <a href="{{appsmithLink}}" style="background-color:#ff6d2d; border:1px solid #ff6d2d; border-color:#ff6d2d; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-weight:400; letter-spacing:0px; line-height:6px; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid; font-family:tahoma,geneva,sans-serif; font-size:16px;" target="_blank">Go to Appsmith</a>
-                </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-      </tbody>
-    </table><table class="module" role="module" data-type="text" border="0" cellpadding="0" cellspacing="0" width="100%" style="table-layout: fixed;" data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208" data-mc-module-version="2019-10-22">
-    <tbody>
-      <tr>
-        <td style="padding:0px 0px 0px 0px; line-height:22px; text-align:inherit;" height="100%" valign="top" bgcolor="" role="module-content"><div><div style="font-family: inherit; text-align: start"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Cheers</span></div>
-<div style="font-family: inherit; text-align: start"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Arpit Mohan</span></div>
-<div style="font-family: inherit; text-align: start"><br></div>
+    </xml>
+    <![endif]-->
+    <!--[if (gte mso 9)|(IE)]>
+    <style type="text/css">
+        body {
+            width: 600px;
+            margin: 0 auto;
+        }
 
-<!-- <div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">P.S:</span><span style="font-size: 14px"> </span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline; font-size: 14px">I'll send you a few more emails in the coming days to help you make the most of Appsmith. If you don't want to receive these, hit unsubscribe.</span></div> -->
-            <div></div></div></td>
+        table {
+            border-collapse: collapse;
+        }
 
-      </tr>
-    </tbody>
-  </table>
-  <!-- <div data-role="module-unsubscribe" class="module" role="module" data-type="unsubscribe" style="color:#444444; font-size:10px; line-height:20px; padding:0px 16px 0px 16px; text-align:center;" data-muid="1c219d7b-fb60-4317-8a55-f9d8bbd8592d">
-  <div class="Unsubscribe--addressLine"></div>
-  <p style="font-family:tahoma,geneva,sans-serif; font-size:10px; line-height:20px;"><a class="Unsubscribe--unsubscribeLink" href="{{{unsubscribe}}}" target="_blank" style="">Unsubscribe</a> - <a href="{{{unsubscribe_preferences}}}" target="_blank" class="Unsubscribe--unsubscribePreferences" style="">Unsubscribe Preferences</a></p>
-</div> -->
-</td>
-                                      </tr>
-                                    </tbody></table>
-                                    <!--[if mso]>
-                                  </td>
-                                </tr>
-                              </table>
-                            </center>
-                            <![endif]-->
-                          </td>
+        table, td {
+            mso-table-lspace: 0pt;
+            mso-table-rspace: 0pt;
+        }
+
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+    </style>
+    <![endif]-->
+    <style type="text/css">
+        body, p, div {
+            font-family: arial, helvetica, sans-serif;
+            font-size: 14px;
+        }
+
+        body {
+            color: #000000;
+        }
+
+        body a {
+            color: #1188E6;
+            text-decoration: none;
+        }
+
+        p {
+            margin: 0;
+            padding: 0;
+        }
+
+        table.wrapper {
+            width: 100% !important;
+            table-layout: fixed;
+            -webkit-font-smoothing: antialiased;
+            -webkit-text-size-adjust: 100%;
+            -moz-text-size-adjust: 100%;
+            -ms-text-size-adjust: 100%;
+        }
+
+        img.max-width {
+            max-width: 100% !important;
+        }
+
+        .column.of-2 {
+            width: 50%;
+        }
+
+        .column.of-3 {
+            width: 33.333%;
+        }
+
+        .column.of-4 {
+            width: 25%;
+        }
+
+        @media screen and (max-width: 480px) {
+            .preheader .rightColumnContent,
+            .footer .rightColumnContent {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent div,
+            .preheader .rightColumnContent span,
+            .footer .rightColumnContent div,
+            .footer .rightColumnContent span {
+                text-align: left !important;
+            }
+
+            .preheader .rightColumnContent,
+            .preheader .leftColumnContent {
+                font-size: 80% !important;
+                padding: 5px 0;
+            }
+
+            table.wrapper-mobile {
+                width: 100% !important;
+                table-layout: fixed;
+            }
+
+            img.max-width {
+                height: auto !important;
+                max-width: 100% !important;
+            }
+
+            a.bulletproof-button {
+                display: block !important;
+                width: auto !important;
+                font-size: 80%;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+            }
+
+            .columns {
+                width: 100% !important;
+            }
+
+            .column {
+                display: block !important;
+                width: 100% !important;
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+                margin-left: 0 !important;
+                margin-right: 0 !important;
+            }
+        }
+    </style>
+    <!--user entered Head Start--><!--End Head user entered-->
+</head>
+<body>
+<center class="wrapper" data-link-color="#1188E6"
+        data-body-style="font-size:14px; font-family:arial,helvetica,sans-serif; color:#000000; background-color:#FFFFFF;">
+    <div class="webkit">
+        <table cellpadding="0" cellspacing="0" border="0" width="100%" class="wrapper" bgcolor="#FFFFFF">
+            <tbody>
+            <tr>
+                <td valign="top" bgcolor="#FFFFFF" width="100%">
+                    <table width="100%" role="content-container" class="outer" align="center" cellpadding="0"
+                           cellspacing="0" border="0">
+                        <tbody>
+                        <tr>
+                            <td width="100%">
+                                <table width="100%" cellpadding="0" cellspacing="0" border="0">
+                                    <tbody>
+                                    <tr>
+                                        <td>
+                                            <!--[if mso]>
+                                            <center>
+                                                <table>
+                                                    <tr>
+                                                        <td width="600">
+                                            <![endif]-->
+                                            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                                                   style="width:100%; max-width:600px;" align="center">
+                                                <tbody>
+                                                <tr>
+                                                    <td role="modules-container"
+                                                        style="padding:0px 0px 0px 0px; color:#000000; text-align:left;"
+                                                        bgcolor="#ffffff" width="100%" align="left">
+                                                        <table class="module preheader preheader-hide" role="module"
+                                                               data-type="preheader" border="0" cellpadding="0"
+                                                               cellspacing="0" width="100%"
+                                                               style="display: none !important; mso-hide: all; visibility: hidden; opacity: 0; color: transparent; height: 0; width: 0;">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td role="module-content">
+                                                                    <p></p>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="wrapper" role="module" data-type="image"
+                                                               border="0" cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="40dbb7f1-8428-4188-86b0-1b0245659a17">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="font-size:6px; line-height:10px; padding:0px 0px 0px 0px;"
+                                                                    valign="top" align="center">
+                                                                    <a href="https://www.appsmith.com/"><img
+                                                                            class="max-width" border="0"
+                                                                            style="display:block; color:#000000; text-decoration:none; font-family:Helvetica, arial, sans-serif; font-size:16px; max-width:25% !important; width:25%; height:auto !important;"
+                                                                            width="150" alt=""
+                                                                            data-proportionally-constrained="true"
+                                                                            data-responsive="true"
+                                                                            src="http://cdn.mcauto-images-production.sendgrid.net/4bbae2fffe647858/b21738f2-3a49-4774-aae9-c8e80ad9c26e/924x284.png"></a>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="module" role="module" data-type="text" border="0"
+                                                               cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="71d7e9fb-0f3b-43f4-97e1-994b33bfc82a"
+                                                               data-mc-module-version="2019-10-22">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="padding:0px 0px 18px 0px; line-height:22px; text-align:inherit; background-color:#ffffff;"
+                                                                    height="100%" valign="top" bgcolor="#ffffff"
+                                                                    role="module-content">
+                                                                    <div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Hi {{firstName}},</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <br></div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">I am really excited you signed up for Appsmith and wanted to personally reach out to welcome you.</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: inherit; margin-left: 0px">
+                                                                            <br></div>
+                                                                        <div style="font-family: inherit; text-align: inherit">
+                                                                            <span style="color: #e8e7e3; font-family: &quot;apple color emoji&quot;, &quot;segoe ui emoji&quot;, &quot;noto color emoji&quot;, &quot;android emoji&quot;, emojisymbols, &quot;emojione mozilla&quot;, &quot;twemoji mozilla&quot;, &quot;segoe ui symbol&quot;; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline; font-size: 14px; background-color: rgb(239, 239, 239)">🚀</span><span
+                                                                                style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">Hope you started creating your first app already. In case you didn't and are looking for a little inspiration, you may want to </span><a
+                                                                                href="https://docs.appsmith.com/tutorials/"><span
+                                                                                style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif">check out a few use cases</span></a><span
+                                                                                style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959"> other developers are building.</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: inherit">
+                                                                            <br></div>
+                                                                        <div style="font-family: inherit; text-align: left">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-image: initial; background-position-x: 0px; background-position-y: 0px; background-size: initial; background-repeat-x: initial; background-repeat-y: initial; background-attachment: initial; background-origin: initial; background-clip: initial; background-color: initial; text-decoration-style: initial; text-decoration-color: initial; outline-color: initial; outline-style: initial; outline-width: 0px; color: #e8e7e3; white-space: normal; font-size: 14px">📅</span><span
+                                                                                style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">If you would like to explore the product together or collaborate while creating your first app, </span><a
+                                                                                href="https://calendly.com/arpit-appsmith/15min"><span
+                                                                                style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif">schedule a time here</span></a><span
+                                                                                style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif"> </span><span
+                                                                                style="font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959">and let's get building.</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: left">
+                                                                            <br></div>
+                                                                        <div style="font-family: inherit; text-align: left">
+                                                                            <span style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; outline-color: initial; outline-style: initial; outline-width: 0px; vertical-align: baseline; background-image: initial; background-position-x: 0px; background-position-y: 0px; background-size: initial; background-repeat-x: initial; background-repeat-y: initial; background-attachment: initial; background-origin: initial; background-clip: initial; background-color: initial; color: #e8e7e3; font-family: &quot;apple color emoji&quot;, &quot;segoe ui emoji&quot;, &quot;noto color emoji&quot;, &quot;android emoji&quot;, emojisymbols, &quot;emojione mozilla&quot;, &quot;twemoji mozilla&quot;, &quot;segoe ui symbol&quot;; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-style: initial; text-decoration-color: initial; font-weight: 400; font-size: 14px">🙋</span><span
+                                                                                style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; color: #5c5959"> If you need anything at all, I'm here to help. Reach out anytime you want to chat - all thoughts, questions, and feedback are welcome.</span>
+                                                                        </div>
+                                                                        <div></div>
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table border="0" cellpadding="0" cellspacing="0" class="module"
+                                                               data-role="module-button" data-type="button"
+                                                               role="module" style="table-layout:fixed;" width="100%"
+                                                               data-muid="f00155e0-813d-4e9b-b61d-384e6f99e5b7">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td align="center" bgcolor="" class="outer-td"
+                                                                    style="padding:0px 0px 0px 0px;">
+                                                                    <table border="0" cellpadding="0" cellspacing="0"
+                                                                           class="wrapper-mobile"
+                                                                           style="text-align:center;">
+                                                                        <tbody>
+                                                                        <tr>
+                                                                            <td align="center" bgcolor="#ff6d2d"
+                                                                                class="inner-td"
+                                                                                style="border-radius:6px; font-size:16px; text-align:center; background-color:inherit;">
+                                                                                <a href="{{appsmithLink}}"
+                                                                                   style="background-color:#ff6d2d; border:1px solid #ff6d2d; border-color:#ff6d2d; border-radius:6px; border-width:1px; color:#ffffff; display:inline-block; font-weight:400; letter-spacing:0px; line-height:6px; padding:12px 18px 12px 18px; text-align:center; text-decoration:none; border-style:solid; font-family:tahoma,geneva,sans-serif; font-size:16px;"
+                                                                                   target="_blank">Go to Appsmith</a>
+                                                                            </td>
+                                                                        </tr>
+                                                                        </tbody>
+                                                                    </table>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <table class="module" role="module" data-type="text" border="0"
+                                                               cellpadding="0" cellspacing="0" width="100%"
+                                                               style="table-layout: fixed;"
+                                                               data-muid="cab2544f-5a6c-49a0-b246-efe5ac8c5208"
+                                                               data-mc-module-version="2019-10-22">
+                                                            <tbody>
+                                                            <tr>
+                                                                <td style="padding:0px 0px 0px 0px; line-height:22px; text-align:inherit;"
+                                                                    height="100%" valign="top" bgcolor=""
+                                                                    role="module-content">
+                                                                    <div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Cheers</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">Arpit Mohan</span>
+                                                                        </div>
+                                                                        <div style="font-family: inherit; text-align: start">
+                                                                            <br></div>
+
+                                                                        <!-- <div style="font-family: inherit; text-align: inherit; margin-left: 0px"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: inherit; font-stretch: normal; line-height: normal; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; font-size: 14px">P.S:</span><span style="font-size: 14px"> </span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: &quot;lucida sans unicode&quot;, &quot;lucida grande&quot;, sans-serif; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #5c5959; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline; font-size: 14px">I'll send you a few more emails in the coming days to help you make the most of Appsmith. If you don't want to receive these, hit unsubscribe.</span></div> -->
+                                                                        <div></div>
+                                                                    </div>
+                                                                </td>
+
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                        <!-- <div data-role="module-unsubscribe" class="module" role="module" data-type="unsubscribe" style="color:#444444; font-size:10px; line-height:20px; padding:0px 16px 0px 16px; text-align:center;" data-muid="1c219d7b-fb60-4317-8a55-f9d8bbd8592d">
+                                                        <div class="Unsubscribe--addressLine"></div>
+                                                        <p style="font-family:tahoma,geneva,sans-serif; font-size:10px; line-height:20px;"><a class="Unsubscribe--unsubscribeLink" href="{{{unsubscribe}}}" target="_blank" style="">Unsubscribe</a> - <a href="{{{unsubscribe_preferences}}}" target="_blank" class="Unsubscribe--unsubscribePreferences" style="">Unsubscribe Preferences</a></p>
+                                                      </div> -->
+                                                    </td>
+                                                </tr>
+                                                </tbody>
+                                            </table>
+                                            <!--[if mso]>
+                                            </td>
+                                            </tr>
+                                            </table>
+                                            </center>
+                                            <![endif]-->
+                                        </td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                            </td>
                         </tr>
-                      </tbody></table>
-                    </td>
-                  </tr>
-                </tbody></table>
-              </td>
+                        </tbody>
+                    </table>
+                </td>
             </tr>
-          </tbody></table>
-        </div>
-      </center>
-    
-  
-</body></html>
+            </tbody>
+        </table>
+    </div>
+</center>
+
+
+</body>
+</html>

app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/BeanCopyUtilsTest.java

@@ -1,6 +1,9 @@
 package com.appsmith.server.helpers;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 

app/server/appsmith-server/src/test/java/com/appsmith/server/helpers/MustacheHelperTest.java

@@ -20,8 +20,8 @@ import static com.appsmith.server.helpers.MustacheHelper.tokenize;
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SuppressWarnings(
-      // Disabling this so we may use `Arrays.asList` with single argument, which is easier to refactor, just for tests.
-      "ArraysAsListWithZeroOrOneArgument"
+        // Disabling this so we may use `Arrays.asList` with single argument, which is easier to refactor, just for tests.
+        "ArraysAsListWithZeroOrOneArgument"
 )
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -314,7 +314,7 @@ public class MustacheHelperTest {
                 Set.of("2 + 4 ? trueVal : falseVal")
         );
     }
-    
+
     @Test
     public void jsonInMustache() {
         check(

app/server/appsmith-server/src/test/java/com/appsmith/server/services/ApplicationServiceTest.java

@@ -10,10 +10,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.test.context.support.WithAnonymousUser;
 import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -21,12 +19,10 @@ import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
 import static com.appsmith.server.acl.AclPermission.MANAGE_APPLICATIONS;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.READ_APPLICATIONS;
 import static org.assertj.core.api.Assertions.assertThat;
 

app/server/appsmith-server/src/test/java/com/appsmith/server/services/CurlImporterServiceTest.java

@@ -19,8 +19,6 @@ import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;

app/server/appsmith-server/src/test/java/com/appsmith/server/services/LayoutServiceTest.java

@@ -20,8 +20,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(SpringRunner.class)

app/server/appsmith-server/src/test/java/com/appsmith/server/services/OrganizationServiceTest.java

@@ -165,12 +165,12 @@ public class OrganizationServiceTest {
         organization.setWebsite("https://example.com");
 
         Mono<String> uniqueSlug = organizationService.getNextUniqueSlug("slug-org")
-            .map(slug -> {
-                organization.setSlug(slug);
-                return organization;
-            })
-            .flatMap(organizationService::create)
-            .then(organizationService.getNextUniqueSlug("slug-org"));
+                .map(slug -> {
+                    organization.setSlug(slug);
+                    return organization;
+                })
+                .flatMap(organizationService::create)
+                .then(organizationService.getNextUniqueSlug("slug-org"));
 
         StepVerifier.create(uniqueSlug)
                 .assertNext(slug -> {

app/server/appsmith-server/src/test/java/com/appsmith/server/services/PageServiceTest.java

@@ -22,7 +22,6 @@ import reactor.test.StepVerifier;
 import java.util.Set;
 
 import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
-import static com.appsmith.server.acl.AclPermission.ORGANIZATION_MANAGE_APPLICATIONS;
 import static com.appsmith.server.acl.AclPermission.READ_PAGES;
 import static org.assertj.core.api.Assertions.assertThat;
 

app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java

@@ -1,7 +1,7 @@
 package com.appsmith.server.services;
 
-import com.appsmith.server.configurations.WithMockAppsmithUser;
 import com.appsmith.server.acl.AppsmithRole;
+import com.appsmith.server.configurations.WithMockAppsmithUser;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.InviteUser;