Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1300/claims cutoff ios #1308

Merged
merged 5 commits into from
May 15, 2019
Merged

1300/claims cutoff ios #1308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
08c1397
Fix claims cut-off issue on iOS
saifahn May 13, 2019
96ab0b1
Add border to claim cards
saifahn May 13, 2019
2122e7b
Update test snapshots
saifahn May 13, 2019
ee1bebc
Merge branch 'develop' into 1300/claims-cutoff-ios
chunningham May 15, 2019
e040d29
Merge branch 'develop' into 1300/claims-cutoff-ios
chunningham May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ui/home/components/credentialCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ export class CredentialCard extends React.Component<Props, State> {
flexDirection: 'row',
backgroundColor: JolocomTheme.primaryColorWhite,
paddingVertical: 12,
marginBottom: '1%',
borderBottomWidth: 1,
borderColor: 'rgb(236, 236, 236)',
},
})

Expand Down
10 changes: 6 additions & 4 deletions src/ui/home/components/credentialOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ interface State {}

const styles = StyleSheet.create({
sectionHeader: {
marginTop: '5%',
marginHorizontal: '5%',
height: 26,
marginTop: 30,
marginBottom: 10,
paddingLeft: 16,
fontSize: 17,
fontFamily: JolocomTheme.contentFontFamily,
color: 'rgba(0, 0, 0, 0.38)',
},
scrollComponent: {
width: '100%',
Expand All @@ -47,7 +48,7 @@ export class CredentialOverview extends React.Component<Props, State> {
claimsState.decoratedCredentials[category] || []
).sort((a, b) => (a.credentialType > b.credentialType ? 1 : -1))

return categorizedCredentials.map((claim: DecoratedClaims) => {
return categorizedCredentials.map((claim: DecoratedClaims, index) => {
const filteredKeys = Object.keys(claim.claimData).filter(
el => el !== 'id',
)
Expand All @@ -68,6 +69,7 @@ export class CredentialOverview extends React.Component<Props, State> {
collapsible={collapsible(claim)}
rightIcon={selfSigned ? <MoreIcon /> : null}
leftIcon={getCredentialIconByType(claim.credentialType)}
containerStyle={index === 0 ? { borderTopWidth: 1 } : undefined}
/>
)
})
Expand Down
6 changes: 4 additions & 2 deletions tests/ui/components/__snapshots__/credentialCard.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ exports[`ClaimCard component matches the snapshot of a two line claim 1`] = `
Array [
Object {
"backgroundColor": "white",
"borderBottomWidth": 1,
"borderColor": "rgb(236, 236, 236)",
"flexDirection": "row",
"marginBottom": "1%",
"paddingVertical": 12,
},
Object {},
Expand Down Expand Up @@ -46,8 +47,9 @@ exports[`ClaimCard component matches the snapshot on render 1`] = `
Array [
Object {
"backgroundColor": "white",
"borderBottomWidth": 1,
"borderColor": "rgb(236, 236, 236)",
"flexDirection": "row",
"marginBottom": "1%",
"paddingVertical": 12,
},
Object {},
Expand Down