Skip to content

Commit

Permalink
style: removed padding container for proof request loading (#1338)
Browse files Browse the repository at this point in the history 
Signed-off-by: al-rosenthal <[email protected]>
  • Loading branch information
@al-rosenthal
al-rosenthal authored Nov 28, 2024
1 parent 9bf85b1 commit d488f21
Show file tree
Hide file tree
Showing 5 changed files with 452 additions and 485 deletions.
20 changes: 10 additions & 10 deletions packages/legacy/core/App/localization/en/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,10 @@ const translation = {
"Description": "Set how long you want to keep your activity history before it is deleted from your device (it is not stored anywhere else).",
"DeleteActivity": "Delete activity history after:",
"DeleteActivityAfter": {
"1month":"1 month",
"6month":"6 month",
"1year":"1 year",
"Always":"Always",
"1month": "1 month",
"6month": "6 month",
"1year": "1 year",
"Always": "Always",
},
"WarningDisclaimerAlert": {
"Title": "Past activity will be deleted",
Expand Down Expand Up @@ -344,7 +344,7 @@ const translation = {
"NoHistory": "No History",
},
"History": {
"SortFilterButton":"Sort/Filter",
"SortFilterButton": "Sort/Filter",
"SortBy": "Sort by",
"Sort": {
"Newest": "Newest to oldest",
Expand All @@ -369,7 +369,7 @@ const translation = {
"Close": "Close"
}
},
"Initial":{
"Initial": {
"Title": "Do you want to log your wallet activity?",
"Description": {
"Header": "This History section can list when:\n",
Expand All @@ -388,17 +388,17 @@ const translation = {
"DoNotLogWalletActivity": "Do not log any wallet activity"
}
},
"Button":"Sort/Filter",
"Button": "Sort/Filter",
"NoHistory": "You haven't used any cards yet.\n\nEach time you add or use a card, that activity will be saved here.",
"CardTitle":{
"CardTitle": {
"CardAccepted": "Card accepted:",
"CardDeclined": "Card declined:",
"CardExpired": "Card expired",
"CardRevoked": "Card revoked",
"InformationSent": "Information sent to:",
"WalletPinUpdated": "Wallet PIN updated",
},
"CardDescription":{
"CardDescription": {
"CardExpired": "{{cardName}} expired",
"CardRevoked": "{{cardName}} revoked",
"WalletPinUpdated": "New PIN set",
Expand Down Expand Up @@ -566,7 +566,7 @@ const translation = {
"CredentialOffer": "Loading credential offer...",
"YourOffer": "You're being offered a credential",
"ProofRequest": "Loading proof request...",
"YourRequest": "You're being requested for proof",
"YourRequest": "You'll be requested to share the following information.",
},
"ConnectionAlert": {
"AddedContacts": "Added to Contacts",
Expand Down
176 changes: 88 additions & 88 deletions packages/legacy/core/App/localization/fr/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@ const translation = {
},
"PINCreate": {
"Explainer": {
"PrimaryHeading": "Secure your Wallet (FR)",
"PINReminder": "On the following screen you will be asked to set up a strong <b>personal identification number</b> (PIN). (FR)",
"WhyNeedPin": {
"Header": "Why you need a PIN (FR)",
"Paragraph": "Your PIN is an important security feature: (FR)",
"ParagraphList1": "You can use your PIN instead of biometrics to open your wallet (FR)",
"ParagraphList2": "Or use your biometrics to open your wallet, and if your biometrics change change on your device you will need to use the PIN to authenticate your wallet (FR)"
}
"PrimaryHeading": "Secure your Wallet (FR)",
"PINReminder": "On the following screen you will be asked to set up a strong <b>personal identification number</b> (PIN). (FR)",
"WhyNeedPin": {
"Header": "Why you need a PIN (FR)",
"Paragraph": "Your PIN is an important security feature: (FR)",
"ParagraphList1": "You can use your PIN instead of biometrics to open your wallet (FR)",
"ParagraphList2": "Or use your biometrics to open your wallet, and if your biometrics change change on your device you will need to use the PIN to authenticate your wallet (FR)"
}
},
"Message": {
"CrossPatternValidation": "Un patron de croix a été détecté dans votre NIP. Veuillez saisir un NIP différent.",
Expand Down Expand Up @@ -295,112 +295,112 @@ const translation = {
"Description": "Set how long you want to keep your activity history before it is deleted from your device (it is not stored anywhere else).(fr)",
"DeleteActivity": "Delete activity history after:(fr)",
"DeleteActivityAfter": {
"1month":"1 month(fr)",
"6month":"6 month(fr)",
"1year":"1 year(fr)",
"Always":"Always(fr)",
"1month": "1 month(fr)",
"6month": "6 month(fr)",
"1year": "1 year(fr)",
"Always": "Always(fr)",
},
"WarningDisclaimerAlert": {
"Title": "Past activity will be deleted(fr)",
"Description": "Any activity before the period you've just selected will be deleted as soon as you save.(fr)"
"Title": "Past activity will be deleted(fr)",
"Description": "Any activity before the period you've just selected will be deleted as soon as you save.(fr)"
},
"SettingsSaved": "History settings saved(fr)",
"NoOptionSelectedError": "No option selected(fr)",
"StopKeepingHistory": "Stop keeping activity history(fr)",
"StoppedLoggingAlert": "You are not logging your activity history.(fr)",
"StoppedLoggingAlertYes": "Turn on activity history(fr)",
"DeleteActivityHistory": {
"Title": "Delete activity history(fr)",
"Description": "Individual history can be deleted in the history tab or you can delete all activity history. This action cannot be undone.(fr)",
"Link": "Delete all activity history(fr)"
"Title": "Delete activity history(fr)",
"Description": "Individual history can be deleted in the history tab or you can delete all activity history. This action cannot be undone.(fr)",
"Link": "Delete all activity history(fr)"
},
"StopActivityHistoryScreen": {
"Header": "Turn off activity history?(fr)",
"Title": "Are you sure you want to turn off history?(fr)",
"Description": "No further activity history will be kept in the Ontario Wallet. All previous history will remain.(fr)",
"Yes": "Yes turn off activity history(fr)",
"No": "No, go back(fr)"
"Header": "Turn off activity history?(fr)",
"Title": "Are you sure you want to turn off history?(fr)",
"Description": "No further activity history will be kept in the Ontario Wallet. All previous history will remain.(fr)",
"Yes": "Yes turn off activity history(fr)",
"No": "No, go back(fr)"
},
"StopActivityHistoryScreenConfirmed": {
"Header": "Activity history turned off(fr)",
"Title": "History turned off(fr)",
"Description": "The Ontario Wallet is no longer storing your activity history(fr)",
"Back": "Back to settings(fr)",
"Header": "Activity history turned off(fr)",
"Title": "History turned off(fr)",
"Description": "The Ontario Wallet is no longer storing your activity history(fr)",
"Back": "Back to settings(fr)",
},
"DeleteActivityHistoryScreen": {
"Header": "Delete all activity history?(fr)",
"Title": "Are you sure you want to delete all history?(fr)",
"Description": "You will not be able to get your activity history back after you delete it.(fr)",
"Yes": "Yes, delete all activity history(fr)",
"No": "No, go back(fr)"
"Header": "Delete all activity history?(fr)",
"Title": "Are you sure you want to delete all history?(fr)",
"Description": "You will not be able to get your activity history back after you delete it.(fr)",
"Yes": "Yes, delete all activity history(fr)",
"No": "No, go back(fr)"
},
"DeleteActivityHistoryScreenConfirmed": {
"Header": "History activty deleted(fr)",
"Title": "All history activity deleted(fr)",
"Description": "The Ontario Wallet deleted all your activity history.(fr)",
"Continue": "Continue(fr)",
"Header": "History activty deleted(fr)",
"Title": "All history activity deleted(fr)",
"Description": "The Ontario Wallet deleted all your activity history.(fr)",
"Continue": "Continue(fr)",
},
"NoHistory": "No History(fr)",
},
"History": {
"SortFilterButton":"Sort/Filter(fr)",
},
"History": {
"SortFilterButton": "Sort/Filter(fr)",
"SortBy": "Sort by(fr)",
"Sort": {
"Newest": "Newest to oldest(fr)",
"Oldest": "Oldest to Newest(fr)"
"Newest": "Newest to oldest(fr)",
"Oldest": "Oldest to Newest(fr)"
},
"Filter": {
"FilterByDate": "Filter by date range(fr)",
"Select": "Select(fr)",
"Today": "Today(fr)",
"Week": "Last week(fr)",
"Month": "Last 30 days(fr)",
"TwoMonth": "Last 60 days(fr)",
"ThreeMonth": "Last 90 days(fr)",
"Year": "This year(fr)",
"AllTime": "All time(fr)",
"FilterByActivity": "Filter by activity type(fr)",
"CardUpdates": "Card updates(fr)",
"InformationRequests": "Information requests(fr)",
"WalletPinUpdates": "Wallet PIN updates(fr)",
"Buttons": {
"Apply": "Apply filters(fr)",
"Close": "Close(fr)"
}
"FilterByDate": "Filter by date range(fr)",
"Select": "Select(fr)",
"Today": "Today(fr)",
"Week": "Last week(fr)",
"Month": "Last 30 days(fr)",
"TwoMonth": "Last 60 days(fr)",
"ThreeMonth": "Last 90 days(fr)",
"Year": "This year(fr)",
"AllTime": "All time(fr)",
"FilterByActivity": "Filter by activity type(fr)",
"CardUpdates": "Card updates(fr)",
"InformationRequests": "Information requests(fr)",
"WalletPinUpdates": "Wallet PIN updates(fr)",
"Buttons": {
"Apply": "Apply filters(fr)",
"Close": "Close(fr)"
}
},
"Initial":{
"Title": "Do you want to log your wallet activity?(fr)",
"Description": {
"Header": "This History section can list when:(fr)\n",
"PointA": "You have <b>shared information</b> with a verifier(fr)",
"PointAAxs": "You have shared information with a verifier(fr)",
"PointB": "A card is <b>accepted, revoked or expired(fr)</b>",
"PointBAxs": "A card is accepted, revoked or expired(fr)",
"PointC": "You have updated your <b>PIN</b>(fr)",
"PointCAxs": "You have updated your PIN(fr)",
"Footer": "\nYour wallet activity will <b>only be stored on your device</b>, and you can choose how often it is automatically deleted.(fr)",
"FooterAxs": "Your wallet activity will only be stored on your device, and you can choose how often it is automatically deleted.(fr)"
},
"Button": {
"SetUpHistoryLog": "Set up your History log(fr)",
"StartLoggingWalletActivity": "Start logging wallet activity(fr)",
"DoNotLogWalletActivity": "Do not log any wallet activity(fr)"
}
"Initial": {
"Title": "Do you want to log your wallet activity?(fr)",
"Description": {
"Header": "This History section can list when:(fr)\n",
"PointA": "You have <b>shared information</b> with a verifier(fr)",
"PointAAxs": "You have shared information with a verifier(fr)",
"PointB": "A card is <b>accepted, revoked or expired(fr)</b>",
"PointBAxs": "A card is accepted, revoked or expired(fr)",
"PointC": "You have updated your <b>PIN</b>(fr)",
"PointCAxs": "You have updated your PIN(fr)",
"Footer": "\nYour wallet activity will <b>only be stored on your device</b>, and you can choose how often it is automatically deleted.(fr)",
"FooterAxs": "Your wallet activity will only be stored on your device, and you can choose how often it is automatically deleted.(fr)"
},
"Button": {
"SetUpHistoryLog": "Set up your History log(fr)",
"StartLoggingWalletActivity": "Start logging wallet activity(fr)",
"DoNotLogWalletActivity": "Do not log any wallet activity(fr)"
}
},
"Button":"Sort/Filter(fr)",
"Button": "Sort/Filter(fr)",
"NoHistory": "You haven't used any cards yet.\n\nEach time you add or use a card, that activity will be saved here.(fr)",
"CardTitle":{
"CardAccepted": "Card accepted:(fr)",
"CardDeclined": "Card declined:(fr)",
"CardExpired": "Card expired(fr)",
"CardRevoked": "Card revoked(fr)",
"InformationSent": "Information sent to:(fr)",
"WalletPinUpdated": "Wallet PIN updated(fr)",
"CardTitle": {
"CardAccepted": "Card accepted:(fr)",
"CardDeclined": "Card declined:(fr)",
"CardExpired": "Card expired(fr)",
"CardRevoked": "Card revoked(fr)",
"InformationSent": "Information sent to:(fr)",
"WalletPinUpdated": "Wallet PIN updated(fr)",
},
"CardDescription":{
"CardExpired": "{{cardName}} expired(fr)",
"CardRevoked": "{{cardName}} revoked(fr)",
"WalletPinUpdated": "New PIN set(fr)",
"CardDescription": {
"CardExpired": "{{cardName}} expired(fr)",
"CardRevoked": "{{cardName}} revoked(fr)",
"WalletPinUpdated": "New PIN set(fr)",
},
"Today": "Today(fr)",
"UseHistoryCapability": "Enable history(fr)",
Expand Down Expand Up @@ -561,7 +561,7 @@ const translation = {
"CredentialOffer": "Loading credential offer... (FR)",
"YourOffer": "You're being offered a credential (FR)",
"ProofRequest": "Loading proof request... (FR)",
"YourRequest": "You're being requested for proof (FR)",
"YourRequest": "You'll be requested to share the following information. (FR)",
},
"ConnectionAlert": {
"AddedContacts": "Ajouté aux Contacts",
Expand Down
22 changes: 11 additions & 11 deletions packages/legacy/core/App/localization/pt-br/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,10 @@ const translation = {
"Description": "Set how long you want to keep your activity history before it is deleted from your device (it is not stored anywhere else).",
"DeleteActivity": "Delete activity history after:",
"DeleteActivityAfter": {
"1month":"1 month",
"6month":"6 month",
"1year":"1 year",
"Always":"Always",
"1month": "1 month",
"6month": "6 month",
"1year": "1 year",
"Always": "Always",
},
"WarningDisclaimerAlert": {
"Title": "Past activity will be deleted",
Expand Down Expand Up @@ -321,7 +321,7 @@ const translation = {
"NoHistory": "No History",
},
"History": {
"SortFilterButton":"Sort/Filter",
"SortFilterButton": "Sort/Filter",
"SortBy": "Sort by",
"Sort": {
"Newest": "Newest to oldest",
Expand All @@ -346,7 +346,7 @@ const translation = {
"Close": "Close"
}
},
"Initial":{
"Initial": {
"Title": "Do you want to log your wallet activity?",
"Description": {
"Header": "This History section can list when:\n",
Expand All @@ -365,17 +365,17 @@ const translation = {
"DoNotLogWalletActivity": "Do not log any wallet activity"
}
},
"Button":"Sort/Filter",
"Button": "Sort/Filter",
"NoHistory": "You haven't used any cards yet.\n\nEach time you add or use a card, that activity will be saved here.",
"CardTitle":{
"CardTitle": {
"CardAccepted": "Card accepted:",
"CardDeclined": "Card declined:",
"CardExpired": "Card expired",
"CardRevoked": "Card revoked",
"InformationSent": "Information sent to:",
"WalletPinUpdated": "Wallet PIN updated",
},
"CardDescription":{
"CardDescription": {
"CardExpired": "{{cardName}} expired",
"CardRevoked": "{{cardName}} revoked",
"WalletPinUpdated": "New PIN set",
Expand Down Expand Up @@ -541,8 +541,8 @@ const translation = {
"CredentialOffer": "Loading credential offer... (PT-BR)",
"YourOffer": "You're being offered a credential (PT-BR)",
"ProofRequest": "Loading proof request... (PT-BR)",
"YourRequest": "You're being requested for proof (PT-BR)",
},
"YourRequest": "You'll be requested to share the following information. (PT-BR)",
},
"ConnectionAlert": {
"AddedContacts": "Adicionado aos Contatos",
"WhatAreContacts": "O que são Contatos?",
Expand Down
27 changes: 9 additions & 18 deletions packages/legacy/core/App/screens/ProofRequest.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,6 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
color: ColorPallet.brand.link,
textDecorationLine: 'underline',
},
cardLoading: {
backgroundColor: ColorPallet.brand.secondaryBackground,
flex: 1,
flexGrow: 1,
marginVertical: 35,
borderRadius: 15,
},
})

useEffect(() => {
Expand Down Expand Up @@ -503,17 +496,15 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
</View>
)}
{loading || attestationLoading ? (
<View style={styles.cardLoading}>
<LoadingPlaceholder
workflowType={LoadingPlaceholderWorkflowType.ProofRequested}
timeoutDurationInMs={10000}
loadingProgressPercent={30}
onCancelTouched={async () => {
await handleDeclineTouched()
}}
testID={testIdWithKey('ProofRequestLoading')}
/>
</View>
<LoadingPlaceholder
workflowType={LoadingPlaceholderWorkflowType.ProofRequested}
timeoutDurationInMs={10000}
loadingProgressPercent={30}
onCancelTouched={async () => {
await handleDeclineTouched()
}}
testID={testIdWithKey('ProofRequestLoading')}
/>
) : (
<>
<ConnectionImage connectionId={proof?.connectionId} />
Expand Down
Loading

0 comments on commit d488f21

Please sign in to comment.