Order view

frontend/src/components/OrderDetails/index.tsx

@@ -259,23 +259,26 @@ const OrderDetails = ({
           setOpenWorldmap(false);
         }}
       />
-      <Grid item xs={12}>
+      <List dense={true} style={{ width: '100%' }}>
-        <List dense={true}>
         <ListItemButton
           onClick={() => {
             onClickCoordinator();
           }}
         >
           <Grid container direction='row' justifyContent='center' alignItems='center'>
-              <Grid item xs={2}>
+            <Grid item sx={{ width: '64px' }}>
               <RobotAvatar
                 shortAlias={coordinator.federated ? coordinator.shortAlias : undefined}
                 hashId={coordinator.federated ? undefined : coordinator.mainnet.onion}
                 small={true}
                 smooth={true}
+                style={{
+                  height: '45px',
+                  width: '45px',
+                }}
               />
             </Grid>
-              <Grid item xs={4}>
+            <Grid item>
               <ListItemText primary={coordinator.longAlias} secondary={t('Order host')} />
             </Grid>
           </Grid>
@@ -283,7 +286,7 @@ const OrderDetails = ({
         {coordinator?.info && !coordinator?.info?.swap_enabled && (
           <ListItem>
             <Grid sx={{ marginBottom: 1 }}>
-                <Alert severity='warning' sx={{ marginTop: 2 }}>
+              <Alert severity='warning'>
                 {t('This coordinator does not support on-chain swaps.')}
               </Alert>
             </Grid>
@@ -481,31 +484,24 @@ const OrderDetails = ({
 
         <Divider />
 
-          <ListItem>
+        <Grid container direction='row' justifyContent='center' alignItems='center'>
+          <ListItem style={{ width: '50%' }}>
             <ListItemIcon>
               <Numbers />
             </ListItemIcon>
-            <Grid container>
-              <Grid item xs={4.5}>
             <ListItemText primary={currentOrder?.id} secondary={t('Order ID')} />
-              </Grid>
+          </ListItem>
-              <Grid item xs={7.5}>
+
-                <Grid container>
+          <ListItem style={{ width: '50%' }}>
-                  <Grid item xs={2}>
+            <ListItemIcon>
-                    <ListItemIcon sx={{ position: 'relative', top: '12px', left: '-5px' }}>
               <HourglassTop />
             </ListItemIcon>
-                  </Grid>
-                  <Grid item xs={10}>
             <ListItemText
               primary={timerRenderer(currentOrder?.escrow_duration)}
-                      secondary={t('Deposit timer')}
+              secondary={t('Deposit')}
-                    ></ListItemText>
+            />
-                  </Grid>
-                </Grid>
-              </Grid>
-            </Grid>
           </ListItem>
+        </Grid>
 
         {/* if order is in a status that does not expire, do not show countdown */}
         <Collapse in={![4, 5, 12, 13, 14, 15, 16, 17, 18].includes(currentOrder?.status ?? 0)}>
@@ -530,7 +526,7 @@ const OrderDetails = ({
 
       {/* If the user has a penalty/limit */}
       {currentOrder?.penalty !== undefined ? (
-          <Grid item xs={12}>
+        <Grid item style={{ width: '100%' }}>
           <Alert severity='warning' sx={{ borderRadius: '0' }}>
             <Countdown
               date={new Date(currentOrder?.penalty ?? '')}
@@ -543,7 +539,7 @@ const OrderDetails = ({
       )}
 
       {!currentOrder?.is_participant ? (
-          <Grid item xs={12}>
+        <Grid item style={{ width: '100%', padding: '8px' }}>
           <TakeButton
             currentOrder={currentOrder}
             info={coordinator.info}
@@ -554,7 +550,6 @@ const OrderDetails = ({
         <></>
       )}
     </Grid>
-    </Grid>
   );
 };
 

frontend/src/components/TradeBox/EncryptedChat/EncryptedSocketChat/index.tsx

@@ -351,7 +351,7 @@ const EncryptedSocketChat: React.FC<Props> = ({
           />
         </Paper>
         <form noValidate onSubmit={onButtonClicked}>
-          <Grid alignItems='stretch' style={{ display: 'flex', width: '100%' }}>
+          <Grid alignItems='stretch' style={{ display: 'flex', width: '100%', marginTop: '8px' }}>
             <Grid item alignItems='stretch' style={{ display: 'flex' }} xs={9}>
               <TextField
                 label={t('Type a message')}

frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx

@@ -332,7 +332,7 @@ const EncryptedTurtleChat: React.FC<Props> = ({
           />
         </Paper>
         <form noValidate onSubmit={onButtonClicked}>
-          <Grid alignItems='stretch' style={{ display: 'flex', width: '100%' }}>
+          <Grid alignItems='stretch' style={{ display: 'flex', width: '100%', marginTop: '8px' }}>
             <Grid item alignItems='stretch' style={{ display: 'flex' }} xs={9}>
               <TextField
                 label={t('Type a message')}

frontend/src/components/TradeBox/Prompts/Expired.tsx

@@ -19,14 +19,17 @@ export const ExpiredPrompt = ({
   const { t } = useTranslation();
 
   return (
-    <Grid container spacing={1}>
+    <Grid container direction='row'>
-      <Grid item xs={12}>
+      <Grid item style={{ width: '100%' }}>
         <Typography variant='body2' align='center'>
           {t(order.expiry_message)}
         </Typography>
       </Grid>
       {order.is_maker ? (
-        <Grid item xs={12} style={{ display: 'flex', justifyContent: 'center' }}>
+        <Grid
+          item
+          style={{ display: 'flex', justifyContent: 'center', width: '100%', marginTop: '8px' }}
+        >
           <LoadingButton
             loading={loadingRenew}
             variant='outlined'

frontend/src/components/TradeBox/index.tsx

@@ -827,7 +827,7 @@ const TradeBox = ({ currentOrder, onStartAgain }: TradeBoxProps): React.JSX.Elem
           <></>
         )}
 
-        <Grid item>
+        <Grid item style={{ paddingTop: '8px' }}>
           <CancelButton
             order={currentOrder ?? null}
             onClickCancel={cancel}

frontend/static/locales/ca.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Mètodes de pagament acceptats",
   "Amount of Satoshis": "Quantitat de Sats",
-  "Deposit timer": "Per a dipositar",
+  "Deposit": "Dipositar",
   "Expires in": "Expira en",
   "F2F location": "Ubicació F2F",
   "Order Details": "Detalls",

frontend/static/locales/cs.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Akceptované platební metody",
   "Amount of Satoshis": "Částka Satoshi",
-  "Deposit timer": "Časovač vkladu",
+  "Deposit": "Časovač vkladu",
   "Expires in": "Vyprší za",
   "F2F location": "F2F location",
   "Order Details": "Detaily nabídky",

frontend/static/locales/de.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Akzeptierte Zahlungsweisen",
   "Amount of Satoshis": "Anzahl Satoshis",
-  "Deposit timer": "Einzahlungstimer",
+  "Deposit": "Einzahlungstimer",
   "Expires in": "Läuft ab in",
   "F2F location": "F2F location",
   "Order Details": "Order-Details",

frontend/static/locales/en.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Accepted payment methods",
   "Amount of Satoshis": "Amount of Satoshis",
-  "Deposit timer": "Deposit timer",
+  "Deposit": "Deposit",
   "Expires in": "Expires in",
   "F2F location": "F2F location",
   "Order Details": "Order Details",

frontend/static/locales/es.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Métodos de pago aceptados",
   "Amount of Satoshis": "Cantidad de Sats",
-  "Deposit timer": "Tiempo para depositar",
+  "Deposit": "Depósito",
   "Expires in": "Expira en",
   "F2F location": "F2F location",
   "Order Details": "Detalles",

frontend/static/locales/eu.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Onartutako ordainketa moduak",
   "Amount of Satoshis": "Satoshi kopurua",
-  "Deposit timer": "Gordailu tenporizadorea",
+  "Deposit": "Gordailu tenporizadorea",
   "Expires in": "Iraungitze denbora",
   "F2F location": "F2F location",
   "Order Details": "Xehetasunak",

frontend/static/locales/fr.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Modes de paiement acceptés",
   "Amount of Satoshis": "Montant de Satoshis",
-  "Deposit timer": "Deposit timer",
+  "Deposit": "Deposit",
   "Expires in": "Expire en",
   "F2F location": "F2F location",
   "Order Details": "Détails de l'ordre",

frontend/static/locales/it.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Metodi di pagamento accettati",
   "Amount of Satoshis": "Quantità di sats",
-  "Deposit timer": "Per depositare",
+  "Deposit": "Per depositare",
   "Expires in": "Scade in",
   "F2F location": "Luogo F2F",
   "Order Details": "Dettagli",

frontend/static/locales/ja.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "受け付ける支払い方法",
   "Amount of Satoshis": "サトシの金額",
-  "Deposit timer": "デポジットタイマー",
+  "Deposit": "デポジットタイマー",
   "Expires in": "有効期限",
   "F2F location": "F2F location",
   "Order Details": "注文の詳細",

frontend/static/locales/pl.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Akceptowane metody płatności",
   "Amount of Satoshis": "Ilość Satoshis",
-  "Deposit timer": "Deposit timer",
+  "Deposit": "Deposit",
   "Expires in": "Wygasa za",
   "F2F location": "F2F location",
   "Order Details": "Szczegóły zamówienia",

frontend/static/locales/pt.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Métodos de pagamento aceitos",
   "Amount of Satoshis": "Quantidade de Satoshis",
-  "Deposit timer": "Temporizador de depósito",
+  "Deposit": "Depósito",
   "Expires in": "Expira em",
   "F2F location": "F2F location",
   "Order Details": "Detalhes da ordem",

frontend/static/locales/ru.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Способ(ы) оплаты",
   "Amount of Satoshis": "Количество Сатоши",
-  "Deposit timer": "Таймер депозита",
+  "Deposit": "депозита",
   "Expires in": "Истекает через",
   "F2F location": "F2F локация",
   "Order Details": "Детали ордера",

frontend/static/locales/sv.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Accepterade betalningsmetoder",
   "Amount of Satoshis": "Summa sats",
-  "Deposit timer": "Insättningstimer",
+  "Deposit": "Insättningstimer",
   "Expires in": "Förfaller om",
   "F2F location": "F2F location",
   "Order Details": "Orderdetaljer",

frontend/static/locales/sw.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "Njia za malipo zilizokubaliwa",
   "Amount of Satoshis": "Kiasi cha Satoshis",
-  "Deposit timer": "Muda wa Amana",
+  "Deposit": "Muda wa Amana",
   "Expires in": "Inamalizika ndani ya",
   "F2F location": "F2F location",
   "Order Details": "Maelezo ya Agizo",

frontend/static/locales/th.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "วิธีชำระเงินเฟียตที่รองรับ",
   "Amount of Satoshis": "ปริมาณ Satoshis",
-  "Deposit timer": "ผู้ขายต้องวางเหรียญที่จะขายภายใน",
+  "Deposit": "ผู้ขายต้องวางเหรียญที่จะขายภายใน",
   "Expires in": "หมดอายุใน",
   "F2F location": "F2F location",
   "Order Details": "รายละเอียดรายการ",

frontend/static/locales/zh-SI.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "接受的付款方法",
   "Amount of Satoshis": "聪金额",
-  "Deposit timer": "存款倒计时",
+  "Deposit": "存款倒计时",
   "Expires in": "内到期",
   "F2F location": "F2F location",
   "Order Details": "订单详情",

frontend/static/locales/zh-TR.json

@@ -450,7 +450,7 @@
   "#44": "Phrases in components/OrderDetails/index.tsx",
   "Accepted payment methods": "接受的付款方法",
   "Amount of Satoshis": "聰金額",
-  "Deposit timer": "存款計時器",
+  "Deposit": "存款計時器",
   "Expires in": "內到期",
   "F2F location": "F2F location",
   "Order Details": "訂單詳情",