From ef12914cad179d7c9ba9c1258ff0172a021c4737 Mon Sep 17 00:00:00 2001 From: infiinte-persistence Date: Thu, 1 Oct 2020 16:53:46 +0800 Subject: [PATCH] Rebranding: 'Publish' --> 'Upload'; Use LBC icon --- ui/modal/modalPublishPreview/view.jsx | 25 ++++++++++++++++++++----- ui/page/settingsAdvanced/view.jsx | 2 +- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ui/modal/modalPublishPreview/view.jsx b/ui/modal/modalPublishPreview/view.jsx index 6c1edcd70..42976ad94 100644 --- a/ui/modal/modalPublishPreview/view.jsx +++ b/ui/modal/modalPublishPreview/view.jsx @@ -7,6 +7,7 @@ import Card from 'component/common/card'; import Tag from 'component/tag'; import MarkdownPreview from 'component/common/markdown-preview'; import { COPYRIGHT, OTHER } from 'constants/licenses'; +import LbcSymbol from 'component/common/lbc-symbol'; type Props = { filePath: string | WebFile, @@ -97,8 +98,8 @@ class ModalPublishPreview extends React.PureComponent { isStillEditing, } = this.props; - const modalTitle = isStillEditing ? __('Confirm Edit') : __('Confirm Publish'); - const confirmBtnText = isStillEditing ? __('Save') : __('Publish'); + const modalTitle = isStillEditing ? __('Confirm Edit') : __('Confirm Upload'); + const confirmBtnText = isStillEditing ? __('Save') : __('Upload'); const txFee = previewResponse ? previewResponse['total_fee'] : null; const isOptimizeAvail = filePath && filePath !== '' && isVid && ffmpegStatus.available; @@ -125,6 +126,17 @@ class ModalPublishPreview extends React.PureComponent { // Do nothing for onClick(). Setting to 'null' results in "View Tag" action -- we don't want to leave the modal. tags.map(tag => {}} />); + const depositValue = bid ? :

---

; + + let priceValue = __('Free'); + if (!contentIsFree) { + if (fee.currency === 'LBC') { + priceValue = ; + } else { + priceValue = `${fee.amount} ${fee.currency}`; + } + } + return (
this.onConfirmed()}> @@ -141,8 +153,8 @@ class ModalPublishPreview extends React.PureComponent { {this.createRow(__('Description'), descriptionValue)} {this.createRow(__('Channel'), channel)} {this.createRow(__('URL'), uri)} - {this.createRow(__('Deposit'), bid ? `${bid} LBC` : '---')} - {this.createRow(__('Price'), contentIsFree ? __('Free') : `${fee.amount} ${fee.currency}`)} + {this.createRow(__('Deposit'), depositValue)} + {this.createRow(__('Price'), priceValue)} {this.createRow(__('Language'), language)} {this.createRow(__('License'), licenseValue)} {this.createRow(__('Tags'), tagsValue)} @@ -151,7 +163,10 @@ class ModalPublishPreview extends React.PureComponent { {txFee && (
- {__('Est. transaction fee:')}  {txFee} LBC + {__('Est. transaction fee:')}   + + +
)} diff --git a/ui/page/settingsAdvanced/view.jsx b/ui/page/settingsAdvanced/view.jsx index 1a31cd79a..83dad8729 100644 --- a/ui/page/settingsAdvanced/view.jsx +++ b/ui/page/settingsAdvanced/view.jsx @@ -507,7 +507,7 @@ class SettingsPage extends React.PureComponent { /> )} - } /> + } /> {/* @if TARGET='app' */} {/* Auto launch in a hidden state doesn't work on mac https://github.com/Teamwork/node-auto-launch/issues/81 */}