9 files changed, 58 insertions, 56 deletions

diff --git a/src/components/auth/Invite.tsx b/src/components/auth/Invite.tsx
index 4ab5157a8..cebef9365 100644
--- a/src/components/auth/Invite.tsx
+++ b/src/components/auth/Invite.tsx
@@ -192,7 +192,7 @@ class Invite extends Component<IProps, IState> {
     return (
       <div
         className={
-          !embed ? 'auth__container auth__container--signup' : 'settings__main'
+          embed ? 'settings__main' : 'auth__container auth__container--signup'
         }
       >
         {embed && (
@@ -200,10 +200,10 @@ class Invite extends Component<IProps, IState> {
             <H1>{intl.formatMessage(messages.settingsHeadline)}</H1>
           </div>
         )}
-        {!embed ? (
-          <div>{renderForm}</div>
-        ) : (
+        {embed ? (
           <div className="settings__body invite__form">{renderForm}</div>
+        ) : (
+          <div>{renderForm}</div>
         )}
       </div>
     );
diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx
index e41184431..0754bccc5 100644
--- a/src/components/services/content/ServiceView.tsx
+++ b/src/components/services/content/ServiceView.tsx
@@ -135,29 +135,9 @@ class ServiceView extends Component<IProps, IState> {
             )}
           </>
         )}
-        {!service.isEnabled ? (
+        {service.isEnabled ? (
           <>
-            {service.isActive && (
-              <ServiceDisabled
-                name={service.name !== '' ? service.name : service.recipe.name}
-                // webview={service.webview} //  TODO - [TECH DEBT][PROPS NOT EXIST IN COMPONENT] check it
-                enable={enable}
-              />
-            )}
-          </>
-        ) : (
-          <>
-            {!service.isHibernating ? (
-              <>
-                {showNavBar && <WebControlsScreen service={service} />}
-                <ServiceWebview
-                  service={service}
-                  setWebviewReference={setWebviewRef}
-                  detachService={detachService}
-                  isSpellcheckerEnabled={isSpellcheckerEnabled}
-                />
-              </>
-            ) : (
+            {service.isHibernating ? (
               <div
                 style={{
                   display: 'flex',
@@ -180,6 +160,26 @@ class ServiceView extends Component<IProps, IState> {
                 <br />
                 Try switching services or reloading Ferdium.
               </div>
+            ) : (
+              <>
+                {showNavBar && <WebControlsScreen service={service} />}
+                <ServiceWebview
+                  service={service}
+                  setWebviewReference={setWebviewRef}
+                  detachService={detachService}
+                  isSpellcheckerEnabled={isSpellcheckerEnabled}
+                />
+              </>
+            )}
+          </>
+        ) : (
+          <>
+            {service.isActive && (
+              <ServiceDisabled
+                name={service.name === '' ? service.recipe.name : service.name}
+                // webview={service.webview} //  TODO - [TECH DEBT][PROPS NOT EXIST IN COMPONENT] check it
+                enable={enable}
+              />
             )}
           </>
         )}
diff --git a/src/components/settings/navigation/SettingsNavigation.tsx b/src/components/settings/navigation/SettingsNavigation.tsx
index 95c69027c..4e2c7f410 100644
--- a/src/components/settings/navigation/SettingsNavigation.tsx
+++ b/src/components/settings/navigation/SettingsNavigation.tsx
@@ -191,9 +191,9 @@ class SettingsNavigation extends Component<IProps> {
           className="settings-navigation__link"
           onClick={this.handleLogout.bind(this)}
         >
-          {!isUsingWithoutAccount
-            ? intl.formatMessage(messages.logout)
-            : 'Exit session'}
+          {isUsingWithoutAccount
+            ? 'Exit session'
+            : intl.formatMessage(messages.logout)}
         </button>
       </div>
     );
diff --git a/src/components/settings/services/ServiceItem.tsx b/src/components/settings/services/ServiceItem.tsx
index fd961a0a8..0737a680c 100644
--- a/src/components/settings/services/ServiceItem.tsx
+++ b/src/components/settings/services/ServiceItem.tsx
@@ -63,7 +63,7 @@ class ServiceItem extends Component<IProps> {
           onClick={goToServiceForm}
           role="gridcell"
         >
-          {service.name !== '' ? service.name : service.recipe.name}
+          {service.name === '' ? service.recipe.name : service.name}
         </td>
         <td
           className="service-table__column-info"
diff --git a/src/components/ui/Loader.tsx b/src/components/ui/Loader.tsx
index ebb437d9d..17cb35f41 100644
--- a/src/components/ui/Loader.tsx
+++ b/src/components/ui/Loader.tsx
@@ -25,7 +25,7 @@ class LoaderComponent extends Component<IProps> {
     } = this.props;
 
     const loaderColor =
-      color !== 'ACCENT' ? color : this.props.stores!.settings.app.accentColor;
+      color === 'ACCENT' ? this.props.stores!.settings.app.accentColor : color;
 
     return (
       <Loader
diff --git a/src/components/ui/Slider.tsx b/src/components/ui/Slider.tsx
index ed9fe9073..be0846513 100644
--- a/src/components/ui/Slider.tsx
+++ b/src/components/ui/Slider.tsx
@@ -51,7 +51,7 @@ class Slider extends Component<IProps> {
             value={field.value}
             min="1"
             max="100"
-            onChange={e => (!disabled ? this.onChange(e) : null)}
+            onChange={e => (disabled ? null : this.onChange(e))}
           />
         </div>
 
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index dc984bf95..9444efde2 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -117,12 +117,12 @@ const styles = (theme: Theme) => ({
     zIndex: 9999,
   },
   loaderContainer: {
-    width: (props: IProps): string => (!props.busy ? '0' : '40px'),
+    width: (props: IProps): string => (props.busy ? '40px' : '0'),
     height: 20,
     overflow: 'hidden',
     transition: loaderContainerTransition,
-    marginLeft: (props: IProps): number => (!props.busy ? 10 : 20),
-    marginRight: (props: IProps): number => (!props.busy ? -10 : -20),
+    marginLeft: (props: IProps): number => (props.busy ? 20 : 10),
+    marginRight: (props: IProps): number => (props.busy ? -20 : -10),
     position: (): Property.Position => 'inherit',
   },
   icon: {
@@ -217,38 +217,38 @@ class ButtonComponent extends Component<IProps, IState> {
       </>
     );
 
-    const wrapperComponent = !href ? (
-      <button
-        id={id}
-        type={type}
+    const wrapperComponent = href ? (
+      <a
+        href={href}
+        target={target}
         onClick={onClick}
         className={classnames({
           [`${classes.button}`]: true,
           [`${classes[buttonType as ButtonType]}`]: true,
-          [`${classes.disabled}`]: disabled,
           [`${className}`]: className,
         })}
-        disabled={disabled}
+        rel={target === '_blank' ? 'noopener' : ''}
         data-type="franz-button"
-        {...(htmlForm && { form: htmlForm })}
       >
         {content}
-      </button>
+      </a>
     ) : (
-      <a
-        href={href}
-        target={target}
+      <button
+        id={id}
+        type={type}
         onClick={onClick}
         className={classnames({
           [`${classes.button}`]: true,
           [`${classes[buttonType as ButtonType]}`]: true,
+          [`${classes.disabled}`]: disabled,
           [`${className}`]: className,
         })}
-        rel={target === '_blank' ? 'noopener' : ''}
+        disabled={disabled}
         data-type="franz-button"
+        {...(htmlForm && { form: htmlForm })}
       >
         {content}
-      </a>
+      </button>
     );
 
     return wrapperComponent;
diff --git a/src/components/ui/imageUpload/index.tsx b/src/components/ui/imageUpload/index.tsx
index 89e2c65a2..3b164ed41 100644
--- a/src/components/ui/imageUpload/index.tsx
+++ b/src/components/ui/imageUpload/index.tsx
@@ -46,7 +46,7 @@ class ImageUpload extends Component<IProps, IState> {
     this.setState({ errorState: false });
 
     for (const file of acceptedFiles) {
-      const imgPath = isWindows ? file.path.replace(/\\/g, '/') : file.path;
+      const imgPath = isWindows ? file.path.replaceAll('\\', '/') : file.path;
       this.setState({
         path: imgPath,
       });
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index 31aa8a15f..695e70e28 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -321,10 +321,12 @@ class SelectComponent extends Component<IProps, IState> {
       case 39:
       case 38:
       case 40: // Arrow keys
-      case 32:
-        break; // Space
-      default:
-        break; // do not block other keys
+      case 32: {
+        break;
+      } // Space
+      default: {
+        break;
+      } // do not block other keys
     }
   }
 
@@ -381,12 +383,12 @@ class SelectComponent extends Component<IProps, IState> {
                 [`${classes.hasError}`]: error,
               })}
               onClick={
-                !disabled
-                  ? () =>
+                disabled
+                  ? noop
+                  : () =>
                       this.setState((state: IState) => ({
                         open: !state.open,
                       }))
-                  : noop
               }
             >
               {selection}