From 4ee87f1476936c130c6b10027aab2cc679c40aa0 Mon Sep 17 00:00:00 2001
From: Tom Kirkpatrick <tkp@kirkdesigns.co.uk>
Date: Thu, 5 Jul 2018 12:12:50 +0200
Subject: [PATCH] refactor(react): ternary conditional classnames

React v16.x reports errors when using boolean operators for conditional
classnames and requires that you instead use ternary style conditional
clauses.
---
 app/components/Activity/InvoiceModal.js       |  4 ++--
 app/components/Activity/PaymentModal.js       |  4 ++--
 app/components/Activity/TransactionModal.js   |  4 ++--
 app/components/Contacts/ConnectManually.js    |  6 +++--
 app/components/Contacts/ContactModal.js       |  2 +-
 app/components/Contacts/ContactsForm.js       |  4 +++-
 app/components/Contacts/Network.js            | 11 +++++-----
 app/components/Contacts/SubmitChannelForm.js  |  4 ++--
 app/components/Form/Pay.js                    | 22 ++++++++++++++-----
 app/components/Form/Request.js                |  4 ++--
 app/components/GlobalError/GlobalError.js     |  2 +-
 app/components/Onboarding/Autopilot.js        |  8 +++++--
 .../Onboarding/ConnectionDetails.js           | 12 +++++-----
 app/components/Onboarding/ConnectionType.js   |  8 +++++--
 app/components/Onboarding/Login.js            |  6 ++---
 .../Onboarding/NewWalletPassword.js           | 15 ++++++++-----
 app/components/Onboarding/Signup.js           |  4 ++--
 app/components/Wallet/ReceiveModal.js         | 10 +++++++--
 app/components/Wallet/Wallet.js               |  2 +-
 app/routes/activity/components/Activity.js    | 10 ++++++---
 .../components/components/Invoice/Invoice.js  |  2 +-
 21 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/app/components/Activity/InvoiceModal.js b/app/components/Activity/InvoiceModal.js
index 9836ff8c..f627e286 100644
--- a/app/components/Activity/InvoiceModal.js
+++ b/app/components/Activity/InvoiceModal.js
@@ -69,7 +69,7 @@ const InvoiceModal = ({
                   <FaAngleDown />
                 </span>
               </section>
-              <ul className={showCurrencyFilters && styles.active}>
+              <ul className={showCurrencyFilters ? styles.active : undefined}>
                 {currentCurrencyFilters.map(filter => (
                   <li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>
                     {filter.name}
@@ -81,7 +81,7 @@ const InvoiceModal = ({
               <p>
                 <Moment format="MM/DD/YYYY">{invoice.creation_date * 1000}</Moment>
               </p>
-              <p className={styles.notPaid}>{!invoice.settled && 'Not Paid'}</p>
+              {!invoice.settled && <p className={styles.notPaid}>Not Paid</p>}
             </section>
           </div>
 
diff --git a/app/components/Activity/PaymentModal.js b/app/components/Activity/PaymentModal.js
index 92a1197d..657ac246 100644
--- a/app/components/Activity/PaymentModal.js
+++ b/app/components/Activity/PaymentModal.js
@@ -46,7 +46,7 @@ const PaymentModal = ({
 
     <div className={styles.amount}>
       <h1>
-        <i className={`${styles.symbol} ${payment.value > 0 && styles.active}`}>-</i>
+        <i className={`${styles.symbol} ${payment.value > 0 ? styles.active : undefined}`}>-</i>
         <Value value={payment.value} currency={ticker.currency} currentTicker={currentTicker} />
       </h1>
       <section
@@ -57,7 +57,7 @@ const PaymentModal = ({
         <span>
           <FaAngleDown />
         </span>
-        <ul className={showCurrencyFilters && styles.active}>
+        <ul className={showCurrencyFilters ? styles.active : undefined}>
           {currentCurrencyFilters.map(filter => (
             <li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>
               {filter.name}
diff --git a/app/components/Activity/TransactionModal.js b/app/components/Activity/TransactionModal.js
index eb5ff8b3..6c7ab357 100644
--- a/app/components/Activity/TransactionModal.js
+++ b/app/components/Activity/TransactionModal.js
@@ -65,7 +65,7 @@ const TransactionModal = ({
 
     <div className={styles.amount}>
       <h1>
-        <i className={`${styles.symbol} ${transaction.received && styles.active}`}>
+        <i className={`${styles.symbol} ${transaction.received ? styles.active : undefined}`}>
           {transaction.received ? '+' : '-'}
         </i>
         <Value
@@ -82,7 +82,7 @@ const TransactionModal = ({
         <span>
           <FaAngleDown />
         </span>
-        <ul className={showCurrencyFilters && styles.active}>
+        <ul className={showCurrencyFilters ? styles.active : undefined}>
           {currentCurrencyFilters.map(filter => (
             <li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>
               {filter.name}
diff --git a/app/components/Contacts/ConnectManually.js b/app/components/Contacts/ConnectManually.js
index adc380d7..b252fd7b 100644
--- a/app/components/Contacts/ConnectManually.js
+++ b/app/components/Contacts/ConnectManually.js
@@ -63,7 +63,9 @@ class ConnectManually extends React.Component {
           </div>
         </section>
 
-        <section className={`${styles.errorMessage} ${showErrors.manualInput && styles.active}`}>
+        <section
+          className={`${styles.errorMessage} ${showErrors.manualInput ? styles.active : undefined}`}
+        >
           {showErrors.manualInput && (
             <span>{manualFormIsValid && manualFormIsValid.errors.manualInput}</span>
           )}
@@ -71,7 +73,7 @@ class ConnectManually extends React.Component {
 
         <section className={styles.submit}>
           <div
-            className={`${styles.button} ${manualFormIsValid.isValid && styles.active}`}
+            className={`${styles.button} ${manualFormIsValid.isValid ? styles.active : undefined}`}
             onClick={formSubmitted}
           >
             Submit
diff --git a/app/components/Contacts/ContactModal.js b/app/components/Contacts/ContactModal.js
index 42fcb3f6..606f1595 100644
--- a/app/components/Contacts/ContactModal.js
+++ b/app/components/Contacts/ContactModal.js
@@ -61,7 +61,7 @@ const ContactModal = ({
       {channel && (
         <div className={styles.container}>
           <header className={styles.header}>
-            <div className={`${styles.status} ${channel.active && styles.online}`}>
+            <div className={`${styles.status} ${channel.active ? styles.online : undefined}`}>
               <FaCircle style={{ verticalAlign: 'top' }} />
               <span>{channel.active ? 'Online' : 'Offline'}</span>
             </div>
diff --git a/app/components/Contacts/ContactsForm.js b/app/components/Contacts/ContactsForm.js
index 4231f7ac..19a38a90 100644
--- a/app/components/Contacts/ContactsForm.js
+++ b/app/components/Contacts/ContactsForm.js
@@ -208,7 +208,9 @@ class ContactsForm extends React.Component {
               </section>
 
               <section
-                className={`${styles.errorMessage} ${showErrors.manualInput && styles.active}`}
+                className={`${styles.errorMessage} ${
+                  showErrors.manualInput ? styles.active : undefined
+                }`}
               >
                 {showErrors.manualInput && (
                   <span>{manualFormIsValid && manualFormIsValid.errors.manualInput}</span>
diff --git a/app/components/Contacts/Network.js b/app/components/Contacts/Network.js
index 49d42958..fc8134f4 100644
--- a/app/components/Contacts/Network.js
+++ b/app/components/Contacts/Network.js
@@ -180,11 +180,11 @@ class Network extends Component {
               <section>
                 <h2 onClick={toggleFilterPulldown} className={styles.filterTitle}>
                   {filter.name}{' '}
-                  <span className={filterPulldown && styles.pulldown}>
+                  <span className={filterPulldown ? styles.pulldown : undefined}>
                     <FaAngleDown />
                   </span>
                 </h2>
-                <ul className={`${styles.filters} ${filterPulldown && styles.active}`}>
+                <ul className={`${styles.filters} ${filterPulldown ? styles.active : undefined}`}>
                   {nonActiveFilters.map(f => (
                     <li key={f.key} onClick={() => changeFilter(f)}>
                       {f.name}
@@ -208,7 +208,7 @@ class Network extends Component {
             <SuggestedNodes {...suggestedNodesProps} />
           )}
 
-          <ul className={filterPulldown && styles.fade}>
+          <ul className={filterPulldown ? styles.fade : undefined}>
             {loadingChannelPubkeys.length > 0 &&
               loadingChannelPubkeys.map(loadingPubkey => {
                 // TODO(jimmymow): refactor this out. same logic is in displayNodeName above
@@ -242,8 +242,9 @@ class Network extends Component {
                 return (
                   <li
                     key={index}
-                    className={`${styles.channel} ${selectedChannel === channel &&
-                      styles.selectedChannel}`}
+                    className={`${styles.channel} ${
+                      selectedChannel === channel ? styles.selectedChannel : undefined
+                    }`}
                     onClick={() => channelClicked(channel)}
                   >
                     <section className={styles.channelTitle}>
diff --git a/app/components/Contacts/SubmitChannelForm.js b/app/components/Contacts/SubmitChannelForm.js
index 91051b75..207472c4 100644
--- a/app/components/Contacts/SubmitChannelForm.js
+++ b/app/components/Contacts/SubmitChannelForm.js
@@ -92,7 +92,7 @@ class SubmitChannelForm extends React.Component {
                   <FaAngleDown />
                 </span>
               </section>
-              <ul className={showCurrencyFilters && styles.active}>
+              <ul className={showCurrencyFilters ? styles.active : undefined}>
                 {currentCurrencyFilters.map(filter => (
                   <li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>
                     {filter.name}
@@ -107,7 +107,7 @@ class SubmitChannelForm extends React.Component {
 
         <section className={styles.submit}>
           <div
-            className={`${styles.button} ${contactCapacity > 0 && styles.active}`}
+            className={`${styles.button} ${contactCapacity > 0 ? styles.active : undefined}`}
             onClick={formSubmitted}
           >
             Submit
diff --git a/app/components/Form/Pay.js b/app/components/Form/Pay.js
index a3b378c5..9ad81b6d 100644
--- a/app/components/Form/Pay.js
+++ b/app/components/Form/Pay.js
@@ -88,7 +88,9 @@ class Pay extends Component {
           <section className={styles.destination}>
             <div className={styles.top}>
               <label htmlFor="paymentRequest">Destination</label>
-              <span className={`${styles.description} ${(isOnchain || isLn) && styles.active}`}>
+              <span
+                className={`${styles.description} ${isOnchain || isLn ? styles.active : undefined}`}
+              >
                 {isOnchain && (
                   <i>
                     <Isvg src={link} />
@@ -114,7 +116,11 @@ class Pay extends Component {
                 id="paymentRequest"
                 rows="4"
               />
-              <section className={`${styles.errorMessage} ${showErrors.payInput && styles.active}`}>
+              <section
+                className={`${styles.errorMessage} ${
+                  showErrors.payInput ? styles.active : undefined
+                }`}
+              >
                 {showErrors.payInput && <span>{errors.payInput}</span>}
               </section>
             </div>
@@ -150,7 +156,7 @@ class Pay extends Component {
                     <FaAngleDown />
                   </span>
                 </section>
-                <ul className={showCurrencyFilters && styles.active}>
+                <ul className={showCurrencyFilters ? styles.active : undefined}>
                   {currentCurrencyFilters.map(filter => (
                     <li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>
                       {filter.name}
@@ -163,15 +169,19 @@ class Pay extends Component {
             <div className={styles.usdAmount}>{`≈ ${usdAmount || 0} USD`}</div>
 
             <section
-              className={`${styles.errorMessage} ${styles.amount} ${showErrors.amount &&
-                styles.active}`}
+              className={`${styles.errorMessage} ${styles.amount} ${
+                showErrors.amount ? styles.active : undefined
+              }`}
             >
               {showErrors.amount && <span>{errors.amount}</span>}
             </section>
           </section>
 
           <section className={styles.submit}>
-            <div className={`${styles.button} ${isValid && styles.active}`} onClick={onPaySubmit}>
+            <div
+              className={`${styles.button} ${isValid ? styles.active : undefined}`}
+              onClick={onPaySubmit}
+            >
               Pay
             </div>
           </section>
diff --git a/app/components/Form/Request.js b/app/components/Form/Request.js
index accbf5ff..ed0128dc 100644
--- a/app/components/Form/Request.js
+++ b/app/components/Form/Request.js
@@ -62,7 +62,7 @@ const Request = ({
                   <FaAngleDown />
                 </span>
               </section>
-              <ul className={showCurrencyFilters && styles.active}>
+              <ul className={showCurrencyFilters ? styles.active : undefined}>
                 {currentCurrencyFilters.map(filter => (
                   <li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>
                     {filter.name}
@@ -92,7 +92,7 @@ const Request = ({
 
         <section className={styles.submit}>
           <div
-            className={`${styles.button} ${amount > 0 && styles.active}`}
+            className={`${styles.button} ${amount > 0 ? styles.active : undefined}`}
             onClick={onRequestSubmit}
           >
             Request
diff --git a/app/components/GlobalError/GlobalError.js b/app/components/GlobalError/GlobalError.js
index 3854b916..d4289020 100644
--- a/app/components/GlobalError/GlobalError.js
+++ b/app/components/GlobalError/GlobalError.js
@@ -15,7 +15,7 @@ class GlobalError extends React.Component {
     const { error, clearError } = this.props
 
     return (
-      <div className={`${styles.container} ${!error && styles.closed}`}>
+      <div className={`${styles.container} ${!error ? styles.closed : undefined}`}>
         <div className={styles.content}>
           <div className={styles.close} onClick={clearError}>
             <MdClose />
diff --git a/app/components/Onboarding/Autopilot.js b/app/components/Onboarding/Autopilot.js
index da51572d..5e104fd9 100644
--- a/app/components/Onboarding/Autopilot.js
+++ b/app/components/Onboarding/Autopilot.js
@@ -6,13 +6,17 @@ import styles from './Autopilot.scss'
 
 const Autopilot = ({ autopilot, setAutopilot }) => (
   <div className={styles.container}>
-    <section className={`${styles.enable} ${autopilot && styles.active}`}>
+    <section className={`${styles.enable} ${autopilot ? styles.active : undefined}`}>
       <div onClick={() => setAutopilot(true)}>
         {autopilot ? <FaCircle /> : <FaCircleThin />}
         <span className={styles.label}>Enable Autopilot</span>
       </div>
     </section>
-    <section className={`${styles.disable} ${!autopilot && autopilot !== null && styles.active}`}>
+    <section
+      className={`${styles.disable} ${
+        !autopilot && autopilot !== null ? styles.active : undefined
+      }`}
+    >
       <div onClick={() => setAutopilot(false)}>
         {!autopilot && autopilot !== null ? <FaCircle /> : <FaCircleThin />}
         <span className={styles.label}>Disable Autopilot</span>
diff --git a/app/components/Onboarding/ConnectionDetails.js b/app/components/Onboarding/ConnectionDetails.js
index 1234b8e0..d65ae333 100644
--- a/app/components/Onboarding/ConnectionDetails.js
+++ b/app/components/Onboarding/ConnectionDetails.js
@@ -19,7 +19,7 @@ const ConnectionDetails = ({
       <input
         type="text"
         id="connectionHost"
-        className={`${styles.host} ${startLndHostError && styles.error}`}
+        className={`${styles.host} ${startLndHostError ? styles.error : undefined}`}
         ref={input => input}
         value={connectionHost}
         onChange={event => setConnectionHost(event.target.value)}
@@ -27,7 +27,7 @@ const ConnectionDetails = ({
       <p className={styles.description}>
         Hostname and port of the Lnd gRPC interface. Example: localhost:10009
       </p>
-      <p className={`${startLndHostError && styles.visible} ${styles.errorMessage}`}>
+      <p className={`${startLndHostError ? styles.visible : undefined} ${styles.errorMessage}`}>
         {startLndHostError}
       </p>
     </section>
@@ -36,13 +36,13 @@ const ConnectionDetails = ({
       <input
         type="text"
         id="connectionCert"
-        className={`${styles.cert} ${startLndCertError && styles.error}`}
+        className={`${styles.cert} ${startLndCertError ? styles.error : undefined}`}
         ref={input => input}
         value={connectionCert}
         onChange={event => setConnectionCert(event.target.value)}
       />
       <p className={styles.description}>Path to the lnd tls cert. Example: /path/to/tls.cert</p>
-      <p className={`${startLndCertError && styles.visible} ${styles.errorMessage}`}>
+      <p className={`${startLndCertError ? styles.visible : undefined} ${styles.errorMessage}`}>
         {startLndCertError}
       </p>
     </section>
@@ -51,7 +51,7 @@ const ConnectionDetails = ({
       <input
         type="text"
         id="connectionMacaroon"
-        className={`${styles.macaroon} ${startLndMacaroonError && styles.error}`}
+        className={`${styles.macaroon} ${startLndMacaroonError ? styles.error : undefined}`}
         ref={input => input}
         value={connectionMacaroon}
         onChange={event => setConnectionMacaroon(event.target.value)}
@@ -59,7 +59,7 @@ const ConnectionDetails = ({
       <p className={styles.description}>
         Path to the lnd macaroon file. Example: /path/to/admin.macaroon
       </p>
-      <p className={`${startLndMacaroonError && styles.visible} ${styles.errorMessage}`}>
+      <p className={`${startLndMacaroonError ? styles.visible : undefined} ${styles.errorMessage}`}>
         {startLndMacaroonError}
       </p>
     </section>
diff --git a/app/components/Onboarding/ConnectionType.js b/app/components/Onboarding/ConnectionType.js
index 334d88cf..3b43c9ce 100644
--- a/app/components/Onboarding/ConnectionType.js
+++ b/app/components/Onboarding/ConnectionType.js
@@ -6,13 +6,17 @@ import styles from './ConnectionType.scss'
 
 const ConnectionType = ({ connectionType, setConnectionType }) => (
   <div className={styles.container}>
-    <section className={`${styles.option} ${connectionType === 'local' && styles.active}`}>
+    <section
+      className={`${styles.option} ${connectionType === 'local' ? styles.active : undefined}`}
+    >
       <div className={`${styles.button}`} onClick={() => setConnectionType('local')}>
         {connectionType === 'local' ? <FaCircle /> : <FaCircleThin />}
         <span className={styles.label}>Default</span>
       </div>
     </section>
-    <section className={`${styles.option} ${connectionType === 'custom' && styles.active}`}>
+    <section
+      className={`${styles.option} ${connectionType === 'custom' ? styles.active : undefined}`}
+    >
       <div className={`${styles.button}`} onClick={() => setConnectionType('custom')}>
         {connectionType === 'custom' ? <FaCircle /> : <FaCircleThin />}
         <span className={styles.label}>Custom</span>
diff --git a/app/components/Onboarding/Login.js b/app/components/Onboarding/Login.js
index 369ae0fc..fc292ee6 100644
--- a/app/components/Onboarding/Login.js
+++ b/app/components/Onboarding/Login.js
@@ -7,7 +7,7 @@ const Login = ({ password, updatePassword, unlockingWallet, unlockWallet, unlock
     <input
       type="password"
       placeholder="Password"
-      className={`${styles.password} ${unlockWalletError.isError && styles.inputError}`}
+      className={`${styles.password} ${unlockWalletError.isError ? styles.inputError : undefined}`}
       ref={input => input && input.focus()}
       value={password}
       onChange={event => updatePassword(event.target.value)}
@@ -17,14 +17,14 @@ const Login = ({ password, updatePassword, unlockingWallet, unlockWallet, unlock
         }
       }}
     />
-    <p className={`${unlockWalletError.isError && styles.active} ${styles.error}`}>
+    <p className={`${unlockWalletError.isError ? styles.active : undefined} ${styles.error}`}>
       {unlockWalletError.message}
     </p>
 
     <section className={styles.buttons}>
       <div>
         <span
-          className={`${!unlockingWallet && styles.active} ${styles.button}`}
+          className={`${!unlockingWallet ? styles.active : undefined} ${styles.button}`}
           onClick={() => unlockWallet(password)}
         >
           {unlockingWallet ? <i className={styles.spinner} /> : 'Unlock'}
diff --git a/app/components/Onboarding/NewWalletPassword.js b/app/components/Onboarding/NewWalletPassword.js
index ac4516fc..3a6382f8 100644
--- a/app/components/Onboarding/NewWalletPassword.js
+++ b/app/components/Onboarding/NewWalletPassword.js
@@ -15,7 +15,9 @@ const NewWalletPassword = ({
       <input
         type="password"
         placeholder="Password"
-        className={`${styles.password} ${showCreateWalletPasswordConfirmationError && styles.error} 
+        className={`${styles.password} ${
+          showCreateWalletPasswordConfirmationError ? styles.error : undefined
+        } 
         ${passwordMinCharsError && styles.error}`}
         value={createWalletPassword}
         onChange={event => updateCreateWalletPassword(event.target.value)}
@@ -26,18 +28,21 @@ const NewWalletPassword = ({
       <input
         type="password"
         placeholder="Confirm Password"
-        className={`${styles.password} ${showCreateWalletPasswordConfirmationError && styles.error} 
+        className={`${styles.password} ${
+          showCreateWalletPasswordConfirmationError ? styles.error : undefined
+        } 
         ${passwordMinCharsError && styles.error}`}
         value={createWalletPasswordConfirmation}
         onChange={event => updateCreateWalletPasswordConfirmation(event.target.value)}
       />
       <p
-        className={`${styles.errorMessage} ${showCreateWalletPasswordConfirmationError &&
-          styles.visible}`}
+        className={`${styles.errorMessage} ${
+          showCreateWalletPasswordConfirmationError ? styles.visible : undefined
+        }`}
       >
         Passwords do not match
       </p>
-      <p className={`${styles.helpMessage} ${passwordMinCharsError && styles.red}`}>
+      <p className={`${styles.helpMessage} ${passwordMinCharsError ? styles.red : undefined}`}>
         Password must be at least 8 characters long
       </p>
     </section>
diff --git a/app/components/Onboarding/Signup.js b/app/components/Onboarding/Signup.js
index 3bfb9936..4123c7c6 100644
--- a/app/components/Onboarding/Signup.js
+++ b/app/components/Onboarding/Signup.js
@@ -6,13 +6,13 @@ import styles from './Signup.scss'
 
 const Signup = ({ signupForm, setSignupCreate, setSignupImport }) => (
   <div className={styles.container}>
-    <section className={`${styles.enable} ${signupForm.create && styles.active}`}>
+    <section className={`${styles.enable} ${signupForm.create ? styles.active : undefined}`}>
       <div onClick={setSignupCreate}>
         {signupForm.create ? <FaCircle /> : <FaCircleThin />}
         <span className={styles.label}>Create new wallet</span>
       </div>
     </section>
-    <section className={`${styles.disable} ${signupForm.import && styles.active}`}>
+    <section className={`${styles.disable} ${signupForm.import ? styles.active : undefined}`}>
       <div onClick={setSignupImport}>
         {signupForm.import ? <FaCircle /> : <FaCircleThin />}
         <span className={styles.label}>Import existing wallet</span>
diff --git a/app/components/Wallet/ReceiveModal.js b/app/components/Wallet/ReceiveModal.js
index ea7f08c7..753ac588 100644
--- a/app/components/Wallet/ReceiveModal.js
+++ b/app/components/Wallet/ReceiveModal.js
@@ -56,10 +56,16 @@ class ReceiveModal extends React.Component {
               <h2>{alias && alias.length ? alias : pubkey.substring(0, 10)}</h2>
 
               <div className={styles.qrCodeOptions}>
-                <div className={qrCodeType === 1 && styles.active} onClick={changeQrCode}>
+                <div
+                  className={qrCodeType === 1 ? styles.active : undefined}
+                  onClick={changeQrCode}
+                >
                   Node Pubkey
                 </div>
-                <div className={qrCodeType === 2 && styles.active} onClick={changeQrCode}>
+                <div
+                  className={qrCodeType === 2 ? styles.active : undefined}
+                  onClick={changeQrCode}
+                >
                   Bitcoin Address
                 </div>
               </div>
diff --git a/app/components/Wallet/Wallet.js b/app/components/Wallet/Wallet.js
index 429fffb3..68801a72 100644
--- a/app/components/Wallet/Wallet.js
+++ b/app/components/Wallet/Wallet.js
@@ -75,7 +75,7 @@ const Wallet = ({
                       <FaAngleDown />
                     </span>
 
-                    <ul className={info.showWalletCurrencyFilters && styles.active}>
+                    <ul className={info.showWalletCurrencyFilters ? styles.active : undefined}>
                       {currentCurrencyFilters.map(filter => (
                         <li key={filter.key} onClick={() => onCurrencyFilterClick(filter.key)}>
                           {filter.name}
diff --git a/app/routes/activity/components/Activity.js b/app/routes/activity/components/Activity.js
index 6efdaf36..2c7d8647 100644
--- a/app/routes/activity/components/Activity.js
+++ b/app/routes/activity/components/Activity.js
@@ -155,12 +155,12 @@ class Activity extends Component {
                   {filters.map(f => (
                     <li
                       key={f.key}
-                      className={f.key === filter.key && styles.activeFilter}
+                      className={f.key === filter.key ? styles.activeFilter : undefined}
                       onClick={() => changeFilter(f)}
                     >
                       <span>{f.name}</span>
 
-                      <div className={f.key === filter.key && styles.activeBorder} />
+                      <div className={f.key === filter.key ? styles.activeBorder : undefined} />
                     </li>
                   ))}
                 </ul>
@@ -184,7 +184,11 @@ class Activity extends Component {
               </section>
             </header>
           )}
-          <ul className={`${styles.activityContainer} ${filterPulldown && styles.pulldown}`}>
+          <ul
+            className={`${styles.activityContainer} ${
+              filterPulldown ? styles.pulldown : undefined
+            }`}
+          >
             {currentActivity.map((activityBlock, index) => (
               <li className={styles.activity} key={index}>
                 <h2>{activityBlock.title}</h2>
diff --git a/app/routes/activity/components/components/Invoice/Invoice.js b/app/routes/activity/components/components/Invoice/Invoice.js
index cdf4a4b8..19ff1861 100644
--- a/app/routes/activity/components/components/Invoice/Invoice.js
+++ b/app/routes/activity/components/components/Invoice/Invoice.js
@@ -10,7 +10,7 @@ import styles from '../Activity.scss'
 
 const Invoice = ({ invoice, ticker, currentTicker, showActivityModal, currencyName }) => (
   <div
-    className={`${styles.container} ${!invoice.settled && styles.unpaid}`}
+    className={`${styles.container} ${!invoice.settled ? styles.unpaid : undefined}`}
     onClick={() => showActivityModal('INVOICE', { invoice })}
   >
     <div className={styles.activityTypeIcon}>