Skip to content

Commit

Permalink
Merge pull request #526 from rex4539/typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
sisou authored Mar 4, 2024
2 parents 60593db + 68250a4 commit 0d42711
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion client/PublicRequestTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export interface MultiCurrencyCheckoutRequest extends BasicRequest {
*/
csrf?: string;
/**
* The data to be included in the transaction. Ignored for `Currenct.BTC` and `Currency.ETH`.
* The data to be included in the transaction. Ignored for `Currency.BTC` and `Currency.ETH`.
* @deprecated use NimiqDirectPaymentOptions.protocolSpecific.extraData instead.
*/
extraData?: Bytes;
Expand Down
2 changes: 1 addition & 1 deletion client/RequestBehavior.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export class PopupRequestBehavior extends RequestBehavior<BehaviorType.POPUP> {
}
} while (this.shouldRetryRequest);

// the code below should never be executed, unless unexpected things happend
// the code below should never be executed, unless unexpected things happened
if (this.popup) this.popup.close();
if (this.client) this.client.close();
if ($overlay) this.removeOverlay($overlay);
Expand Down
2 changes: 1 addition & 1 deletion src/lib/CheckoutServerApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export default class CheckoutServerApi {
return {
time: Date.now(),

// Change these to true and PAID for simulating a successfull payment
// Change these to true and PAID for simulating a successful payment
payment_accepted: false,
payment_state: PaymentState.NOT_FOUND,
};
Expand Down
8 changes: 4 additions & 4 deletions src/lib/ContractInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ export class VestingContractInfo {
* First, an explanation of the parameters of a vesting contract:
* totalAmount: The total value of a vesting contract (fixed during creation, cannot be changed).
* stepAmount: How much value is released at every vesting step. The total amount does not have
* to devide evenly through this amount. The last vesting step amount can be smaller
* to divide evenly through this amount. The last vesting step amount can be smaller
* then the previous steps.
* stepBlocks: The number of blocks between step amount releases.
* start: The block height at which the first step starts to count.
*
* To calculate the amount available, we start by dividing the number of blocks passed since
* the contract's start height through its stepBlocks, to determine how many vesting steps have
* passed. The floored number of steps gets muliplied by the stepAmount to calculate all so far
* passed. The floored number of steps gets multiplied by the stepAmount to calculate all so far
* released value:
* Math.floor((height - this.start) / this.stepBlocks)) * this.stepAmount
*
Expand All @@ -130,9 +130,9 @@ export class VestingContractInfo {
* the above calculated released amount and the contract's totalAmount:
* Math.min(this.totalAmount, <previous result>)
*
* Finally, the available amount needs to account for already withrawn funds. (The balance
* Finally, the available amount needs to account for already withdrawn funds. (The balance
* reported by the network represents the balance of the contract, including not-yet-released
* funds.) The amount already withdrawn is the difference between the totalAmount (inital balance)
* funds.) The amount already withdrawn is the difference between the totalAmount (initial balance)
* and currentBalance. The withdrawn amount is simply subtracted from the released amount:
* <previous result> - (this.totalAmount - currentBalance)
*/
Expand Down
4 changes: 2 additions & 2 deletions src/lib/RpcApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default class RpcApi {
]);

this._router.beforeEach((to: Route, from: Route, next: (arg?: string | false | Route) => void) => {
// There is an intial redirect from '/' to '/' which does not need to be handled at all.
// There is an initial redirect from '/' to '/' which does not need to be handled at all.
if (to.name === REQUEST_ERROR || (to.path === '/' && from.path === '/')) {
next();
return;
Expand Down Expand Up @@ -138,7 +138,7 @@ export default class RpcApi {
});

this._router.afterEach((to: Route, from: Route) => {
// There is an intial redirect from '/' to '/' which does not need to be handled at all.
// There is an initial redirect from '/' to '/' which does not need to be handled at all.
if (to.path === '/' && from.path === '/') {
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Uid.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* The UID is used for the purpose of tracking Fastspot swap limits per user. It is generated from
* two deterministic values. The keyId of an account and its first NIM address, wich are always the same.
* two deterministic values. The keyId of an account and its first NIM address, which are always the same.
*
* The `keyId` is never passed to outside the Hub, so can be seen as a secret value. This way
* it is impossible for anyone who gets access to the UID alone to determine the user's address.
Expand Down
6 changes: 3 additions & 3 deletions src/views/CashlinkCreate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<SmallPage v-if="optionsOpened" class="overlay fee" key="fee">
<PageBody>
<h1 class="nq-h1">{{ $t('Speed up your transaction') }}</h1>
<p class="nq-text">{{ $t('By adding a transation fee, you can influence how fast your transaction will be processed.') }}</p>
<p class="nq-text">{{ $t('By adding a transaction fee, you can influence how fast your transaction will be processed.') }}</p>
<SelectBar name="fee" ref="fee" :options="constructor.FEE_OPTIONS" :selectedValue="feeLunaPerByte" @changed="updateFeePreview"/>
<Amount :amount="feePreview" :minDecimals="0" :maxDecimals="5" />
</PageBody>
Expand Down Expand Up @@ -337,7 +337,7 @@ class CashlinkCreate extends Vue {
return acc;
}, [] as Array<AccountInfo | ContractInfo>);
// Reduce userfriendly addresses from that
// Reduce user-friendly addresses from that
addresses = accountsAndContracts.map((accountOrContract) => accountOrContract.userFriendlyAddress);
} else {
const wallet = this.findWalletByAddress(this.request.senderAddress.toUserFriendlyAddress(), true);
Expand Down Expand Up @@ -687,7 +687,7 @@ export default CashlinkCreate;
/* these elements are too small to make a notable difference in the blurred background */
.create-cashlink.blurred > .page-body >>> .arrow, /* arrow between the identicons */
.create-cashlink.blurred > .page-body hr, /* line seperating identicons and amount */
.create-cashlink.blurred > .page-body hr, /* line separating identicons and amount */
.create-cashlink.blurred > .page-header >>> a , /* back button */
.create-cashlink.blurred > .page-header >>> h1 > a { /* back button */
opacity: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/views/CashlinkReceive.vue
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ class CashlinkReceive extends Vue {
try {
await CashlinkStore.Instance.put(this.cashlink!);
} catch (err) {
// Ignore, because cashlink has been claimed sucessfully and will show up in the Safe
// Ignore, because cashlink has been claimed successfully and will show up in the Safe
}
// Show success screen and redirect to Safe
Expand Down
2 changes: 1 addition & 1 deletion src/views/Migrate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export default class Migrate extends Vue {
this.status = this.$t('Storing your new accounts...') as string;
// For the wallet ID derivation to work, the ID derivation and storing of new wallets needs
// to happen serially, e.g. synchroneous.
// to happen serially, e.g. synchronous.
const walletInfos: WalletInfo[] = [];
for (const keyInfo of legacyAccounts) {
const accountInfo = this.legacyKeyInfoObject2AccountInfo(keyInfo);
Expand Down
2 changes: 1 addition & 1 deletion src/views/Rename.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
import { RequestType } from '../../client/PublicRequestTypes';
/*
In Case some sort auf Authentication with the wallet is desireable, there are 2 options:
In Case some sort auf Authentication with the wallet is desirable, there are 2 options:
1. is to have the user enter the password at the very beginning. This would require the Hub to
first redirect to the Keyguard. After returning and validating (sign message) this component would come
into view.
Expand Down
2 changes: 1 addition & 1 deletion src/views/SignMessage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default class SignMessage extends Vue {
const walletInfo = this.findWallet(walletId);
if (!walletInfo) {
// We can also return an error here and when checking the address below,
// but it would enable malicous sites to query for stored walletIds and addresses.
// but it would enable malicious sites to query for stored walletIds and addresses.
// Instead we quietly ignore any unavailable pre-set walletId and address and give
// the user the option to chose as if it was not pre-set.
this.showAccountSelector = true;
Expand Down
2 changes: 1 addition & 1 deletion vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const bitcoinJsIntegrityHash = `sha256-${createHash('sha256')
.update(fs.readFileSync(path.join(__dirname, 'public/bitcoin/BitcoinJS.min.js')))
.digest('base64')}`;

// Accesible within client code via process.env.VUE_APP_BITCOIN_JS_INTEGRITY_HASH,
// Accessible within client code via process.env.VUE_APP_BITCOIN_JS_INTEGRITY_HASH,
// see https://cli.vuejs.org/guide/mode-and-env.html#using-env-variables-in-client-side-code
process.env.VUE_APP_BITCOIN_JS_INTEGRITY_HASH = bitcoinJsIntegrityHash;

Expand Down

0 comments on commit 0d42711

Please sign in to comment.