improvements & translations

bitpay · Jul 6, 2022 · 0269720 · 0269720
1 parent 4c1b888
commit 0269720
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/locales/en/translation.json b/locales/en/translation.json
@@ -693,7 +693,8 @@
   "Connected to": "Connected to",
   "Linked Wallet": "Linked Wallet",
   "Pending Requests": "Pending Requests",
-  "Created on": "Created on {{createdOn}}",
+  "Created on": "Created on {{date}}",
+  "Created ": "Created {{date}}",
   "No pending requests": "No pending requests",
   "WalletConnect is an open source protocol for connecting decentralized applications to mobile wallets with QR code scanning or deep linking.": "WalletConnect is an open source protocol for connecting decentralized applications to mobile wallets with QR code scanning or deep linking.",
   "Learn More": "Learn More",

diff --git a/locales/es/translation.json b/locales/es/translation.json
@@ -693,7 +693,8 @@
   "Connected to": "Conectado a",
   "Linked Wallet": "Billetera vinculada",
   "Pending Requests": "Solicitudes pendientes",
-  "Created on": "Creado el {{createdOn}}",
+  "Created on": "Creado el {{date}}",
+  "Created ": "Creado {{date}}",
   "No pending requests": "No hay solicitudes pendientes",
   "WalletConnect is an open source protocol for connecting decentralized applications to mobile wallets with QR code scanning or deep linking.": "WalletConnect es un protocolo de código abierto para conectar aplicaciones descentralizadas a billeteras móviles con escaneo de código QR o con un enlace profundo.",
   "Learn More": "Aprender más",

diff --git a/src/navigation/wallet-connect/screens/WalletConnectHome.tsx b/src/navigation/wallet-connect/screens/WalletConnectHome.tsx
@@ -46,7 +46,11 @@ import {Wallet} from '../../../store/wallet/wallet.models';
 import {convertHexToNumber} from '@walletconnect/utils';
 import {OnGoingProcessMessages} from '../../../components/modal/ongoing-process/OngoingProcess';
 import {useTranslation} from 'react-i18next';
-import {GetAmFormatDate} from '../../../store/wallet/utils/time';
+import {
+  GetAmFormatDate,
+  GetAmTimeAgo,
+  WithinPastDay,
+} from '../../../store/wallet/utils/time';
 
 export type WalletConnectHomeParamList = {
   peerId: string;
@@ -337,13 +341,20 @@ const WalletConnectHome = () => {
                     <ItemNoteContainer>
                       <View style={{alignItems: 'flex-end'}}>
                         <IconLabel>{amountStr}</IconLabel>
-                        {request.createdOn ? (
-                          <Smallest style={{marginRight: 12}}>
-                            {t('Created on', {
-                              createdOn: GetAmFormatDate(request.createdOn),
-                            })}
-                          </Smallest>
-                        ) : null}
+                        {request.createdOn &&
+                          (WithinPastDay(request.createdOn) ? (
+                            <Smallest style={{marginRight: 12}}>
+                              {t('Created on', {
+                                date: GetAmFormatDate(request.createdOn),
+                              })}
+                            </Smallest>
+                          ) : (
+                            <Smallest style={{marginRight: 12}}>
+                              {t('Created ', {
+                                date: GetAmTimeAgo(request.createdOn),
+                              })}
+                            </Smallest>
+                          ))}
                       </View>
                       <IconContainer>
                         <AngleRight />