diff --git a/src/renderer/component/categoryList/view.jsx b/src/renderer/component/categoryList/view.jsx index 9583eb912..559bdcaf8 100644 --- a/src/renderer/component/categoryList/view.jsx +++ b/src/renderer/component/categoryList/view.jsx @@ -155,7 +155,7 @@ class CategoryList extends PureComponent { if (currentCardVisible && previousCard) { const scrollTarget = previousCard.offsetLeft; - this.handleScroll(scrollTarget); + this.handleScroll(scrollTarget - cards[0].offsetLeft); break; } diff --git a/src/renderer/component/fileCard/view.jsx b/src/renderer/component/fileCard/view.jsx index aa247ee5a..06b5db10d 100644 --- a/src/renderer/component/fileCard/view.jsx +++ b/src/renderer/component/fileCard/view.jsx @@ -99,7 +99,9 @@ class FileCard extends React.PureComponent { const handleContextMenu = event => { event.preventDefault(); event.stopPropagation(); - openCopyLinkMenu(convertToShareLink(claim.permanent_url), event); + if (claim) { + openCopyLinkMenu(convertToShareLink(claim.permanent_url), event); + } }; // We should be able to tab through cards @@ -119,11 +121,13 @@ class FileCard extends React.PureComponent {
-
- {pending ?
Pending...
: } -
-
- +
+
+ {pending ?
Pending...
: } +
+
+ +
diff --git a/src/renderer/component/walletSendTip/view.jsx b/src/renderer/component/walletSendTip/view.jsx index a49c43f75..1a3e970fc 100644 --- a/src/renderer/component/walletSendTip/view.jsx +++ b/src/renderer/component/walletSendTip/view.jsx @@ -1,7 +1,7 @@ // @flow import React from 'react'; import Button from 'component/button'; -import { FormField } from 'component/common/form'; +import { FormField, FormRow } from 'component/common/form'; import type { Claim } from 'types/claim'; type Props = { @@ -74,48 +74,43 @@ class WalletSendTip extends React.PureComponent { const { tipAmount, tipError } = this.state; return ( -
- this.handleSupportPriceChange(event)} - helper={ -

- {__(`This will appear as a tip for "${title}".`)}{' '} -

+
+
- + ); } } diff --git a/src/renderer/modal/modal.jsx b/src/renderer/modal/modal.jsx index 80b4ee553..508bcee64 100644 --- a/src/renderer/modal/modal.jsx +++ b/src/renderer/modal/modal.jsx @@ -72,7 +72,7 @@ export class Modal extends React.PureComponent {

{title}

)} -
{children}
+ {children} {type === 'custom' ? null : ( // custom modals define their own buttons