lint

flow-typed/Comment.js

@@ -14,6 +14,7 @@ declare type Comment = {
   is_pinned: boolean,
   support_amount: number,
   replies: number, // number of direct replies (i.e. excluding nested replies).
+  is_fiat?: boolean,
 };
 
 declare type PerChannelSettings = {

ui/component/common/credit-amount.jsx

@@ -18,7 +18,7 @@ type Props = {
   size?: number,
   superChat?: boolean,
   superChatLight?: boolean,
-  isFiat?: boolean
+  isFiat?: boolean,
 };
 
 class CreditAmount extends React.PureComponent<Props> {
@@ -75,7 +75,7 @@ class CreditAmount extends React.PureComponent<Props> {
       if (showLBC && !isFiat) {
         amountText = <LbcSymbol postfix={amountText} size={size} />;
       } else if (showLBC && isFiat) {
-        amountText = <p> ${(Math.round(amountText * 100) / 100).toFixed(2)}</p>;
+        amountText = <p> ${(Math.round(Number(amountText) * 100) / 100).toFixed(2)}</p>;
       }
 
       if (fee) {

ui/component/stripeAccountConnection/index.js

@@ -8,6 +8,6 @@ const select = (state) => ({
   user: selectUser(state),
 });
 
-const perform = (dispatch) => ({});
+// const perform = (dispatch) => ({});
 
-export default withRouter(connect(select, perform)(StripeAccountConnection));
+export default withRouter(connect(select)(StripeAccountConnection));

ui/component/walletSpendableBalanceHelp/index.js

@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { selectBalance } from 'lbry-redux';
 import WalletSpendableBalanceHelp from './view';
 
-const select = (state, props) => ({
+const select = (state) => ({
   balance: selectBalance(state),
 });
 

ui/component/walletTipAmountSelector/index.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { makeSelectClaimForUri, selectBalance } from 'lbry-redux';
+import { selectBalance } from 'lbry-redux';
 import WalletTipAmountSelector from './view';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 

ui/component/walletTipAmountSelector/view.jsx

@@ -33,10 +33,11 @@ type Props = {
   claim: StreamClaim,
   uri: string,
   onTipErrorChange: (string) => void,
+  activeTab: string,
 };
 
 function WalletTipAmountSelector(props: Props) {
-  const { balance, amount, onChange, activeTab, isAuthenticated, claim, uri, onTipErrorChange } = props;
+  const { balance, amount, onChange, activeTab, claim, onTipErrorChange } = props;
   const [useCustomTip, setUseCustomTip] = usePersistedState('comment-support:useCustomTip', false);
   const [tipError, setTipError] = React.useState();
 
@@ -112,13 +113,12 @@ function WalletTipAmountSelector(props: Props) {
   }, []);
 
   React.useEffect(() => {
-
     // setHasSavedCard(false);
     // setCanReceiveFiatTip(true);
 
     const regexp = RegExp(/^(\d*([.]\d{0,8})?)$/);
     const validTipInput = regexp.test(String(amount));
-    let tipError;
+    let tipError = '';
 
     if (amount === 0) {
       tipError = __('Amount must be a positive number');
@@ -196,49 +196,52 @@ function WalletTipAmountSelector(props: Props) {
         )}
       </div>
 
-      {useCustomTip && activeTab === TAB_FIAT && !hasCardSaved &&
+      {useCustomTip && activeTab === TAB_FIAT && !hasCardSaved && (
         <>
           <div className="help">
             <span className="help--spendable">
-            <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To {__(' Tip Creators')}
+              <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To{' '}
+              {__(' Tip Creators')}
             </span>
           </div>
         </>
-      }
+      )}
 
       {/* has card saved but cant creator cant receive tips */}
-      {useCustomTip && activeTab === TAB_FIAT && hasCardSaved && !canReceiveFiatTip &&
+      {useCustomTip && activeTab === TAB_FIAT && hasCardSaved && !canReceiveFiatTip && (
         <>
           <div className="help">
             <span className="help--spendable">Only select creators can receive tips at this time</span>
           </div>
         </>
-      }
+      )}
 
       {/* has card saved but cant creator cant receive tips */}
-      {useCustomTip && activeTab === TAB_FIAT && hasCardSaved && canReceiveFiatTip &&
+      {useCustomTip && activeTab === TAB_FIAT && hasCardSaved && canReceiveFiatTip && (
         <>
           <div className="help">
             <span className="help--spendable">Send a tip directly from your attached card</span>
           </div>
         </>
-      }
+      )}
 
       {useCustomTip && (
         <div className="comment__tip-input">
           <FormField
             autoFocus
             name="tip-input"
-            label={ activeTab === TAB_LBC ?
+            label={
+              activeTab === TAB_LBC ? (
                 <React.Fragment>
                   {__('Custom support amount')}{' '}
                   <I18nMessage tokens={{ lbc_balance: <CreditAmount precision={4} amount={balance} /> }}>
                     (%lbc_balance% available)
                   </I18nMessage>
                 </React.Fragment>
+              ) : (
                 // TODO: add conditional based on hasSavedCard
-              : <>
+                <></>
-                </>
+              )
 
               // <>
               //   <div className="">
@@ -258,38 +261,37 @@ function WalletTipAmountSelector(props: Props) {
         </div>
       )}
 
-      {/*// TODO: add conditional based on hasSavedCard*/}
       {/* lbc tab */}
       {activeTab === TAB_LBC && <WalletSpendableBalanceHelp />}
       {/* fiat button but no card saved */}
-      {!useCustomTip && activeTab === TAB_FIAT && !hasCardSaved &&
+      {!useCustomTip && activeTab === TAB_FIAT && !hasCardSaved && (
         <>
           <div className="help">
             <span className="help--spendable">
-            <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To {__(' Tip Creators')}
+              <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To{' '}
+              {__(' Tip Creators')}
             </span>
           </div>
         </>
-      }
+      )}
 
       {/* has card saved but cant creator cant receive tips */}
-      {!useCustomTip && activeTab === TAB_FIAT && hasCardSaved && !canReceiveFiatTip &&
+      {!useCustomTip && activeTab === TAB_FIAT && hasCardSaved && !canReceiveFiatTip && (
         <>
           <div className="help">
             <span className="help--spendable">Only select creators can receive tips at this time</span>
           </div>
         </>
-      }
+      )}
 
       {/* has card saved but cant creator cant receive tips */}
-      {!useCustomTip && activeTab === TAB_FIAT && hasCardSaved && canReceiveFiatTip &&
+      {!useCustomTip && activeTab === TAB_FIAT && hasCardSaved && canReceiveFiatTip && (
         <>
           <div className="help">
             <span className="help--spendable">Send a tip directly from your attached card</span>
           </div>
         </>
-      }
+      )}
-
     </>
   );
 }

ui/page/settingsStripeAccount/index.js

@@ -8,6 +8,6 @@ const select = (state) => ({
   user: selectUser(state),
 });
 
-const perform = (dispatch) => ({});
+// const perform = (dispatch) => ({});
 
-export default withRouter(connect(select, perform)(StripeAccountConnection));
+export default withRouter(connect(select)(StripeAccountConnection));

ui/page/settingsStripeAccount/view.jsx

@@ -44,6 +44,7 @@ type State = {
   accountNotConfirmedButReceivedTips: boolean,
   unpaidBalance: number,
   pageTitle: string,
+  accountTransactions: any, // define this type
 };
 
 class StripeAccountConnection extends React.Component<Props, State> {
@@ -123,9 +124,8 @@ class StripeAccountConnection extends React.Component<Props, State> {
               environment: stripeEnvironment,
             },
             'post'
-          )
+          ).then((accountListResponse: any) => {
-            .then((accountListResponse) => {
+            // TODO type this
-
             that.setState({
               accountTransactions: accountListResponse,
             });
@@ -227,16 +227,15 @@ class StripeAccountConnection extends React.Component<Props, State> {
                           <div>
                             <br />
                             <h3>
-                              {__(
+                              {__('Your pending account balance is $%balance% USD.', { balance: unpaidBalance / 100 })}
-                                'Your pending account balance is $%balance% USD.',
-                                { balance: unpaidBalance / 100 }
-                              )}
                             </h3>
                           </div>
                         ) : (
                           <div>
                             <br />
-                            <h3>{__('Your account balance is $0 USD. When you receive a tip you will see it here.')}</h3>
+                            <h3>
+                              {__('Your account balance is $0 USD. When you receive a tip you will see it here.')}
+                            </h3>
                           </div>
                         )}
                       </div>
@@ -251,16 +250,15 @@ class StripeAccountConnection extends React.Component<Props, State> {
                         <div>
                           <br />
                           <h3>
-                            {__(
+                            {__('Your pending account balance is $%balance% USD.', { balance: unpaidBalance / 100 })}
-                              'Your pending account balance is $%balance% USD.',
-                              { balance: unpaidBalance / 100 }
-                            )}
                           </h3>
                         </div>
                         <br />
                         <div>
                           <h3>
-                            {__('Connect your bank account to be able to cash your pending balance out to your account.')}
+                            {__(
+                              'Connect your bank account to be able to cash your pending balance out to your account.'
+                            )}
                           </h3>
                         </div>
                         <div className="section__actions">
@@ -277,10 +275,8 @@ class StripeAccountConnection extends React.Component<Props, State> {
           />
           <br />
 
-
           {/* customer already has transactions */}
           {accountTransactions && accountTransactions.length > 0 && (
-
             <Card
               title={__('Tip History')}
               body={
@@ -315,9 +311,12 @@ class StripeAccountConnection extends React.Component<Props, State> {
                                 <Button
                                   className="stripe__card-link-text"
                                   navigate={'/' + transaction.channel_name + ':' + transaction.source_claim_id}
-                              label={transaction.channel_claim_id === transaction.source_claim_id ? 'Channel Page' : 'File Page'}
+                                  label={
+                                    transaction.channel_claim_id === transaction.source_claim_id
+                                      ? 'Channel Page'
+                                      : 'File Page'
+                                  }
                                   button="link"
-
                                 />
                               </td>
                               <td>${transaction.tipped_amount / 100}</td>

ui/page/settingsStripeCard/view.jsx

@@ -55,11 +55,11 @@ class SettingsStripeCard extends React.Component<Props, State> {
   }
 
   componentDidMount() {
-    var that = this;
+    let that = this;
 
     console.log(this.props);
 
-    var doToast = this.props.doToast;
+    let doToast = this.props.doToast;
 
     const script = document.createElement('script');
     script.src = 'https://js.stripe.com/v3/';
@@ -69,10 +69,10 @@ class SettingsStripeCard extends React.Component<Props, State> {
     document.body.appendChild(script);
 
     // public key of the stripe account
-    var publicKey = STRIPE_PUBLIC_KEY;
+    let publicKey = STRIPE_PUBLIC_KEY;
 
     // client secret of the SetupIntent (don't share with anyone but customer)
-    var clientSecret = '';
+    let clientSecret = '';
 
     // setting a timeout to let the client secret populate
     // TODO: fix this, should be a cleaner way
@@ -89,20 +89,20 @@ class SettingsStripeCard extends React.Component<Props, State> {
         .then((customerStatusResponse) => {
           // user has a card saved if their defaultPaymentMethod has an id
           const defaultPaymentMethod = customerStatusResponse.Customer.invoice_settings.default_payment_method;
-          var userHasAlreadySetupPayment = Boolean(defaultPaymentMethod && defaultPaymentMethod.id);
+          let userHasAlreadySetupPayment = Boolean(defaultPaymentMethod && defaultPaymentMethod.id);
 
           // show different frontend if user already has card
           if (userHasAlreadySetupPayment) {
-            var card = customerStatusResponse.PaymentMethods[0].card;
+            let card = customerStatusResponse.PaymentMethods[0].card;
 
-            var customer = customerStatusResponse.Customer;
+            let customer = customerStatusResponse.Customer;
 
-            var topOfDisplay = customer.email.split('@')[0];
+            let topOfDisplay = customer.email.split('@')[0];
-            var bottomOfDisplay = '@' + customer.email.split('@')[1];
+            let bottomOfDisplay = '@' + customer.email.split('@')[1];
 
             console.log(customerStatusResponse.Customer);
 
-            var cardDetails = {
+            let cardDetails = {
               brand: card.brand,
               expiryYear: card.exp_year,
               expiryMonth: card.exp_month,
@@ -189,7 +189,7 @@ class SettingsStripeCard extends React.Component<Props, State> {
               setupStripe();
             });
           } else if (error === 'internal_apis_down') {
-            var displayString = 'There was an error from the server, please let support know'
+            var displayString = 'There was an error from the server, please let support know';
             doToast({ message: displayString, isError: true });
           } else {
             console.log('Unseen before error');
@@ -197,7 +197,6 @@ class SettingsStripeCard extends React.Component<Props, State> {
         });
     }, 250);
 
-
     function setupStripe() {
       // TODO: have to fix this, using so that the script is available
       setTimeout(function () {
@@ -323,14 +322,14 @@ class SettingsStripeCard extends React.Component<Props, State> {
               },
               'post'
             ).then((customerStatusResponse) => {
-              var card = customerStatusResponse.PaymentMethods[0].card;
+              let card = customerStatusResponse.PaymentMethods[0].card;
 
-              var customer = customerStatusResponse.Customer;
+              let customer = customerStatusResponse.Customer;
 
-              var topOfDisplay = customer.email.split('@')[0];
+              let topOfDisplay = customer.email.split('@')[0];
-              var bottomOfDisplay = '@' + customer.email.split('@')[1];
+              let bottomOfDisplay = '@' + customer.email.split('@')[1];
 
-              var cardDetails = {
+              let cardDetails = {
                 brand: card.brand,
                 expiryYear: card.exp_year,
                 expiryMonth: card.exp_month,
@@ -356,17 +355,16 @@ class SettingsStripeCard extends React.Component<Props, State> {
     }
   }
 
-
   render() {
-    var that = this;
+    let that = this;
 
     function setAsConfirmingCard() {
       that.setState({
         currentFlowStage: 'confirmingCard',
-      })
+      });
     }
 
-    const { scriptFailedToLoad, doOpenModal, openModal } = this.props;
+    const { scriptFailedToLoad, openModal } = this.props;
 
     const { currentFlowStage, customerTransactions, pageTitle, userCardDetails, paymentMethodId } = this.state;
 
@@ -442,7 +440,6 @@ class SettingsStripeCard extends React.Component<Props, State> {
                 subtitle={__('You have not sent any tips yet. When you do they will appear here. ')}
               />
             )}
-
           </div>
         )}
 
@@ -480,9 +477,12 @@ class SettingsStripeCard extends React.Component<Props, State> {
                               <Button
                                 className="stripe__card-link-text"
                                 navigate={'/' + transaction.channel_name + ':' + transaction.source_claim_id}
-                            label={transaction.channel_claim_id === transaction.source_claim_id ? 'Channel Page' : 'File Page'}
+                                label={
+                                  transaction.channel_claim_id === transaction.source_claim_id
+                                    ? 'Channel Page'
+                                    : 'File Page'
+                                }
                                 button="link"
-
                               />
                             </td>
                             <td>${transaction.tipped_amount / 100}</td>
@@ -496,7 +496,6 @@ class SettingsStripeCard extends React.Component<Props, State> {
             }
           />
         )}
-
       </Page>
     );
   }