SQuiz/frontPanel
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'staging'

Browse Source 
Dev

See merge request frontend/squiz!247
This commit is contained in:
Nastya 2024-04-10 14:46:24 +00:00
commit 20d7fbdc4e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -7,7 +7,7 @@
"@emotion/react": "^11.10.5", "@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5", "@emotion/styled": "^11.10.5",
"@frontend/kitui": "^1.0.74", "@frontend/kitui": "^1.0.74",
"@frontend/squzanswerer": "^1.0.21", "@frontend/squzanswerer": "^1.0.22",
"@mui/icons-material": "^5.10.14", "@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.14", "@mui/material": "^5.10.14",
"@mui/x-charts": "^6.19.5", "@mui/x-charts": "^6.19.5",

2
src/utils/hooks/useAfterpay.ts
View File

@ -50,7 +50,7 @@ export const useAfterpay = () => {
return; return;
} }
setTimeout(tryPayCart, tryCount > 10 ? MINUTE / 60 : MINUTE / 6); setTimeout(tryPayCart, tryCount > 5 ? MINUTE : MINUTE / 6);
} }
}; };

1
src/utils/parse-error.ts
View File

@ -19,6 +19,7 @@ const translateMessage: Record<string, string> = {
"promocode already activated": "Промокод уже активирован", "promocode already activated": "Промокод уже активирован",
"promocode not found": "Промокод не найден", "promocode not found": "Промокод не найден",
"promo code is expired": "Промокод истек", "promo code is expired": "Промокод истек",
"promocode exhausted": "Количество активаций исчерпано",
}; };
export const parseAxiosError = (nativeError: unknown): [string, number?] => { export const parseAxiosError = (nativeError: unknown): [string, number?] => {

8
yarn.lock
View File

@ -1517,10 +1517,10 @@
immer "^10.0.2" immer "^10.0.2"
reconnecting-eventsource "^1.6.2" reconnecting-eventsource "^1.6.2"
"@frontend/squzanswerer@^1.0.21": "@frontend/squzanswerer@^1.0.22":
version "1.0.21" version "1.0.22"
resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/@frontend/squzanswerer/-/@frontend/squzanswerer-1.0.21.tgz#70767e14e40828f29ad335a9cc780ed50479387c" resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/@frontend/squzanswerer/-/@frontend/squzanswerer-1.0.22.tgz#a4ae7f6d10b489c819e7197fe06a08e25ffa31be"
integrity sha1-cHZ+FOQIKPKa0zWpzHgO1QR5OHw= integrity sha1-pK5/bRC0icgZ5xl/4GoI4l/6Mb4=
dependencies: dependencies:
bowser "1.9.4" bowser "1.9.4"
country-flag-emoji-polyfill "^0.1.8" country-flag-emoji-polyfill "^0.1.8"