From 84dc9f45bcbd62fa58af837f2f4f2e5ffa0427c8 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Thu, 19 Apr 2018 14:49:47 -0400 Subject: [PATCH] doShowSnackBar => doNotify --- src/renderer/component/address/index.js | 4 ++-- src/renderer/component/address/view.jsx | 9 ++++++--- src/renderer/component/shapeShift/index.js | 3 +-- src/renderer/component/shapeShift/view.jsx | 3 --- src/renderer/component/snackBar/index.js | 7 +++---- src/renderer/component/snackBar/view.jsx | 7 +++---- src/renderer/index.js | 7 +++++-- src/renderer/page/report/view.jsx | 6 +++--- src/renderer/redux/actions/user.js | 4 ++-- src/renderer/rewards.js | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/renderer/component/address/index.js b/src/renderer/component/address/index.js index b861b75c5..9aaa4a3bc 100644 --- a/src/renderer/component/address/index.js +++ b/src/renderer/component/address/index.js @@ -1,7 +1,7 @@ import { connect } from 'react-redux'; -import { doShowSnackBar } from 'redux/actions/app'; +import { doNotify } from 'lbry-redux'; import Address from './view'; export default connect(null, { - doShowSnackBar, + doNotify, })(Address); diff --git a/src/renderer/component/address/view.jsx b/src/renderer/component/address/view.jsx index 2beadfda3..25581bcc7 100644 --- a/src/renderer/component/address/view.jsx +++ b/src/renderer/component/address/view.jsx @@ -7,7 +7,7 @@ import * as icons from 'constants/icons'; type Props = { address: string, - doShowSnackBar: ({ message: string }) => void, + doNotify: ({ message: string, displayType: Array }) => void, }; export default class Address extends React.PureComponent { @@ -20,7 +20,7 @@ export default class Address extends React.PureComponent { input: ?HTMLInputElement; render() { - const { address, doShowSnackBar } = this.props; + const { address, doNotify } = this.props; return ( @@ -43,7 +43,10 @@ export default class Address extends React.PureComponent { icon={icons.CLIPBOARD} onClick={() => { clipboard.writeText(address); - doShowSnackBar({ message: __('Address copied') }); + doNotify({ + message: __('Address copied'), + displayType: ['snackbar'] + }); }} /> diff --git a/src/renderer/component/shapeShift/index.js b/src/renderer/component/shapeShift/index.js index 16ac8d4a7..1108589ab 100644 --- a/src/renderer/component/shapeShift/index.js +++ b/src/renderer/component/shapeShift/index.js @@ -6,7 +6,7 @@ import { clearShapeShift, getActiveShift, } from 'redux/actions/shape_shift'; -import { doShowSnackBar, selectReceiveAddress } from 'lbry-redux'; +import { selectReceiveAddress } from 'lbry-redux'; import { selectShapeShift } from 'redux/selectors/shape_shift'; import ShapeShift from './view'; @@ -21,5 +21,4 @@ export default connect(select, { createShapeShift, clearShapeShift, getActiveShift, - doShowSnackBar, })(ShapeShift); diff --git a/src/renderer/component/shapeShift/view.jsx b/src/renderer/component/shapeShift/view.jsx index ba383307e..effca455c 100644 --- a/src/renderer/component/shapeShift/view.jsx +++ b/src/renderer/component/shapeShift/view.jsx @@ -14,7 +14,6 @@ type Props = { createShapeShift: Dispatch, clearShapeShift: Dispatch, getActiveShift: Dispatch, - doShowSnackBar: Dispatch, shapeShiftInit: Dispatch, receiveAddress: string, }; @@ -37,7 +36,6 @@ class ShapeShift extends React.PureComponent { shapeShift, clearShapeShift, getActiveShift, - doShowSnackBar, } = this.props; const { @@ -107,7 +105,6 @@ class ShapeShift extends React.PureComponent { shiftOrderId={shiftOrderId} shiftState={shiftState} clearShapeShift={clearShapeShift} - doShowSnackBar={doShowSnackBar} originCoinDepositMax={originCoinDepositMax} originCoinDepositMin={originCoinDepositMin} originCoinDepositFee={originCoinDepositFee} diff --git a/src/renderer/component/snackBar/index.js b/src/renderer/component/snackBar/index.js index fc5cbf57e..55ea7e0a1 100644 --- a/src/renderer/component/snackBar/index.js +++ b/src/renderer/component/snackBar/index.js @@ -1,14 +1,13 @@ import { connect } from 'react-redux'; -import { doRemoveSnackBarSnack } from 'redux/actions/app'; -import { selectSnackBarSnacks } from 'redux/selectors/app'; +import { selectSnack, doHideNotification } from 'lbry-redux'; import SnackBar from './view'; const perform = dispatch => ({ - removeSnack: () => dispatch(doRemoveSnackBarSnack()), + removeSnack: () => dispatch(doHideNotification()), }); const select = state => ({ - snacks: selectSnackBarSnacks(state), + snack: selectSnack(state), }); export default connect(select, perform)(SnackBar); diff --git a/src/renderer/component/snackBar/view.jsx b/src/renderer/component/snackBar/view.jsx index 0fdfeef3f..9d03c2562 100644 --- a/src/renderer/component/snackBar/view.jsx +++ b/src/renderer/component/snackBar/view.jsx @@ -4,7 +4,7 @@ import Button from 'component/button'; type Props = { removeSnack: any => void, - snacks: { + snack: ?{ linkTarget: ?string, linkText: ?string, message: string, @@ -20,14 +20,13 @@ class SnackBar extends React.PureComponent { } render() { - const { snacks, removeSnack } = this.props; + const { snack, removeSnack } = this.props; - if (!snacks.length) { + if (!snack) { this.hideTimeout = null; // should be unmounting anyway, but be safe? return null; } - const snack = snacks[0]; const { message, linkText, linkTarget } = snack; if (this.hideTimeout === null) { diff --git a/src/renderer/index.js b/src/renderer/index.js index b81edfd2c..60167d2df 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -10,9 +10,9 @@ import { Provider } from 'react-redux'; import { doConditionalAuthNavigate, doDaemonReady, - doShowSnackBar, doAutoUpdate, } from 'redux/actions/app'; +import { doNotify } from 'lbry-redux'; import { doNavigate } from 'redux/actions/navigation'; import { doDownloadLanguages, doUpdateIsNightAsync } from 'redux/actions/settings'; import { doUserEmailVerify } from 'redux/actions/user'; @@ -38,7 +38,10 @@ ipcRenderer.on('open-uri-requested', (event, uri, newSession) => { app.store.dispatch(doConditionalAuthNavigate(newSession)); app.store.dispatch(doUserEmailVerify(verification.token, verification.recaptcha)); } else { - app.store.dispatch(doShowSnackBar({ message: 'Invalid Verification URI' })); + app.store.dispatch(doNotify({ + message: 'Invalid Verification URI', + displayType: ['snackbar'] + })); } } else { app.store.dispatch(doNavigate('/show', { uri })); diff --git a/src/renderer/page/report/view.jsx b/src/renderer/page/report/view.jsx index 37b651603..2a2be198d 100644 --- a/src/renderer/page/report/view.jsx +++ b/src/renderer/page/report/view.jsx @@ -1,8 +1,7 @@ import React from 'react'; import Button from 'component/button'; import { FormRow } from 'component/common/form'; -import { Lbry } from 'lbry-redux'; -import { doShowSnackBar } from 'redux/actions/app'; +import { Lbry, doNotify } from 'lbry-redux'; class ReportPage extends React.Component { constructor(props) { @@ -32,7 +31,8 @@ class ReportPage extends React.Component { }); // Display global notice - const action = doShowSnackBar({ + const action = doNotify({ + displayType: ['snackbar'], message: __('Message received! Thanks for helping.'), isError: false, }); diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js index 16799fab0..730e0f3b2 100644 --- a/src/renderer/redux/actions/user.js +++ b/src/renderer/redux/actions/user.js @@ -2,7 +2,6 @@ import * as ACTIONS from 'constants/action_types'; import * as MODALS from 'constants/modal_types'; import Lbryio from 'lbryio'; import { doNotify } from 'lbry-redux'; -import { doShowSnackBar } from 'redux/actions/app'; import { doClaimRewardType, doRewardList } from 'redux/actions/rewards'; import { selectEmailToVerify, @@ -293,7 +292,8 @@ export function doUserInviteNew(email) { }); dispatch( - doShowSnackBar({ + doNotify({ + displayType: ['snackbar'], message: __('Invite sent to %s', email), }) ); diff --git a/src/renderer/rewards.js b/src/renderer/rewards.js index f55e26b45..a3d26b3b7 100644 --- a/src/renderer/rewards.js +++ b/src/renderer/rewards.js @@ -1,4 +1,4 @@ -import { Lbry, doShowSnackBar } from 'lbry-redux'; +import { Lbry, doNotify } from 'lbry-redux'; import Lbryio from 'lbryio'; function rewardMessage(type, amount) { @@ -51,7 +51,7 @@ rewards.claimReward = type => { const message = rewardMessage(type, reward.reward_amount); // Display global notice - const action = doShowSnackBar({ + const action = doNotify({ message, linkText: __('Show All'), linkTarget: '/rewards',