diff --git a/api/logics.py b/api/logics.py index a9101dfc..2805807d 100644 --- a/api/logics.py +++ b/api/logics.py @@ -1574,7 +1574,7 @@ class Logics: Summarizes a finished order. Returns a dict with amounts, fees, costs, etc, for buyer and seller. ''' - if order.status != Order.Status.SUC: + if not order.status in [Order.Status.EXP, Order.Status.SUC, Order.Status.PAY, Order.Status.FAI]: return False, {'bad_summary':'Order has not finished yet'} context = {} diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js index 2e2c654b..c82b25b9 100644 --- a/frontend/src/components/App.js +++ b/frontend/src/components/App.js @@ -1,4 +1,4 @@ -import React, { Component } from "react"; +import React, { Component , Suspense } from "react"; import ReactDOM from 'react-dom/client'; import HomePage from "./HomePage"; import { CssBaseline, IconButton , Link} from "@mui/material"; @@ -36,6 +36,7 @@ export default class App extends Component { render() { return ( + @@ -48,6 +49,7 @@ export default class App extends Component { + ); } } diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js index d70a8dbd..92ad87ff 100644 --- a/frontend/src/components/BottomBar.js +++ b/frontend/src/components/BottomBar.js @@ -294,15 +294,17 @@ bottomBarDesktop =()=>{ } LangSelect = () => { - const { i18n} = this.props; + const { i18n } = this.props; + const lang = i18n.resolvedLanguage == null ? 'en' : i18n.resolvedLanguage.substring(0,2); const flagProps = { width: 20, height: 20, }; + return(