From 9561fe0dd8d15ccf23fdf486d1d5e13a609e96cf Mon Sep 17 00:00:00 2001
From: haojin111 <haojin828@outlook.com>
Date: Thu, 19 May 2022 23:02:35 +0800
Subject: [PATCH] updated comments of commit

---
 app/client/src/ce/constants/messages.test.ts        | 13 +++----------
 app/client/src/ce/constants/messages.ts             |  8 +++-----
 .../pages/Applications/ImportApplicationModal.tsx   |  5 ++---
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/client/src/ce/constants/messages.test.ts b/app/client/src/ce/constants/messages.test.ts
index 90c65b848e..2e5a195810 100644
--- a/app/client/src/ce/constants/messages.test.ts
+++ b/app/client/src/ce/constants/messages.test.ts
@@ -77,7 +77,6 @@ import {
   IMPORT_APP_FROM_FILE_MESSAGE,
   IMPORT_APP_FROM_GIT_MESSAGE,
   IMPORT_FROM_GIT_REPOSITORY,
-  IMPORT_FROM_GIT_REPOSITORY_MESSAGE,
 } from "./messages";
 
 describe("messages", () => {
@@ -395,10 +394,10 @@ describe("git-sync messages", () => {
 
 describe("import application messages", () => {
   const expectedMessages = [
-    { key: "UPLOADING_JSON", value: "Uploading JSON" },
+    { key: "UPLOADING_JSON", value: "Uploading JSON file" },
     {
       key: "UPLOADING_APPLICATION",
-      value: "Uploading Application",
+      value: "Uploading application",
     },
     {
       key: "IMPORT_APP_FROM_FILE_MESSAGE",
@@ -410,12 +409,7 @@ describe("import application messages", () => {
     },
     {
       key: "IMPORT_FROM_GIT_REPOSITORY",
-      value: "Import from Git Repository",
-    },
-    {
-      key: "IMPORT_FROM_GIT_REPOSITORY_MESSAGE",
-      value:
-        "While importing Appsmith will does not import the datasource credentials to prevent a breach. After a successfull import you can add the credentials manually so the application behaves normally!",
+      value: "Import from git repository",
     },
   ];
   const functions = [
@@ -424,7 +418,6 @@ describe("import application messages", () => {
     IMPORT_APP_FROM_FILE_MESSAGE,
     IMPORT_APP_FROM_GIT_MESSAGE,
     IMPORT_FROM_GIT_REPOSITORY,
-    IMPORT_FROM_GIT_REPOSITORY_MESSAGE,
   ];
   functions.forEach((fn: () => string) => {
     it(`${fn.name} returns expected value`, () => {
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts
index 48dc0306f2..402f83c56f 100644
--- a/app/client/src/ce/constants/messages.ts
+++ b/app/client/src/ce/constants/messages.ts
@@ -478,16 +478,14 @@ export const IMPORT_APPLICATION_MODAL_TITLE = () => "Import application";
 export const IMPORT_APPLICATION_MODAL_LABEL = () =>
   "Where would you like to import your application from?";
 export const IMPORT_APP_FROM_FILE_TITLE = () => "Import from file";
-export const UPLOADING_JSON = () => "Uploading JSON";
-export const UPLOADING_APPLICATION = () => "Uploading Application";
+export const UPLOADING_JSON = () => "Uploading JSON file";
+export const UPLOADING_APPLICATION = () => "Uploading application";
 export const IMPORT_APP_FROM_GIT_TITLE = () => "Import from a Git repo (Beta)";
 export const IMPORT_APP_FROM_FILE_MESSAGE = () =>
   "Drag and drop your file or upload from your computer";
 export const IMPORT_APP_FROM_GIT_MESSAGE = () =>
   "Import an application from its git repository using its SSH URL";
-export const IMPORT_FROM_GIT_REPOSITORY = () => "Import from Git Repository";
-export const IMPORT_FROM_GIT_REPOSITORY_MESSAGE = () =>
-  "While importing Appsmith will does not import the datasource credentials to prevent a breach. After a successfull import you can add the credentials manually so the application behaves normally!";
+export const IMPORT_FROM_GIT_REPOSITORY = () => "Import from git repository";
 export const RECONNECT_MISSING_DATASOURCE_CREDENTIALS = () =>
   "Reconnect missing datasource credentials";
 export const RECONNECT_MISSING_DATASOURCE_CREDENTIALS_DESCRIPTION = () =>
diff --git a/app/client/src/pages/Applications/ImportApplicationModal.tsx b/app/client/src/pages/Applications/ImportApplicationModal.tsx
index c3fe4029ea..d9d5a72e3a 100644
--- a/app/client/src/pages/Applications/ImportApplicationModal.tsx
+++ b/app/client/src/pages/Applications/ImportApplicationModal.tsx
@@ -184,10 +184,10 @@ const StatusbarWrapper = styled.div`
     border-radius: 50%;
     width: 32px;
     height: 32px;
-    background: ${Colors.GREY_4};
     display: flex;
     justify-content: center;
     margin-bottom: 8px;
+    background: var(--appsmith-color-black-200);
     svg {
       width: 20px;
       height: 20px;
@@ -271,7 +271,6 @@ function ImportApplicationModal(props: ImportApplicationModalProps) {
             applicationFile: file,
           }),
         );
-        // onClose && onClose();
       } else {
         setAppFileToBeUploaded(null);
       }
@@ -341,7 +340,7 @@ function ImportApplicationModal(props: ImportApplicationModalProps) {
           <StatusbarWrapper className="t--importing-app-statusbar">
             <Icon fillColor={Colors.GREY_800} name="file-line" />
             <Text className="importing-app-name" type={TextType.P2}>
-              {appFileToBeUploaded?.file.name || "filename.JSON"}
+              {appFileToBeUploaded?.file?.name || "filename.json"}
             </Text>
             <Statusbar
               completed={!importingApplication}