diff --git a/locales/en.json b/locales/en.json index dfe4e3b5d..74c6b67d4 100644 --- a/locales/en.json +++ b/locales/en.json @@ -88,6 +88,7 @@ "general.valid": "Valid", "general.invalid": "Invalid", "general.createdAt": "Created at", + "general.expiresAt": "Expires at", "general.id": "ID", "general.hash": "Hash", "general.kind": "Kind", @@ -102,6 +103,7 @@ "general.advanced": "Advanced", "general.clearChanges": "Clear changes", "general.destination": "Destination", + "general.state": "State", "restart.title": "Restart required", "restart.msg": "ZEUS has to be restarted before the new configuration is applied.", "restart.msg1": "Would you like to restart now?", @@ -910,6 +912,33 @@ "views.Sync.currentBlockHeight": "Current block height", "views.Sync.tip": "Tip", "views.Sync.numBlocksUntilSynced": "Number of blocks until synced", + "views.LSPS1.pubkeyAndHostNotFound": "Node pubkey and host are not set", + "views.LSPS1.timeoutError": "Did not receive response from server", + "views.LSPS1.channelExpiryBlocks": "Channel Expiry Blocks", + "views.LSPS1.maxChannelExpiryBlocks": "Max channel Expiry Blocks", + "views.LSPS1.clientBalance": "Client balance", + "views.LSPS1.confirmWithinBlocks": "Confirm within blocks", + "views.LSPS1.lspBalance": "LSP Balance", + "views.LSPS1.orderId": "Order ID", + "views.LSPS1.orderState": "Order state", + "views.LSPS1.miniFeeFor0Conf": "Min fee for 0 conf", + "views.LSPS1.minOnchainPaymentConfirmations": "Min Onchain Payment Confirmations", + "views.LSPS1.onchainPayment": "Onchain payment", + "views.LSPS1.totalOrderValue": "Total order value", + "views.LSPS1.initialLSPBalance": "Initial LSP Balance", + "views.LSPS1.initialClientBalance": "Initial Client Balance", + "views.LSPS1.minChannelConfirmations": "Min channel confirmations", + "views.LSPS1.minOnchainPaymentSize": "Min onchain payment size", + "views.LSPS1.supportZeroChannelReserve": "Support zero channel reserve", + "views.LSPS1.requiredChannelConfirmations": "Required channel confirmations", + "views.LSPS1.token": "Token", + "views.LSPS1.refundOnchainAddress": "Refund onchain address", + "views.LSPS1.getQuote": "Get quote", + "views.LSPS1.makePayment": "Make payment", + "views.LSPS1.goToSettings": "Go to settings", + "views.LSPS1.fundedAt": "Funded At", + "views.LSPS1.fundingOutpoint": "Funding outpoint", + "views.LSPS1.settings": "LSPS1 Settings", "components.UTXOPicker.modal.title": "Select UTXOs to use", "components.UTXOPicker.modal.description": "Select the UTXOs to be used in this operation. You may want to only use specific UTXOs to preserve your privacy.", "components.UTXOPicker.modal.set": "Set UTXOs", diff --git a/views/Settings/LSPS1/Order.tsx b/views/Settings/LSPS1/Order.tsx index ae8364efa..1bff355bb 100644 --- a/views/Settings/LSPS1/Order.tsx +++ b/views/Settings/LSPS1/Order.tsx @@ -15,6 +15,7 @@ import LoadingIndicator from '../../../components/LoadingIndicator'; import { themeColor } from '../../../utils/ThemeUtils'; import BackendUtils from '../../../utils/BackendUtils'; import UrlUtils from '../../../utils/UrlUtils'; +import { localeString } from '../../../utils/LocaleUtils'; import LSPStore from '../../../stores/LSPStore'; import SettingsStore from '../../../stores/SettingsStore'; @@ -51,7 +52,6 @@ export default class Orders extends React.Component { async componentDidMount() { const { LSPStore } = this.props; const orderId = this.props.navigation.getParam('orderId', null); - console.log('Order ID:', orderId); BackendUtils.supportsLSPS1rest() ? LSPStore.getOrderREST(orderId) @@ -231,7 +231,9 @@ export default class Orders extends React.Component { {result.announce_channel && ( { )} {result.channel_expiry_blocks && ( )} {result.client_balance_sat && ( { )} {result.funding_confirms_within_blocks && ( { )} {result.created_at && ( { )} {result.expires_at && ( { )} {result.lsp_balance_sat && ( { )} {result.order_id && ( )} {result.order_state && ( { } /> )} - + {payment.fee_total_sat && ( { {(payment.lightning_invoice || payment.bolt11_invoice) && ( { )} {payment.state && ( )} {payment.min_fee_for_0conf && ( )} {payment.min_onchain_payment_confirmations && ( { )} {payment.onchain_address && ( )} {payment.onchain_payment && ( )} {payment.order_total_sat && ( { )} {channel && ( <> - + { )} /> { )} /> { )} {result?.order_state !== 'COMPLETED' && (