-fix typos

This commit is contained in:
Christian Grothoff 2022-11-03 20:12:32 +01:00
parent 0a604ee3ea
commit d00f7a4a01
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
10 changed files with 29 additions and 33 deletions

@ -1 +1 @@
Subproject commit 23538677f6c6be2a62f38dc6137ecdd1c76b7b15
Subproject commit 355a3172699b96f1040edcb577c07a681802b3ae

View File

@ -78,7 +78,7 @@ msgstr ""
#: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1026
#, c-format
msgid "Waiting the bank to create the operaion..."
msgid "Waiting the bank to create the operation..."
msgstr ""
#: /home/job/backoffice/packages/bank/src/pages/home/index.tsx:1044

View File

@ -10,9 +10,9 @@ This project generate 5 templates for the merchant backend:
* RequestPayment
* ShowOrderDetails
This pages are to be serve from the merchant-backend service and will be queried for browser that may or may not have javascript enabled, so we are going to do server side rendering.
This pages are to be serve from the merchant-backend service and will be queried for browser that may or may not have JavaScript enabled, so we are going to do server side rendering.
The merchant-backend service is currently supporting mustache library for server side rendering.
We also want the be able to create a more interactive design if the browser have javascript enabled, so the pages will be serve with all the infromation in the html but also in javascript.
We also want the be able to create a more interactive design if the browser have JavaScript enabled, so the pages will be serve with all the information in the HTML but also in JavaScript.
In this scenario, we are using jsx to build the template of the page that will be build-time rendered into the mustache template. This template can the be deployed into a merchant-backend that will complete the information before send it to the browser.
@ -22,9 +22,7 @@ The building process can be executed with `pnpm build`
# Testing
This project is using a javascript implementation of mustache that can be executed with the command `pnpm render-examples`.
This project is using a JavaScript implementation of mustache that can be executed with the command `pnpm render-examples`.
This script will take the pages previously built in `dist/pages` directory and the examples definition in the `src/pages/[exampleName].examples.ts` files and render a to-be-sent-to-the-user page like the merchant would do.
This examples will be saved invidivualy into directory `dist/examples` and should be opened with your testing browser.
Testing should be done with javascript enabled and javascript disabled, both should look ok.
Testing should be done with JavaScript enabled and JavaScript disabled, both should look ok.

View File

@ -38,8 +38,8 @@ export function mergeRefunds(prev: MerchantBackend.Orders.RefundDetails[], cur:
let tail;
if (prev.length === 0 || //empty list
cur.timestamp.t_s === 'never' || //current doesnt have timestamp
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last doesnt have timestamp
cur.timestamp.t_s === 'never' || //current does not have timestamp
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last does not have timestamp
cur.reason !== tail.reason || //different reason
Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 1 minute difference

View File

@ -30,8 +30,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
return value !== null && value !== undefined;
}
export function buildActions<T extends WithId>(intances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
return selected.map(id => intances.find(i => i.id === id))
export function buildActions<T extends WithId>(instances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
return selected.map(id => instances.find(i => i.id === id))
.filter(notEmpty)
.map(id => ({ element: id, type: action }))
}

View File

@ -175,10 +175,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
return value !== null && value !== undefined;
}
function buildActions(intances: MerchantBackend.Instances.Instance[], selected: string[], action: 'DELETE'): Actions[] {
return selected.map(id => intances.find(i => i.id === id))
function buildActions(instances: MerchantBackend.Instances.Instance[], selected: string[], action: 'DELETE'): Actions[] {
return selected.map(id => instances.find(i => i.id === id))
.filter(notEmpty)
.map(id => ({ element: id, type: action }))
}

View File

@ -38,8 +38,8 @@ export function mergeRefunds(prev: MerchantBackend.Orders.RefundDetails[], cur:
let tail;
if (prev.length === 0 || //empty list
cur.timestamp.t_s === 'never' || //current doesnt have timestamp
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last doesnt have timestamp
cur.timestamp.t_s === 'never' || //current does not have timestamp
(tail = prev[prev.length - 1]).timestamp.t_s === 'never' || // last does not have timestamp
cur.reason !== tail.reason || //different reason
cur.pending !== tail.pending || //different pending state
Math.abs(cur.timestamp.t_s - tail.timestamp.t_s) > 1000 * 60) {//more than 1 minute difference

View File

@ -30,8 +30,8 @@ function notEmpty<TValue>(value: TValue | null | undefined): value is TValue {
return value !== null && value !== undefined;
}
export function buildActions<T extends WithId>(intances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
return selected.map(id => intances.find(i => i.id === id))
export function buildActions<T extends WithId>(instances: T[], selected: string[], action: 'DELETE'): Actions<T>[] {
return selected.map(id => instances.find(i => i.id === id))
.filter(notEmpty)
.map(id => ({ element: id, type: action }))
}

View File

@ -24,7 +24,7 @@ import { useNotifications } from '../../src/hooks/notifications';
jest.useFakeTimers()
test('notification should disapear after timeout', () => {
test('notification should disappear after timeout', () => {
jest.spyOn(global, 'setTimeout');
const timeout = 1000

View File

@ -852,7 +852,7 @@ export interface ExchangeListItem {
permanent: boolean;
/**
* Information about the last error that occured when trying
* Information about the last error that occurred when trying
* to update the exchange info.
*/
lastUpdateErrorInfo?: OperationErrorInfo;