Merge branch 'master' of github.com:GoodDollar/GoodCollective into kr…

…is/show-more-link
GoodDollar · Feb 7, 2024 · 16e730c · 16e730c
2 parents 72dcd5d + b8306b9
commit 16e730c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -104,7 +104,7 @@ function App(): JSX.Element {
 const styles = StyleSheet.create({
   body: {
     backgroundColor: Colors.gray[400],
-    minHeight: '100vh',
+    height: 'auto',
   },
 });
 

diff --git a/packages/app/src/components/RowItem.tsx b/packages/app/src/components/RowItem.tsx
@@ -25,14 +25,15 @@ function RowItem({ rowInfo, rowData, balance, currency, imageUrl }: RowItemProps
         <Image source={{ uri: imageUrl }} style={styles.rowIcon} />
         <Text style={styles.rowInfo}>{rowInfo}</Text>
       </View>
-      <View style={styles.rowData}>
-        <Text style={{ gap: 2 }}>
-          <Text>
+      <View style={{ gap: 2 }}>
+        {!currency && <Text style={styles.rowData}>{rowData}</Text>}
+        {currency && (
+          <Text style={styles.rowData}>
             <Text>{currency}</Text> <Text style={{ ...InterRegular }}>{rowData}</Text>
-            {isDesktopResolution && currency && <Text style={styles.rowBalance}> = {usdBalance} USD</Text>}
+            {isDesktopResolution && <Text style={styles.rowBalance}> = {usdBalance} USD</Text>}
           </Text>
-          {!isDesktopResolution && currency && <Text style={styles.rowBalance}>= {usdBalance} USD</Text>}
-        </Text>
+        )}
+        {!isDesktopResolution && currency && <Text style={styles.rowBalance}>= {usdBalance} USD</Text>}
       </View>
     </View>
   );
@@ -61,6 +62,7 @@ const styles = StyleSheet.create({
     maxWidth: '60%',
     fontWeight: '700',
     fontSize: 16,
+    lineHeight: 24,
     color: Colors.black,
     ...InterSemiBold,
   },
@@ -72,13 +74,14 @@ const styles = StyleSheet.create({
     color: Colors.gray[100],
     textAlign: 'right',
     fontSize: 16,
+    lineHeight: 24,
     ...InterSemiBold,
-    gap: 2,
   },
   rowBalance: {
     fontSize: 12,
     textAlign: 'right',
     color: Colors.gray[200],
+    lineHeight: 18,
     ...InterRegular,
   },
 });

diff --git a/packages/app/src/lib/formatTime.ts b/packages/app/src/lib/formatTime.ts
@@ -1,5 +1,5 @@
 import moment from 'moment';
 
 export const formatTime = (timestamp: number): string => {
-  return moment.unix(timestamp).format('MMM D, h:mma');
+  return moment.unix(timestamp).format('MMMM D, YYYY');
 };