Skip to content

Commit

Permalink
Merge branch 'main' into sc-23204
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniellemaxwell
daniellemaxwell authored Jan 5, 2024
2 parents dd267e1 + 3553cda commit 596c23c
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 37 deletions.
2 changes: 1 addition & 1 deletion web/gds-user-ui/src/components/Collaborators/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const CollaboratorsSection: React.FC = () => {
onClose();
};
return (
<FormLayout overflowX={'scroll'}>
<FormLayout overflowX={'auto'}>
<Table variant="simple">
<TableCaption placement="top" textAlign="end" p={0} m={0} mb={3} fontSize={20}>
<Tooltip
Expand Down
67 changes: 33 additions & 34 deletions web/gds-user-ui/src/components/Section/SearchDirectory.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
<AutoCompleteInput
variant="outline"
placeholder="Common name or VASP ID"
autoFocus
/>

<AutoCompleteList>
Expand All @@ -112,7 +111,7 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
setSearch(oid);
handleSubmit(e, oid);
}}
textTransform="capitalize">
>
{oid}
</AutoCompleteItem>
))}
Expand Down Expand Up @@ -180,80 +179,84 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
<Box>
<Tabs colorScheme="blue">
<TabList border={'1px solid #eee'}>
<Tab
<Tab
sx={{ width: '100%' }}
_focus={{ outline: 'none' }}
_selected={{ bg: colors.system.blue, color: 'white', fontWeight: 'semibold' }}>
<Text fontSize={['x-small', 'medium']}>
<Trans id="TESTNET DIRECTORY RECORD">TESTNET DIRECTORY RECORD</Trans>
<Trans id="MAINNET DIRECTORY RECORD">MAINNET DIRECTORY RECORD</Trans>
</Text>
</Tab>
<Tab
sx={{ width: '100%' }}
_focus={{ outline: 'none' }}
_selected={{ bg: colors.system.blue, color: 'white', fontWeight: 'semibold' }}>
<Text fontSize={['x-small', 'medium']}>
<Trans id="MAINNET DIRECTORY RECORD">MAINNET DIRECTORY RECORD</Trans>
<Trans id="TESTNET DIRECTORY RECORD">TESTNET DIRECTORY RECORD</Trans>
</Text>
</Tab>
</TabList>
<TabPanels>
<TabPanel p={0} border="1px solid #eee">
<TabPanel p={0} border="1px solid #eee">
<TableContainer>
<Table
variant="simple"
sx={{ 'td:first-child': { fontWeight: 'semibold', width: '50%' } }}>
sx={{
'td:first-child': { fontWeight: 'semibold', width: '50%' },
'td:last-child': { width: '50%' }
}}>
<Tbody>
<Tr>
<Td>
<Trans id="Organization Name">Organization Name</Trans>
</Td>
<Td colSpan={2}>{result?.testnet?.name || 'N/A'}</Td>
<Td colSpan={2}>{result?.mainnet?.name || 'N/A'} </Td>
</Tr>
<Tr>
<Td>
<Trans id="Common Name">Common Name</Trans>
</Td>
<Td>{result?.testnet?.common_name || 'N/A'}</Td>
<Td>{result?.mainnet?.common_name || 'N/A'}</Td>
</Tr>
<Tr>
<Td>
<Trans id="TRISA Service Endpoint">TRISA Service Endpoint</Trans>
</Td>
<Td>{result?.testnet?.endpoint || 'N/A'}</Td>
<Td>{result?.mainnet?.endpoint || 'N/A'}</Td>
</Tr>
<Tr>
<Td>
<Trans id="Registered Directory">Registered Directory</Trans>
<Trans id="Registered Directory"></Trans>
</Td>
<Td>{result?.testnet?.registered_directory || 'N/A'}</Td>
<Td>{result?.mainnet?.registered_directory || 'N/A'}</Td>
</Tr>
<Tr>
<Td>
<Trans id="TRISA Member ID">TRISA Member ID</Trans>
<Trans id="TRISA Member ID"></Trans>
</Td>
<Td>{result?.testnet?.id || 'N/A'}</Td>
<Td>{result?.mainnet?.id || 'N/A'}</Td>
</Tr>

<Tr>
<Td>
<Trans id="Country">Country</Trans>
</Td>
<Td>
{getCountryName(result?.testnet?.country as IsoCountryCode)}
{getCountryName(result?.mainnet?.country as IsoCountryCode)}
{' '}
{countryCodeEmoji(result?.testnet?.country) || 'N/A'}
{countryCodeEmoji(result?.mainnet?.country) || 'N/A'}
</Td>
</Tr>

<Tr>
<Td>
<Trans id="TRISA Verification">TRISA Verification</Trans>
</Td>
{result?.testnet?.verified_on ? (
{result?.mainnet?.verified_on ? (
<Td>
{' '}
<Trans id="VERIFIED ON">VERIFIED ON</Trans>{' '}
{result?.testnet?.verified_on}{' '}
{result?.mainnet?.verified_on}{' '}
</Td>
) : (
<Td>N/A</Td>
Expand All @@ -267,62 +270,58 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
<TableContainer>
<Table
variant="simple"
sx={{
'td:first-child': { fontWeight: 'semibold', width: '50%' },
'td:last-child': { width: '50%' }
}}>
sx={{ 'td:first-child': { fontWeight: 'semibold', width: '50%' } }}>
<Tbody>
<Tr>
<Td>
<Trans id="Organization Name">Organization Name</Trans>
</Td>
<Td colSpan={2}>{result?.mainnet?.name || 'N/A'} </Td>
<Td colSpan={2}>{result?.testnet?.name || 'N/A'}</Td>
</Tr>
<Tr>
<Td>
<Trans id="Common Name">Common Name</Trans>
</Td>
<Td>{result?.mainnet?.common_name || 'N/A'}</Td>
<Td>{result?.testnet?.common_name || 'N/A'}</Td>
</Tr>
<Tr>
<Td>
<Trans id="TRISA Service Endpoint">TRISA Service Endpoint</Trans>
</Td>
<Td>{result?.mainnet?.endpoint || 'N/A'}</Td>
<Td>{result?.testnet?.endpoint || 'N/A'}</Td>
</Tr>
<Tr>
<Td>
<Trans id="Registered Directory"></Trans>
<Trans id="Registered Directory">Registered Directory</Trans>
</Td>
<Td>{result?.mainnet?.registered_directory || 'N/A'}</Td>
<Td>{result?.testnet?.registered_directory || 'N/A'}</Td>
</Tr>
<Tr>
<Td>
<Trans id="TRISA Member ID"></Trans>
<Trans id="TRISA Member ID">TRISA Member ID</Trans>
</Td>
<Td>{result?.mainnet?.id || 'N/A'}</Td>
<Td>{result?.testnet?.id || 'N/A'}</Td>
</Tr>

<Tr>
<Td>
<Trans id="Country">Country</Trans>
</Td>
<Td>
{getCountryName(result?.mainnet?.country as IsoCountryCode)}
{getCountryName(result?.testnet?.country as IsoCountryCode)}
{' '}
{countryCodeEmoji(result?.mainnet?.country) || 'N/A'}
{countryCodeEmoji(result?.testnet?.country) || 'N/A'}
</Td>
</Tr>

<Tr>
<Td>
<Trans id="TRISA Verification">TRISA Verification</Trans>
</Td>
{result?.mainnet?.verified_on ? (
{result?.testnet?.verified_on ? (
<Td>
{' '}
<Trans id="VERIFIED ON">VERIFIED ON</Trans>{' '}
{result?.mainnet?.verified_on}{' '}
{result?.testnet?.verified_on}{' '}
</Td>
) : (
<Td>N/A</Td>
Expand Down
2 changes: 1 addition & 1 deletion web/gds-user-ui/src/components/Sidebar/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const Sidebar: React.FC<SidebarProps> = ({ children }) => {
</DrawerContent>
</Drawer>
<MobileNav onOpen={onOpen} />
<Box ml={{ base: 0, md: 274 }} pt={10} px="10" height="100%" overflow="scroll">
<Box ml={{ base: 0, md: 274 }} pt={10} px="10" height="100%" overflow="auto">
{children}
</Box>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion web/gds-user-ui/src/modules/dashboard/member/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const MemberPage: React.FC = () => {
</Heading>
<Suspense fallback={<Loader />}>
<DirectoryNotification />
<FormLayout overflowX={'scroll'}>
<FormLayout overflowX={'auto'}>
<MemberHeader />
<MemberSelectNetwork />
<MemberTable />
Expand Down

0 comments on commit 596c23c

Please sign in to comment.