From 620d5f71fb73fdb19858aeae93c7a690250111b3 Mon Sep 17 00:00:00 2001 From: Danny Calleri Date: Sun, 21 Oct 2018 10:57:39 +0200 Subject: [PATCH 1/2] fixed flow errors on a few 'view.jsx' files and 'form-field.jsx' --- src/renderer/component/button/view.jsx | 2 +- src/renderer/component/cardVerify/view.jsx | 4 ++-- src/renderer/component/channelTile/view.jsx | 1 + src/renderer/component/common/form-components/form-field.jsx | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/renderer/component/button/view.jsx b/src/renderer/component/button/view.jsx index 5cbc17917..7915597c4 100644 --- a/src/renderer/component/button/view.jsx +++ b/src/renderer/component/button/view.jsx @@ -22,7 +22,7 @@ type Props = { button: ?string, // primary, secondary, alt, link noPadding: ?boolean, // to remove padding and allow circular buttons uppercase: ?boolean, - iconColor: ?string, + iconColor?: string, tourniquet: ?boolean, // to shorten the button and ellipsis, only use for links }; diff --git a/src/renderer/component/cardVerify/view.jsx b/src/renderer/component/cardVerify/view.jsx index c9dc76184..0f3ff4fe0 100644 --- a/src/renderer/component/cardVerify/view.jsx +++ b/src/renderer/component/cardVerify/view.jsx @@ -16,7 +16,7 @@ type Props = { // see Stripe docs for more info: // https://stripe.com/docs/checkout#integration-custom // ===================================================== - + // Your publishable key (test or live). // can't use "key" as a prop in react, so have to change the keyname stripeKey: string, @@ -50,7 +50,7 @@ class CardVerify extends React.Component { const script = document.createElement('script'); script.src = 'https://checkout.stripe.com/checkout.js'; - script.async = 1; + script.async = true; this.loadPromise = (() => { let canceled = false; diff --git a/src/renderer/component/channelTile/view.jsx b/src/renderer/component/channelTile/view.jsx index 7095f41e6..28f725075 100644 --- a/src/renderer/component/channelTile/view.jsx +++ b/src/renderer/component/channelTile/view.jsx @@ -13,6 +13,7 @@ type Props = { claim: ?{ claim_id: string, name: string, + permanent_url: string, }, resolveUri: string => void, navigate: (string, ?{}) => void, diff --git a/src/renderer/component/common/form-components/form-field.jsx b/src/renderer/component/common/form-components/form-field.jsx index acecfac5d..21d52c2b0 100644 --- a/src/renderer/component/common/form-components/form-field.jsx +++ b/src/renderer/component/common/form-components/form-field.jsx @@ -25,7 +25,7 @@ type Props = { affixClass?: string, // class applied to prefix/postfix label firstInList?: boolean, // at the top of a list, no padding top autoFocus?: boolean, - inputProps: { + inputProps?: { disabled?: boolean, }, }; From 4a62e195771d6ebe25c984802474005f7e8c8291 Mon Sep 17 00:00:00 2001 From: Danny Calleri Date: Mon, 22 Oct 2018 15:29:27 +0200 Subject: [PATCH 2/2] using Claim type --- src/renderer/component/channelTile/view.jsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/renderer/component/channelTile/view.jsx b/src/renderer/component/channelTile/view.jsx index 28f725075..8edbc1e03 100644 --- a/src/renderer/component/channelTile/view.jsx +++ b/src/renderer/component/channelTile/view.jsx @@ -4,17 +4,14 @@ import CardMedia from 'component/cardMedia'; import TruncatedText from 'component/common/truncated-text'; import classnames from 'classnames'; import SubscribeButton from 'component/subscribeButton'; +import type { Claim } from 'types/claim'; type Props = { uri: string, isResolvingUri: boolean, totalItems: number, size: string, - claim: ?{ - claim_id: string, - name: string, - permanent_url: string, - }, + claim: ?Claim, resolveUri: string => void, navigate: (string, ?{}) => void, };