From ee445e0cffe51420e68fe783e3c5dc15bec7070e Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Tue, 10 May 2022 11:44:12 -0700 Subject: [PATCH] Fix last warnings --- .../src/components/AutocompletePayments.js | 22 ++++++------ frontend/src/components/BookPage.js | 4 +-- frontend/src/components/BottomBar.js | 5 +-- frontend/src/components/MakerPage.js | 3 +- frontend/src/components/OrderPage.js | 2 +- frontend/src/components/TradeBox.js | 34 +++++++++++++------ 6 files changed, 43 insertions(+), 27 deletions(-) diff --git a/frontend/src/components/AutocompletePayments.js b/frontend/src/components/AutocompletePayments.js index f2540cd7..949166da 100644 --- a/frontend/src/components/AutocompletePayments.js +++ b/frontend/src/components/AutocompletePayments.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; import { useAutocomplete } from '@mui/base/AutocompleteUnstyled'; import { styled } from '@mui/material/styles'; -import { Button} from "@mui/material"; +import { Button, Tooltip } from "@mui/material"; import { paymentMethods, swapDestinations } from "./payment-methods/Methods"; // Icons @@ -238,15 +238,17 @@ export default function AutocompletePayments(props) { return (
-
- - - {value.map((option, index) => ( - - ))} - - -
+ +
+ + + {value.map((option, index) => ( + + ))} + + +
+ {groupedOptions.length > 0 ? (
diff --git a/frontend/src/components/BookPage.js b/frontend/src/components/BookPage.js index 1c5f26ff..eac6186f 100644 --- a/frontend/src/components/BookPage.js +++ b/frontend/src/components/BookPage.js @@ -171,7 +171,7 @@ class BookPage extends Component { ) }} pageSize={this.props.bookLoading ? 0 : this.state.pageSize} - rowsPerPageOptions={[6,20,50]} + rowsPerPageOptions={[0,6,20,50]} onPageSizeChange={(newPageSize) => this.setState({pageSize:newPageSize})} onRowClick={(params) => this.handleRowClick(params.row.id)} // Whole row is clickable, but the mouse only looks clickly in some places. /> @@ -275,7 +275,7 @@ class BookPage extends Component { ) }} pageSize={this.props.bookLoading ? 0 : this.state.pageSize} - rowsPerPageOptions={[6,20,50]} + rowsPerPageOptions={[0,6,20,50]} onPageSizeChange={(newPageSize) => this.setState({pageSize:newPageSize})} onRowClick={(params) => this.handleRowClick(params.row.id)} // Whole row is clickable, but the mouse only looks clickly in some places. diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js index 1b73540f..114d52c4 100644 --- a/frontend/src/components/BottomBar.js +++ b/frontend/src/components/BottomBar.js @@ -298,7 +298,7 @@ class BottomBar extends Component { - + { + (hasOrder ? t("You have an active order"):"")} + > 0 & !this.state.profileShown) ? "": null} color="primary"> - - diff --git a/frontend/src/components/OrderPage.js b/frontend/src/components/OrderPage.js index c0f031a4..10d9e0ec 100644 --- a/frontend/src/components/OrderPage.js +++ b/frontend/src/components/OrderPage.js @@ -614,7 +614,7 @@ class OrderPage extends Component { - + {/* If the user has a penalty/limit */} diff --git a/frontend/src/components/TradeBox.js b/frontend/src/components/TradeBox.js index e8ecd14a..c01cff20 100644 --- a/frontend/src/components/TradeBox.js +++ b/frontend/src/components/TradeBox.js @@ -666,11 +666,13 @@ class TradeBox extends Component { {t("A dispute has been opened")} - - - {t("Please, submit your statement. Be clear and specific about what happened and provide the necessary evidence. You MUST provide a contact method: burner email, XMPP or telegram username to follow up with the staff. Disputes are solved at the discretion of real robots (aka humans), so be as helpful as possible to ensure a fair outcome. Max 5000 chars.")} - - + + + + + {t("Please, submit your statement. Be clear and specific about what happened and provide the necessary evidence. You MUST provide a contact method: burner email, XMPP or telegram username to follow up with the staff. Disputes are solved at the discretion of real robots (aka humans), so be as helpful as possible to ensure a fair outcome. Max 5000 chars.")} + + + + {this.showBondIsSettled()} )} @@ -703,11 +707,21 @@ class TradeBox extends Component { {t("We have the statements")} - - -

{t("Both statements have been received, wait for the staff to resolve the dispute. If you are hesitant about the state of the dispute or want to add more information, contact robosats@protonmail.com. If you did not provide a contact method, or are unsure whether you wrote it right, write us immediately.")}

-

{t("Please, save the information needed to identify your order and your payments: order ID; payment hashes of the bonds or escrow (check on your lightning wallet); exact amount of satoshis; and robot nickname. You will have to identify yourself as the user involved in this trade via email (or other contact methods).")}

- + + + + + + {t("Both statements have been received, wait for the staff to resolve the dispute. If you are hesitant about the state of the dispute or want to add more information, contact robosats@protonmail.com. If you did not provide a contact method, or are unsure whether you wrote it right, write us immediately.")} + + + + + {t("Please, save the information needed to identify your order and your payments: order ID; payment hashes of the bonds or escrow (check on your lightning wallet); exact amount of satoshis; and robot nickname. You will have to identify yourself as the user involved in this trade via email (or other contact methods).")} + + + + {this.showBondIsSettled()}