remove addIcon prop (#5312)

packages/insomnia/src/ui/components/base/dropdown/dropdown-item.tsx

@@ -2,7 +2,6 @@ import classnames from 'classnames';
 import React, { ButtonHTMLAttributes, createElement, ReactNode } from 'react';
 
 interface Props {
-  addIcon?: boolean; // NOTE: used by prompt-button.tsx
   title?: string;
   buttonClass?: React.ElementType;
   stayOpenAfterClick?: boolean;

packages/insomnia/src/ui/components/base/prompt-button.tsx

@@ -12,7 +12,6 @@ type PromptStateEnum = 'default' | 'ask' | 'done';
 
 interface Props<T> {
   className?: string;
-  addIcon?: boolean;
   disabled?: boolean;
   confirmMessage?: string;
   doneMessage?: string;
@@ -23,7 +22,6 @@ interface Props<T> {
 
 export const PromptButton = <T, >({
   onClick,
-  addIcon,
   disabled,
   confirmMessage = 'Click to confirm',
   doneMessage = 'Done',
@@ -91,7 +89,6 @@ export const PromptButton = <T, >({
         promptState={state}
         confirmMessage={confirmMessage}
         doneMessage={doneMessage}
-        addIcon={Boolean(addIcon)}
       >
         {children}
       </PromptMessage>
@@ -101,16 +98,15 @@ export const PromptButton = <T, >({
 
 interface PromptMessageProps {
   promptState: PromptStateEnum;
-  addIcon: boolean;
   confirmMessage?: string;
   doneMessage?: string;
   children: ReactNode;
 }
-const PromptMessage: FunctionComponent<PromptMessageProps> = ({ promptState, addIcon, confirmMessage, doneMessage, children }) => {
+const PromptMessage: FunctionComponent<PromptMessageProps> = ({ promptState, confirmMessage, doneMessage, children }) => {
   if (promptState === 'ask') {
     return (
       <span className='warning' title='Click again to confirm'>
-        {addIcon && <i className='fa fa-exclamation-circle' />}
+        <i className='fa fa-exclamation-circle' />
         {confirmMessage && (
           <span className='space-left'>{confirmMessage}</span>
         )}

packages/insomnia/src/ui/components/cookie-list.tsx

@@ -56,7 +56,6 @@ const CookieRow: FC<{
       </button>{' '}
       <PromptButton
         className="btn btn--super-compact btn--outlined"
-        addIcon
         confirmMessage=""
         onClick={handleDeleteCookie}
         title="Delete cookie"

packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx

@@ -161,7 +161,6 @@ export const RequestActionsDropdown = forwardRef<DropdownHandle, Props>(({
 
       <DropdownItem
         onClick={handleRename}
-        addIcon
       >
         <i className="fa fa-edit" /> Rename
       </DropdownItem>
@@ -169,7 +168,6 @@ export const RequestActionsDropdown = forwardRef<DropdownHandle, Props>(({
       <DropdownItem
         buttonClass={PromptButton}
         onClick={deleteRequest}
-        addIcon
       >
         <i className="fa fa-trash-o" /> Delete
         <DropdownHint keyBindings={hotKeyRegistry.request_showDelete} />

packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx

@@ -178,7 +178,7 @@ export const RequestGroupActionsDropdown = forwardRef<RequestGroupActionsDropdow
         <i className="fa fa-edit" /> Rename
       </DropdownItem>
 
-      <DropdownItem buttonClass={PromptButton} addIcon onClick={handleDeleteFolder}>
+      <DropdownItem buttonClass={PromptButton} onClick={handleDeleteFolder}>
         <i className="fa fa-trash-o" /> Delete
       </DropdownItem>
 

packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx

@@ -186,11 +186,11 @@ export const ResponseHistoryDropdown = <GenericResponse extends Response | WebSo
       <DropdownDivider>
         <strong>{environmentName}</strong> Responses
       </DropdownDivider>
-      <DropdownItem buttonClass={PromptButton} addIcon onClick={handleDeleteResponse}>
+      <DropdownItem buttonClass={PromptButton} onClick={handleDeleteResponse}>
         <i className="fa fa-trash-o" />
         Delete Current Response
       </DropdownItem>
-      <DropdownItem buttonClass={PromptButton} addIcon onClick={handleDeleteResponses}>
+      <DropdownItem buttonClass={PromptButton} onClick={handleDeleteResponses}>
         <i className="fa fa-trash-o" />
         Clear History
       </DropdownItem>

packages/insomnia/src/ui/components/dropdowns/websocket-request-actions-dropdown.tsx

@@ -74,7 +74,6 @@ export const WebSocketRequestActionsDropdown = forwardRef<DropdownHandle, Props>
 
       <DropdownItem
         onClick={handleRename}
-        addIcon
       >
         <i className="fa fa-edit" /> Rename
       </DropdownItem>
@@ -82,7 +81,6 @@ export const WebSocketRequestActionsDropdown = forwardRef<DropdownHandle, Props>
       <DropdownItem
         buttonClass={PromptButton}
         onClick={deleteRequest}
-        addIcon
       >
         <i className="fa fa-trash-o" /> Delete
         <DropdownHint keyBindings={hotKeyRegistry.request_showDelete} />

packages/insomnia/src/ui/components/key-value-editor/row.tsx

@@ -504,7 +504,6 @@ class KeyValueEditorRowInternal extends PureComponent<Props, State> {
                 key={Math.random()}
                 tabIndex={-1}
                 confirmMessage=""
-                addIcon
                 onClick={this._handleDelete}
                 title="Delete item"
               >

packages/insomnia/src/ui/components/modals/project-settings-modal.tsx

@@ -69,7 +69,6 @@ export const ProjectSettingsModal = forwardRef<ProjectSettingsModalHandle, Modal
               dispatch(removeProject(project));
               modalRef.current?.hide();
             }}
-            addIcon
             className="width-auto btn btn--clicky inline-block"
           >
             <i className="fa fa-trash-o" /> Delete

packages/insomnia/src/ui/components/modals/prompt-modal.tsx

@@ -140,7 +140,6 @@ export const PromptModal = forwardRef<PromptModalHandle, ModalProps>((_, ref) =>
           {hint}
         </button>
         <PromptButton
-          addIcon
           confirmMessage=""
           className="tall space-left icon"
           onClick={() => {

packages/insomnia/src/ui/components/modals/workspace-settings-modal.tsx

@@ -193,7 +193,6 @@ export const WorkspaceSettingsModal = forwardRef<WorkspaceSettingsModalHandle, M
           <PromptButton
             className="btn btn--super-compact width-auto"
             confirmMessage=""
-            addIcon
             onClick={() => models.clientCertificate.remove(certificate)}
           >
             <i className="fa fa-trash-o" />
@@ -277,7 +276,6 @@ export const WorkspaceSettingsModal = forwardRef<WorkspaceSettingsModalHandle, M
               <div className="form-control form-control--padded">
                 <PromptButton
                   onClick={_handleRemoveWorkspace}
-                  addIcon
                   className="width-auto btn btn--clicky inline-block"
                 >
                   <i className="fa fa-trash-o" /> Delete
@@ -292,7 +290,6 @@ export const WorkspaceSettingsModal = forwardRef<WorkspaceSettingsModalHandle, M
                 </button>
                 <PromptButton
                   onClick={_handleClearAllResponses}
-                  addIcon
                   className="width-auto btn btn--clicky inline-block space-left"
                 >
                   <i className="fa fa-trash-o" /> Clear All Responses

packages/insomnia/src/ui/components/request-url-bar.tsx

@@ -429,7 +429,6 @@ export const RequestUrlBar = forwardRef<RequestUrlBarHandle, Props>(({
               {downloadPath ? (
                 <DropdownItem
                   stayOpenAfterClick
-                  addIcon
                   buttonClass={PromptButton}
                   onClick={handleClearDownloadLocation}
                 >