Fix issues caused to UI after resolving merge conflicts

app/client/.editorconfig

@@ -9,8 +9,4 @@ indent_size = 2
 trim_trailing_whitespace = true
 
 [*.md]
-<<<<<<< HEAD
 trim_trailing_whitespace = false
-=======
-trim_trailing_whitespace = false
->>>>>>> dc48b1294cb310d72a1725857b915381f9da8335

app/client/.nvmrc

@@ -1,5 +1 @@
-<<<<<<< HEAD
 lts/dubnium
-=======
-lts/dubnium
->>>>>>> dc48b1294cb310d72a1725857b915381f9da8335

app/client/.prettierignore

@@ -2,9 +2,5 @@ build/
 node_modules/
 package-lock.json
 yarn.lock
-<<<<<<< HEAD
 package.json
 
-=======
-package.json
->>>>>>> dc48b1294cb310d72a1725857b915381f9da8335

app/client/.prettierrc

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
 	"printWidth": 80,
 	"tabWidth": 2,
 	"useTabs": false,
@@ -8,13 +7,3 @@
 	"trailingComma": "all",
 	"parser": "typescript"
 }
-=======
-  "printWidth": 80,
-  "tabWidth": 2,
-  "useTabs": false,
-  "semi": true,
-  "singleQuote": false,
-  "trailingComma": "all",
-  "parser": "typescript"
-}
->>>>>>> dc48b1294cb310d72a1725857b915381f9da8335

app/client/src/editorComponents/ContainerComponent.tsx

@@ -6,7 +6,7 @@ import { WidgetTypes } from "../constants/WidgetConstants"
 import { DraggableWidget } from "../widgets/BaseWidget"
 import React from "react";
 
-export const Container = styled("div")<IContainerProps>`
+export const Container = styled("div")<ContainerProps>`
   display: flex;
   flex-direction: ${props => {
     return props.orientation === "HORIZONTAL" ? "row" : "column"

app/client/src/reducers/uiReducers/editorHeaderReducer.tsx

@@ -1,4 +1,4 @@
-import { createReducer } from "../../utils/PicassoUtils"
+import { createReducer } from "../../utils/AppsmithUtils"
 
 const initialState: EditorHeaderReduxState = {}
 

app/client/src/reducers/uiReducers/editorReducer.tsx

@@ -1,4 +1,4 @@
-import { createReducer } from "../../utils/PicassoUtils"
+import { createReducer } from "../../utils/AppsmithUtils"
 import {
   ActionTypes,
   ReduxAction,

app/client/src/reducers/uiReducers/widgetCardsPaneReducer.tsx

@@ -1,4 +1,4 @@
-import { createReducer } from "../../utils/PicassoUtils"
+import { createReducer } from "../../utils/AppsmithUtils"
 import {
   ActionTypes,
   ReduxAction,

app/client/src/reducers/uiReducers/widgetPaneReducer.tsx

@@ -1,25 +0,0 @@
-import { createReducer } from "../../utils/AppsmithUtils"
-import {
-  ActionTypes,
-  ReduxAction,
-  LoadWidgetPanePayload
-} from "../../constants/ActionConstants"
-import { IWidgetProps } from "../../widgets/BaseWidget";
-import WidgetPaneResponse from "../../mockResponses/WidgetPaneResponse"
-
-const initialState: WidgetPaneReduxState = WidgetPaneResponse
-
-const widgetPaneReducer = createReducer(initialState, {
-  // [ActionTypes.LOAD_CANVAS]: (
-  //   state: WidgetPaneReduxState,
-  //   action: ReduxAction<LoadWidgetPanePayload>
-  // ) => {
-  //   return { widgets: action.payload.widgets }
-  // }
-})
-
-export interface WidgetPaneReduxState {
-  widgets: (IWidgetProps | any)[]
-}
-
-export default widgetPaneReducer