Bring some improvements to master branch

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/ProcSec/PWA-Core.git
 [submodule "src/environment"]
 	path = src/environment
-	url = https://github.com/ProcSec/PWA-Environment.git
+	url = https://github.com/Sominemo/Modern-PWA.git
 [submodule "src/app/res/datasets/MCC-Localize-Dataset"]
 	path = src/app/res/datasets/MCC-Localize-Dataset
 	url = https://github.com/Sominemo/MCC-Localize-Dataset.git

README.md

@@ -30,6 +30,7 @@ monobank Progressive Web Application
 - Автоматическое определение типа карты
 - Смена порядка карт
 - Смена внешнего вида карт
+- Скрытие кредитных средств
 
 ### Уведомления*
 - Настройка Push-сервера

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mono-pwa",
-    "version": "3.4.0",
+    "version": "3.4.3",
     "description": "monobank PWA",
     "main": "index.html",
     "config": {
@@ -47,7 +47,6 @@
         "file-loader": "^6.0.0",
         "fs-extra": "^9.0.0",
         "html-webpack-plugin": "^4.0.4",
-        "on-build-webpack": "^0.1.0",
         "resource-hints-webpack-plugin": "^0.0.2",
         "style-loader": "1.1.3",
         "svg-inline-loader": "^0.8.2",
@@ -66,16 +65,11 @@
         "core-js": "^3.4.1",
         "currency-codes": "^2.1.0",
         "custom-protocol-detection": "^1.0.1",
-        "git-rev-sync": "^2.0.0",
         "idb": "^5.0.2",
-        "lottie-web": "^5.6.8",
         "mcc": "^2.2.0",
-        "node-fetch": "^2.6.0",
         "regenerator-runtime": "^0.13.5",
         "requestidlecallback-polyfill": "^1.0.2",
-        "sjcl": "^1.0.8",
         "smoothscroll-polyfill": "^0.4.4",
-        "sortablejs": "^1.10.2",
-        "twemoji": "^12.1.4"
+        "sortablejs": "^1.10.2"
     }
-}
+}

src/app/library/loadingPopup.js

@@ -4,9 +4,12 @@ import { Preloader } from "@Environment/Library/DOM/object"
 export default function loadingPopup() {
     return Prompt({
         text: new Preloader({}),
+        pureText: true,
         popupSettings: {
             fullWidth: false,
             noClose: true,
+            cardStyle: { padding: "2.5vmin" },
         },
+        cardAdditional: { noPadding: true },
     })
 }

src/app/loaders/Modules.js

@@ -1,7 +1,7 @@
 import "@App/modules/mono/services/UpgradeManager"
+import "@App/modules/mono/menu"
 import "@App/modules/mono/services/AuthInit"
 import "@App/modules/mono/AuthUI"
-import "@App/modules/mono/menu"
 import "@App/modules/mono/statementUI"
 import "@App/modules/mono/currencyUI"
 import "@App/modules/mono/partners"

src/app/loaders/Presets/SetPreloader.js

@@ -1,6 +1,6 @@
 import { Preloader } from "@Environment/Library/DOM/object"
-import LottieAnimation from "@App/library/LottieAnimation"
+import { SVG } from "@Environment/Library/DOM/basic"
 
 Preloader.setPreloader(({
     size, style,
-} = {}) => new LottieAnimation(require("@Resources/animations/loader.json"), { size, style }))
+} = {}) => new SVG(require("@Resources/images/vector/mono.svg"), { height: "12vmin" }))

src/app/loaders/Presets/ThemeSettings.js

@@ -1,3 +1,3 @@
 import Design from "@Core/Services/design"
 
-Design.defaultTheme = "dark"
+Design.presetDarkTheme = "default"

src/app/modules/main/PWA.js

@@ -70,7 +70,6 @@ export default class PWA extends App {
                         $$("about/disclaimer_title")]),
                     disableWrapper: true,
                 },
-                { content: new SettingsActLink(["transformators", $$("settings/tf")]), disableWrapper: true },
             ],
         ))
         w.render(infocard)

src/app/modules/main/flags.js

@@ -94,7 +94,7 @@ export default class FlagsUI {
         w.render(new DOM({
             new: "div",
             style: {
-                padding: "20px 0",
+                padding: "4vmin 0",
             },
             content: [
                 new SVG(pic, {
@@ -106,9 +106,9 @@ export default class FlagsUI {
                     new: "div",
                     style: {
                         textAlign: "center",
-                        marginTop: "20px",
+                        marginTop: "4vmin",
                         fontFamily: Design.getVar("font-accent"),
-                        fontSize: "20px",
+                        fontSize: "4vmin",
                     },
                     content: $$("experiments/no_exps_placeholder"),
                 }),
@@ -130,8 +130,8 @@ export default class FlagsUI {
             new DOM({
                 new: "div",
                 content: [
-                    new DOM({ new: "div", content: title || $(`experiments/about/${id}/title`), style: { fontWeight: "500", fontSize: "20px" } }),
-                    ...(showID ? [new DOM({ new: "div", content: id, style: { color: "lightgray", fontSize: "12px" } })] : []),
+                    new DOM({ new: "div", content: title || $(`experiments/about/${id}/title`), style: { fontWeight: "500", fontSize: "4vmin" } }),
+                    ...(showID ? [new DOM({ new: "div", content: id, style: { color: "lightgray", fontSize: "3.5vmin" } })] : []),
                 ],
                 id: `flag-id-${id}`,
             }),

src/app/modules/mono/AuthUI.js

@@ -191,23 +191,23 @@ export default class AuthUI {
                             [
                                 new Title($$("auth/settings/token"), 4, { margin: 0 }),
                                 new DOM({ new: "div", content: $$("auth/settings/token/description") }),
-                            ], { style: { marginRight: "15px" } }),
+                            ], { style: { marginRight: "3vmin" } }),
                     },
                     {
                         handler() { AuthUI.setDomain(state); p.close() },
                         content: new IconSide("domain",
                             [
                                 new Title($$("auth/settings/domain"), 4, { margin: 0 }),
                                 new DOM({ new: "div", content: $$("auth/settings/domain/description") }),
-                            ], { style: { marginRight: "15px" } }),
+                            ], { style: { marginRight: "3vmin" } }),
                     },
                     {
                         handler() { AuthUI.resetState(state); p.close() },
                         content: new IconSide("history",
                             [
                                 new Title($$("auth/settings/revert"), 4, { margin: 0 }),
                                 new DOM({ new: "div", content: $$("auth/settings/revert/description") }),
-                            ], { style: { marginRight: "15px" } }),
+                            ], { style: { marginRight: "3vmin" } }),
                     },
                 ], true),
                 { style: { marginLeft: 0, marginRight: 0, marginTop: 0 } },
@@ -246,8 +246,8 @@ export default class AuthUI {
                         [
                             new Title($$("auth/settings/token"), 4, { margin: 0 }),
                             new DOM({ new: "div", content: $$("auth/settings/token/description") }),
-                        ], { style: { marginRight: "15px" } }),
-                ), { style: { margin: "10px 0" } }),
+                        ], { style: { marginRight: "3vmin" } }),
+                ), { style: { margin: "2vmin 0" } }),
             ],
             buttons: [
                 {
@@ -352,8 +352,8 @@ export default class AuthUI {
                         [
                             new Title($$("auth/settings/domain"), 4, { margin: 0 }),
                             new DOM({ new: "div", content: $$("auth/settings/domain/description") }),
-                        ], { style: { marginRight: "15px" } }),
-                ), { style: { margin: "10px 0" } }),
+                        ], { style: { marginRight: "3vmin" } }),
+                ), { style: { margin: "2vmin 0" } }),
             ],
             buttons: [
                 {

src/app/modules/mono/menu.js

@@ -2,7 +2,7 @@ import { WindowContainer } from "@Environment/Library/DOM/buildBlock"
 import WindowManager from "@Core/Services/SimpleWindowManager"
 import Navigation from "@Core/Services/navigation"
 import { $$ } from "@Core/Services/Language/handler"
-import { CoreLoader } from "@Core/Init/CoreLoader"
+import { CoreLoader, CoreLoaderResult } from "@Core/Init/CoreLoader"
 import { Title } from "@Environment/Library/DOM/object"
 import { Card, CardList } from "@Environment/Library/DOM/object/card"
 import IconSide from "@Environment/Library/DOM/object/iconSide"
@@ -134,5 +134,7 @@ CoreLoader.registerTask({
         }
 
         Navigation.titleFallback = "monobank"
+
+        return new CoreLoaderResult()
     },
 })

src/app/modules/mono/partners.js

@@ -21,7 +21,6 @@ import SlideInCSS from "@Environment/Library/Animations/SlideInCSS"
 import Prompt from "@Environment/Library/DOM/elements/prompt"
 import { SelectInput } from "@Environment/Library/DOM/object/input"
 import { Align } from "@Environment/Library/DOM/style"
-import LottieAnimation from "@App/library/LottieAnimation"
 import Design from "@Core/Services/design"
 import OfflineCache from "./services/OfflineCache"
 
@@ -380,8 +379,14 @@ export default class PartnersUI {
                             new: "div",
                             content: [
                                 new Title($$("p4/no_data"), 2, { fontSize: "4vmin" }),
-                                new LottieAnimation(require("@Resources/animations/failed.json"),
-                                    { lottieOptions: { loop: false }, size: "33vmin", style: { margin: "auto" } }),
+                                new DOM({
+                                    new: "img",
+                                    src: require("@Resources/images/placeholders/failed.png").default,
+                                    style: {
+                                        height: "33vh",
+                                        margin: "auto",
+                                    },
+                                }),
                             ],
                         }), ["row", "center"]),
                         style: {
@@ -403,7 +408,6 @@ export default class PartnersUI {
     }
 }
 
-
 CoreLoader.registerTask({
     id: "p4_partners_module",
     presence: "P4 Partners",