Merge branch 'main' into fix/bff-third-party-login

island-is · Dec 9, 2024 · 6440e84 · 6440e84
2 parents 06c8551 + f6eea1c
commit 6440e84
Showing 1 changed file with 40 additions and 1 deletion.
diff --git a/apps/native/app/src/screens/wallet-pass/components/field-render.tsx b/apps/native/app/src/screens/wallet-pass/components/field-render.tsx
@@ -1,6 +1,7 @@
 import { Field, FieldCard, FieldGroup, FieldLabel, FieldRow } from '@ui'
 import React from 'react'
 import { View } from 'react-native'
+import { useTheme } from 'styled-components'
 import {
   GenericLicenseDataField,
   GenericLicenseType,
@@ -15,6 +16,7 @@ export const FieldRender = ({
   level?: number
   licenseType?: GenericLicenseType
 }) => {
+  const theme = useTheme()
   return (
     <>
       {(data || []).map(
@@ -45,7 +47,44 @@ export const FieldRender = ({
             case 'Group':
               if (label) {
                 return (
-                  <View key={key} style={{ marginTop: 24, paddingBottom: 4 }}>
+                  <View
+                    key={key}
+                    style={{
+                      marginTop: theme.spacing[3],
+                      paddingBottom: theme.spacing.smallGutter,
+                    }}
+                  >
+                    <FieldLabel>{label}</FieldLabel>
+                    {FieldRender({
+                      data: fields as GenericLicenseDataField[],
+                      level: 2,
+                      licenseType: licenseType,
+                    })}
+                  </View>
+                )
+              }
+              return (
+                <FieldGroup key={key}>
+                  <View>
+                    {FieldRender({
+                      data: fields as GenericLicenseDataField[],
+                      level: 2,
+                      licenseType: licenseType,
+                    })}
+                  </View>
+                </FieldGroup>
+              )
+
+            case 'Table':
+              if (label) {
+                return (
+                  <View
+                    key={key}
+                    style={{
+                      marginTop: theme.spacing[3],
+                      paddingBottom: theme.spacing.smallGutter,
+                    }}
+                  >
                     <FieldLabel>{label}</FieldLabel>
                     {FieldRender({
                       data: fields as GenericLicenseDataField[],