diff --git a/package.json b/package.json
index 3bfb8391e8..5cb5477f12 100644
--- a/package.json
+++ b/package.json
@@ -91,8 +91,8 @@
"@types/react-modal": "^3.13.1",
"@types/uuid": "^9.0.0",
"@types/webextension-polyfill": "^0.9.2",
- "@typescript-eslint/eslint-plugin": "^5.42.0",
- "@typescript-eslint/parser": "^5.42.0",
+ "@typescript-eslint/eslint-plugin": "^5.45.1",
+ "@typescript-eslint/parser": "^5.45.1",
"autoprefixer": "^10.4.13",
"buffer": "^6.0.3",
"clean-webpack-plugin": "^4.0.0",
@@ -102,7 +102,7 @@
"css-loader": "^6.7.2",
"css-minimizer-webpack-plugin": "^4.2.2",
"del-cli": "^5.0.0",
- "eslint": "^8.27.0",
+ "eslint": "^8.29.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-react": "^7.31.11",
@@ -118,8 +118,8 @@
"mini-css-extract-plugin": "^2.7.0",
"msw": "^0.49.0",
"postcss": "^8.4.19",
- "postcss-cli": "^10.0.0",
- "postcss-loader": "^7.0.1",
+ "postcss-cli": "^10.1.0",
+ "postcss-loader": "^7.0.2",
"pptr-testing-library": "^0.7.0",
"prettier": "^2.8.0",
"process": "^0.11.10",
diff --git a/src/app/components/CompanionDownloadInfo.tsx b/src/app/components/CompanionDownloadInfo.tsx
index dcd54c8878..eb027bf723 100644
--- a/src/app/components/CompanionDownloadInfo.tsx
+++ b/src/app/components/CompanionDownloadInfo.tsx
@@ -13,10 +13,11 @@ function CompanionDownloadInfo({ hasTorCallback }: Props) {
});
function getOS() {
- if (navigator.appVersion.indexOf("Win") != -1) return "Windows";
- if (navigator.appVersion.indexOf("Mac") != -1) return "MacOS";
- if (navigator.appVersion.indexOf("X11") != -1) return "UNIX";
- if (navigator.appVersion.indexOf("Linux") != -1) return "Linux";
+ const userAgent = navigator.userAgent;
+ if (userAgent.indexOf("Win") !== -1) return "Windows";
+ if (userAgent.indexOf("Mac") !== -1) return "MacOS";
+ if (userAgent.indexOf("X11") !== -1) return "UNIX";
+ if (userAgent.indexOf("Linux") !== -1) return "Linux";
}
// TODO: check if the companion app is already installed
diff --git a/src/app/components/SatButtons/index.tsx b/src/app/components/SatButtons/index.tsx
index d7eab832dd..4805244ee4 100644
--- a/src/app/components/SatButtons/index.tsx
+++ b/src/app/components/SatButtons/index.tsx
@@ -12,29 +12,29 @@ function SatButtons({ onClick, disabled }: Props) {
}
- label="100 ⚡"
- onClick={() => onClick("100")}
+ label="1k ⚡"
+ onClick={() => onClick("1000")}
fullWidth
disabled={disabled}
/>
}
- label="1K ⚡"
- onClick={() => onClick("1000")}
+ label="5k ⚡"
+ onClick={() => onClick("5000")}
fullWidth
disabled={disabled}
/>
}
- label="5K ⚡"
- onClick={() => onClick("5000")}
+ label="10k ⚡"
+ onClick={() => onClick("10000")}
fullWidth
disabled={disabled}
/>
}
- label="10K ⚡"
- onClick={() => onClick("10000")}
+ label="25k ⚡"
+ onClick={() => onClick("25000")}
fullWidth
disabled={disabled}
/>
diff --git a/src/app/context/SettingsContext.tsx b/src/app/context/SettingsContext.tsx
index 4df38fd1d0..951f686d10 100644
--- a/src/app/context/SettingsContext.tsx
+++ b/src/app/context/SettingsContext.tsx
@@ -114,7 +114,7 @@ export const SettingsProvider = ({
// need to switch i.e. `pt_BR` to `pt-br`
const daysjsLocaleFormatted = settings.locale
- .toLocaleLowerCase()
+ .toLowerCase()
.replace("_", "-");
dayjs.locale(daysjsLocaleFormatted);
}, [settings.locale]);
diff --git a/src/app/screens/ConfirmKeysend/index.tsx b/src/app/screens/ConfirmKeysend/index.tsx
index 06405a8e81..2636cdd3e7 100644
--- a/src/app/screens/ConfirmKeysend/index.tsx
+++ b/src/app/screens/ConfirmKeysend/index.tsx
@@ -122,45 +122,51 @@ function ConfirmKeysend() {
});
}
+ function handleSubmit(event: React.FormEvent
) {
+ event.preventDefault();
+ confirm();
+ }
+
return (
{!successMessage ? (
-
-
-
-
-
+
+
+
+
+
+
{
+ setRememberMe(event.target.checked);
+ }}
+ budget={budget}
+ onBudgetChange={(event) => setBudget(event.target.value)}
/>
-
-
{
- setRememberMe(event.target.checked);
- }}
- budget={budget}
- onBudgetChange={(event) => setBudget(event.target.value)}
- />
-
-
+
+
) : (
diff --git a/src/app/screens/ConfirmPayment/index.tsx b/src/app/screens/ConfirmPayment/index.tsx
index 5f723b34f3..66e40b597a 100644
--- a/src/app/screens/ConfirmPayment/index.tsx
+++ b/src/app/screens/ConfirmPayment/index.tsx
@@ -132,52 +132,58 @@ function ConfirmPayment() {
});
}
+ function handleSubmit(event: React.FormEvent) {
+ event.preventDefault();
+ confirm();
+ }
+
return (
{!successMessage ? (
-
- {navState.origin && (
-
- )}
-
-
-
-
- {tComponents("only_trusted")}
-
-
+
+
+
+ {tComponents("only_trusted")}
+
+
+
) : (
diff --git a/src/app/screens/ConfirmRequestPermission/index.tsx b/src/app/screens/ConfirmRequestPermission/index.tsx
index c632497d79..eb24475350 100644
--- a/src/app/screens/ConfirmRequestPermission/index.tsx
+++ b/src/app/screens/ConfirmRequestPermission/index.tsx
@@ -35,52 +35,58 @@ const ConfirmRequestPermission: FC = () => {
msg.error(USER_REJECTED_ERROR);
};
+ function handleSubmit(event: React.FormEvent) {
+ event.preventDefault();
+ enable();
+ }
+
return (