From 28260c27d1201325db1424bfb8a1f8cf35c761b7 Mon Sep 17 00:00:00 2001 From: infinite-persistence Date: Wed, 10 Mar 2021 14:36:02 +0800 Subject: [PATCH] SendLBC: switch from Modal to Page --- static/app-strings.json | 1 + ui/component/router/view.jsx | 2 ++ ui/component/walletBalance/view.jsx | 7 +------ ui/component/walletSend/view.jsx | 2 +- ui/constants/modal_types.js | 1 - ui/constants/pages.js | 1 + ui/modal/modalRouter/view.jsx | 3 --- ui/modal/modalWalletSend/index.js | 14 -------------- ui/modal/modalWalletSend/view.jsx | 16 ---------------- ui/page/send/index.js | 6 ++++++ ui/page/send/view.jsx | 26 ++++++++++++++++++++++++++ ui/scss/component/_main.scss | 5 +++++ 12 files changed, 43 insertions(+), 41 deletions(-) delete mode 100644 ui/modal/modalWalletSend/index.js delete mode 100644 ui/modal/modalWalletSend/view.jsx create mode 100644 ui/page/send/index.js create mode 100644 ui/page/send/view.jsx diff --git a/static/app-strings.json b/static/app-strings.json index 762f58bd4..1a6631a2e 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -115,6 +115,7 @@ "Recipient address": "Recipient address", "Send": "Send", "Receive Credits": "Receive Credits", + "Send Credits": "Send Credits", "Address copied.": "Address copied.", "Get New Address": "Get New Address", "Show QR code": "Show QR code", diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx index 2efd9d403..92e3c751e 100644 --- a/ui/component/router/view.jsx +++ b/ui/component/router/view.jsx @@ -47,6 +47,7 @@ import ChannelNew from 'page/channelNew'; import RepostNew from 'page/repost'; import BuyPage from 'page/buy'; import ReceivePage from 'page/receive'; +import SendPage from 'page/send'; import NotificationsPage from 'page/notifications'; import SignInWalletPasswordPage from 'page/signInWalletPassword'; import YoutubeSyncPage from 'page/youtubeSync'; @@ -283,6 +284,7 @@ function AppRouter(props: Props) { + diff --git a/ui/component/walletBalance/view.jsx b/ui/component/walletBalance/view.jsx index eec9d2864..6746d5c36 100644 --- a/ui/component/walletBalance/view.jsx +++ b/ui/component/walletBalance/view.jsx @@ -154,12 +154,7 @@ const WalletBalance = (props: Props) => {
{(otherCount > WALLET_CONSOLIDATE_UTXOS || consolidateIsPending || consolidatingUtxos) && (

diff --git a/ui/component/walletSend/view.jsx b/ui/component/walletSend/view.jsx index ad6cca189..62989a45e 100644 --- a/ui/component/walletSend/view.jsx +++ b/ui/component/walletSend/view.jsx @@ -41,7 +41,7 @@ class WalletSend extends React.PureComponent { return ( } + title={__('Send Credits')} subtitle={ }}> Send LBRY Credits to your friends or favorite creators. diff --git a/ui/constants/modal_types.js b/ui/constants/modal_types.js index 503f43ded..df738d65c 100644 --- a/ui/constants/modal_types.js +++ b/ui/constants/modal_types.js @@ -31,7 +31,6 @@ export const WALLET_DECRYPT = 'wallet_decrypt'; export const WALLET_UNLOCK = 'wallet_unlock'; export const WALLET_SYNC = 'wallet_sync'; export const WALLET_PASSWORD_UNSAVE = 'wallet_password_unsave'; -export const WALLET_SEND = 'wallet_send'; export const CREATE_CHANNEL = 'create_channel'; export const YOUTUBE_WELCOME = 'youtube_welcome'; export const SET_REFERRER = 'set_referrer'; diff --git a/ui/constants/pages.js b/ui/constants/pages.js index dfb00af73..2623d581e 100644 --- a/ui/constants/pages.js +++ b/ui/constants/pages.js @@ -58,6 +58,7 @@ exports.CHECKOUT = 'checkout'; exports.CODE_2257 = '2257'; exports.BUY = 'buy'; exports.RECEIVE = 'receive'; +exports.SEND = 'send'; exports.CHANNEL_NEW = 'channel/new'; exports.NOTIFICATIONS = 'notifications'; exports.YOUTUBE_SYNC = 'youtube'; diff --git a/ui/modal/modalRouter/view.jsx b/ui/modal/modalRouter/view.jsx index 6bb3eda21..992e72af8 100644 --- a/ui/modal/modalRouter/view.jsx +++ b/ui/modal/modalRouter/view.jsx @@ -28,7 +28,6 @@ import ModalWalletUnlock from 'modal/modalWalletUnlock'; import ModalRewardCode from 'modal/modalRewardCode'; import ModalPasswordUnsave from 'modal/modalPasswordUnsave'; import ModalCommentAcknowledgement from 'modal/modalCommentAcknowledgement'; -import ModalWalletSend from 'modal/modalWalletSend'; import ModalYoutubeWelcome from 'modal/modalYoutubeWelcome'; import ModalSetReferrer from 'modal/modalSetReferrer'; import ModalSignOut from 'modal/modalSignOut'; @@ -119,8 +118,6 @@ function ModalRouter(props: Props) { return ; case MODALS.COMMENT_ACKNOWEDGEMENT: return ; - case MODALS.WALLET_SEND: - return ; case MODALS.YOUTUBE_WELCOME: return ; case MODALS.SET_REFERRER: diff --git a/ui/modal/modalWalletSend/index.js b/ui/modal/modalWalletSend/index.js deleted file mode 100644 index fe7889090..000000000 --- a/ui/modal/modalWalletSend/index.js +++ /dev/null @@ -1,14 +0,0 @@ -import { connect } from 'react-redux'; -import { doHideModal } from 'redux/actions/app'; -import WalletSend from './view'; - -const select = state => ({}); - -const perform = { - doHideModal, -}; - -export default connect( - select, - perform -)(WalletSend); diff --git a/ui/modal/modalWalletSend/view.jsx b/ui/modal/modalWalletSend/view.jsx deleted file mode 100644 index 247a19a08..000000000 --- a/ui/modal/modalWalletSend/view.jsx +++ /dev/null @@ -1,16 +0,0 @@ -// @flow -import React from 'react'; -import WalletSend from 'component/walletSend'; -import { Modal } from 'modal/modal'; - -type Props = { doHideModal: () => void }; - -const WalletSendModal = (props: Props) => { - const { doHideModal } = props; - return ( - - - - ); -}; -export default WalletSendModal; diff --git a/ui/page/send/index.js b/ui/page/send/index.js new file mode 100644 index 000000000..80835d570 --- /dev/null +++ b/ui/page/send/index.js @@ -0,0 +1,6 @@ +import { connect } from 'react-redux'; +import SendPage from './view'; + +const select = (state) => ({}); + +export default connect(select, null)(SendPage); diff --git a/ui/page/send/view.jsx b/ui/page/send/view.jsx new file mode 100644 index 000000000..4cd2c7beb --- /dev/null +++ b/ui/page/send/view.jsx @@ -0,0 +1,26 @@ +// @flow +import React from 'react'; +import Page from 'component/page'; +import LbcSymbol from 'component/common/lbc-symbol'; +import WalletSend from 'component/walletSend'; + +type Props = {}; + +export default function SendPage(props: Props) { + return ( + + + + ), + }} + > + + + ); +} diff --git a/ui/scss/component/_main.scss b/ui/scss/component/_main.scss index 60c0d65b0..6e362b5eb 100644 --- a/ui/scss/component/_main.scss +++ b/ui/scss/component/_main.scss @@ -256,6 +256,11 @@ } } +.main--send { + @extend .main--buy; + max-width: 34rem; +} + .main--empty { align-self: center; display: flex;