Skip to content

Commit

Permalink
chore: update text (#410)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: martines3000 <[email protected]>
  • Loading branch information
Vid201 and martines3000 authored Aug 13, 2023
1 parent c66616a commit 8139e02
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 33 deletions.
2 changes: 1 addition & 1 deletion packages/dapp/src/components/VPModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function VPModal({ isOpen, setOpen, vp }: VPModalProps) {
<div className="w-[48rem] max-w-full">
<div className="mt-5">
<p className="text-md dark:text-navy-blue-200 text-gray-600">
Here is a presentation consisting of selected credentials.
Here is a presentation created from selected credentials.
</p>
</div>
<div className="mt-5">
Expand Down
2 changes: 1 addition & 1 deletion packages/dapp/src/components/VerifyDataDisplay/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const VerifyDataDisplay = () => {
'min-h-[60vh] w-full resize-none rounded-2xl bg-gray-100 p-2 text-gray-700 focus:outline-none'
)}
value={data}
placeholder="Paste your Credential or Presentation here!"
placeholder="Paste your Verifiable Credential or Verifiable Presentation here!"
onChange={(e) => {
setData(e.target.value);
setValid({ checked: false, valid: false });
Expand Down
30 changes: 15 additions & 15 deletions packages/dapp/src/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@
"title": "Connection QR Code"
},
"CreateCredentialDisplay": {
"invalidMethod": "PolygonID & Iden3 are not yet supported. Switch to any other DID method to create a VC!",
"invalidMethod": "Polygon ID & Iden3 are not yet supported. Switch to any other DID method to create a VC!",
"options": {
"format": "Format",
"title": "OPTIONS"
},
"save": {
"description": "Would you like to save newly created Credential in Masca?",
"select-storage-placeholder": "Select storage",
"select-storage-placeholder": "Select data storage",
"storage": "Storage",
"title": "Save"
},
Expand All @@ -93,12 +93,12 @@
"title": "ADVANCED",
"tooltip": "Only applicable to JWT proof format."
},
"invalidMethod": "PolygonID & Iden3 methods are not yet supported. Switch to any other DID method to create a VC!",
"invalidMethod": "Polygon ID & Iden3 methods are not yet supported. Switch to any other DID method to create a VC!",
"options": {
"format": "Format",
"title": "OPTIONS"
},
"polygonvc": "PolygonID & Iden3 VCs are not yet supported. Remove invalid VCs to continue!",
"polygonvc": "Polygon ID & Iden3 VCs are not yet supported. Remove invalid VCs to continue!",
"table": {
"issuer": "ISSUER",
"remove": "REMOVE",
Expand All @@ -108,12 +108,12 @@
},
"title": "Create Presentation",
"tooltip": {
"polygonid": "PolygonID VCs aren't supported yet. Please remove this credential to continue!"
"polygonid": "Polygon ID VCs aren't supported yet. Please remove this credential to continue!"
}
},
"CredentialDisplay": {
"create-presentation": "Create Verifiable Presentation",
"datastores": "DATASTORES",
"datastores": "DATA STORES",
"title": "Verifiable Credential"
},
"CredentialModal": {
Expand Down Expand Up @@ -200,14 +200,14 @@
},
"FriendlydAppTable": {
"add-failed": "Failed to add Friendly dApp",
"add-masca": "Add Masca.io to friendly dApps",
"added": "Friendly dApp Added",
"add-masca": "Add Masca.io to Friendly dApps",
"added": "Friendly dApp added",
"adding": "Adding Friendly dApp",
"remove-failed": "Failed to remove Friendly dApp",
"removed": "Friendly dApp Removed",
"removed": "Friendly dApp removed",
"removing": "Removing Friendly dApp",
"app-url": "Application URL",
"popups-desc": "Disabling popups is very dangerous. We recommend setting friendly dApps instead!"
"popups-desc": "Disabling pop-ups is very dangerous. We recommend setting friendly dApps instead!"
},
"GetCredential": {
"handling": "Handling credential offer",
Expand Down Expand Up @@ -289,16 +289,16 @@
"title": "Select Credentials"
},
"SettingsCard": {
"popups": "Popups",
"popups-desc": "Disabling popups is very dangerous. We recommend setting friendly dApps instead!",
"popups": "Pop-ups",
"popups-desc": "Disabling pop-ups is very dangerous. We recommend setting friendly dApps instead!",
"ceramic-error": "Failed to toggle Ceramic",
"ceramic-success": "Successfully toggled Ceramic",
"data-store": "Data Stores",
"disable-popups": "Disable Popups",
"disable-popups": "Disable Pop-ups",
"data-store-desc": "Enable or disable data stores. Data stores are places where VCs are stored.",
"not-implemented": "Not implemented yet",
"title": "Settings",
"backup": "Backup",
"backup": "Backup State",
"export": "Export",
"export-success": "Successfully exported backup",
"export-error": "Failed to export backup",
Expand All @@ -309,7 +309,7 @@
"import-desc": "Import encrypted Masca backup from a file."
},
"VerifyDataDisplay": {
"title": "Verify Presentations & Credentials",
"title": "Verify Credentials & Presentations",
"toast": {
"error-json": "Data is not a valid JSON",
"error-type": "Data is not a valid VC/VP",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/docs/ssi/did.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ A DID consists of a cryptographic key pair (a public and a private key), allowin

### Structure of a DID

DID is just a simple string consisting of three parts:
DID is just a simple string made up of three parts:

- `did` URI scheme identifier,
- the identifier for the DID Method, and
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/docs/tutorial/implementation.md
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,9 @@ const vpRes = await api.verifyData({ presentation: VP, verbose: true });

### Snap Settings

`togglePopups` is used to enable/disable the `"Are you sure?"` alerts on any dApp. Popups are enabled by default for user to approve every action.
`togglePopups` is used to enable/disable the `"Are you sure?"` alerts on any dApp. Pop-ups are enabled by default for user to approve every action.

`addFriendlyDapp` is used to add a current dApp (origin of the dApp) to the list of friendly dApps. Popups do not appear on friendly dApps.
`addFriendlyDapp` is used to add a current dApp (origin of the dApp) to the list of friendly dApps. Pop-ups do not appear on friendly dApps.

`removeFriendlyDapp` is used to remove a dApp from the list of friendly dApps.

Expand Down
4 changes: 2 additions & 2 deletions packages/docs/docs/tutorial/rpc-methods.md
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ const response = await ethereum.request({

#### Description

`togglePopups` toggles popups that show up whenever the user tries to save a VC, generate a VP, etc. Popups are enabled by default to keep user in total control of their actions. With popups disabled, a dApp can query user's credentials, etc. without them knowing. We recommend using `addFriendlyDapp` instead to only trust specific dApps.
`togglePopups` toggles pop-ups that show up whenever the user tries to save a VC, generate a VP, etc. Pop-ups are enabled by default to keep user in total control of their actions. With pop-ups disabled, a dApp can query user's credentials, etc. without them knowing. We recommend using `addFriendlyDapp` instead to only trust specific dApps.

```typescript
const response = await ethereum.request({
Expand All @@ -445,7 +445,7 @@ const response = await ethereum.request({

#### Description

`addFriendlyDapp` adds the current dApp (origin of the current dApp) to the list of friendly dApps. Friendly dApps do not show popups.
`addFriendlyDapp` adds the current dApp (origin of the current dApp) to the list of friendly dApps. Friendly dApps do not show pop-ups.

```typescript
const response = await ethereum.request({
Expand Down
2 changes: 1 addition & 1 deletion packages/snap/src/General.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class GeneralService {
state[CURRENT_STATE_VERSION].config.dApp.disablePopups = true;
return state[CURRENT_STATE_VERSION].config.dApp.disablePopups;
}
throw new Error('User rejected popup toggle.');
throw new Error('User rejected pop-up toggle.');
} else {
state[CURRENT_STATE_VERSION].config.dApp.disablePopups = false;
return state[CURRENT_STATE_VERSION].config.dApp.disablePopups;
Expand Down
12 changes: 5 additions & 7 deletions packages/snap/src/UI.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,12 @@ class UIService {
const uiPanel = panel([
heading('Share Verifiable Credentials'),
...this.originWrapper,
text(
'Would you like to share some/all Verifiable Credentials with this dApp?'
),
text('Would you like to share Verifiable Credentials with this dApp?'),
divider(),
text(`**Total number of VCs is ${vcs.length.toString()}**`),
divider(),
text(
`You can disable this popup from appearing again in Masca Settings on Masca.io.`
`You can disable this pop-up from appearing again in Settings on Masca.io.`
),
]);

Expand Down Expand Up @@ -197,9 +195,9 @@ class UIService {

static togglePopupsDialog = async () => {
const uiPanel = panel([
heading('Toggle Popups'),
heading('Toggle Pop-ups'),
...this.originWrapper,
text('Would you like to turn off popups?'),
text('Would you like to turn off pop-ups?'),
divider(),
text(
'This can result in a better user experience, but you will not be able to see what the dApp is requesting.'
Expand All @@ -215,7 +213,7 @@ class UIService {
...this.originWrapper,
text(`Would you like to add ${origin} as a friendly dApp?`),
divider(),
text('Popups do not appear on friendly dApps.'),
text('Pop-ups do not appear on friendly dApps.'),
]);

const res = await UIService.snapConfirm(uiPanel);
Expand Down
2 changes: 1 addition & 1 deletion packages/snap/tests/e2e/addFriendlyDapp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('addFriendlyDapp', () => {
expect.assertions(2);
});

it('Should not show popup if the dapp is already in the list', async () => {
it('Should not show pop-up if the dapp is already in the list', async () => {
const spy = jest.spyOn(UIService, 'addFriendlyDappDialog');

const defaultState = getDefaultSnapState(account);
Expand Down
2 changes: 1 addition & 1 deletion packages/snap/tests/e2e/removeFriendlyDapp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('removeFriendlyDapp', () => {
expect.assertions(2);
});

it('Should show popup if the dapp is not in the list', async () => {
it('Should show pop-up if the dapp is not in the list', async () => {
const spy = jest.spyOn(UIService, 'queryAllDialog');

const defaultState = getDefaultSnapState(account);
Expand Down
2 changes: 1 addition & 1 deletion packages/snap/tests/e2e/togglePopups.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('togglePopups', () => {
global.ethereum = snapMock as unknown as MetaMaskInpageProvider;
});

it('should enable popups and then disable them', async () => {
it('should enable pop-ups and then disable them', async () => {
const res = (await onRpcRequest({
origin: 'localhost',
request: {
Expand Down

0 comments on commit 8139e02

Please sign in to comment.