diff --git a/package.json b/package.json index e1d94b3..8597038 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mono-pwa", - "version": "3.4.2", + "version": "3.4.2-hotfix.1", "description": "monobank PWA", "main": "index.html", "config": { diff --git a/src/app/loaders/Presets/SetSplashscreen.js b/src/app/loaders/Presets/SetSplashscreen.js index 2f5bc2b..92772b5 100644 --- a/src/app/loaders/Presets/SetSplashscreen.js +++ b/src/app/loaders/Presets/SetSplashscreen.js @@ -5,3 +5,5 @@ SplashScreenController.splashImage.innerHTML = require("@Resources/images/logo/v SplashScreenController.splashImage = SplashScreenController.splashImage.firstChild SplashScreenController.splashImage.style.height = "30vh" +SplashScreenController.splashBG = "#181A1D" +SplashScreenController.splashColor = "#ffffff" diff --git a/src/app/loaders/UI/Nav.js b/src/app/loaders/UI/Nav.js index d687318..e8a73da 100644 --- a/src/app/loaders/UI/Nav.js +++ b/src/app/loaders/UI/Nav.js @@ -1,6 +1,28 @@ import { Nav, Scaffold } from "@Environment/Library/DOM/buildBlock" import Navigation from "@Core/Services/navigation" import { $$ } from "@Core/Services/Language/handler" +import { ContextMenu, ContextMenuElement } from "@Environment/Library/DOM/elements" + +Nav.navListFunction = (function navListFunction() { + const current = Navigation.Current + const custom = current.navMenu || [] + + return [ + ...(Object.keys(custom).length > 0 && this.constantNavMenu.length > 0 ? [...custom, { type: "delimeter" }] : []), + ...this.constantNavMenu, + ] +}).bind(Nav) + +Nav.navigationList = Nav.navListFunction + +Nav.Toggle = function toggle(_, ev) { + ev.stopPropagation() + ContextMenuElement.closeAll() + ContextMenu({ + content: this.navigationList(), + event: ev, + }) +} Nav.constantNavMenu = [ { diff --git a/src/app/modules/mono/services/Auth.js b/src/app/modules/mono/services/Auth.js index fb1ff83..d90e074 100644 --- a/src/app/modules/mono/services/Auth.js +++ b/src/app/modules/mono/services/Auth.js @@ -54,6 +54,14 @@ export default class Auth { static updateIcons() { if (this.isAnyAuthed) { Nav.config = [ + { + name() { return $$("quick_settings") }, + icon: "more_vert", + id: "options", + handler: (ev, _) => { + Nav.Toggle(_, ev) + }, + }, { name() { return $$("statement") }, icon: "account_balance_wallet", @@ -65,17 +73,6 @@ export default class Auth { } }, }, - { - name() { return $$("currency") }, - icon: "assessment", - id: "currency", - handler: () => { - Navigation.url = { - module: "currency", - params: {}, - } - }, - }, { name() { return $$("menu") }, icon: "menu", @@ -90,6 +87,14 @@ export default class Auth { ] } else { Nav.config = [ + { + name() { return $$("quick_settings") }, + icon: "more_vert", + id: "options", + handler: (ev, _) => { + Nav.Toggle(_, ev) + }, + }, { name() { return $$("currency") }, icon: "assessment", @@ -101,17 +106,6 @@ export default class Auth { } }, }, - { - name() { return $$("p4/partners") }, - icon: "store", - id: "partners", - handler: () => { - Navigation.url = { - module: "partners", - params: {}, - } - }, - }, { name() { return $$("menu") }, icon: "apps", diff --git a/src/app/res/styles/statement.css b/src/app/res/styles/statement.css index fc99516..1e1460f 100644 --- a/src/app/res/styles/statement.css +++ b/src/app/res/styles/statement.css @@ -46,7 +46,7 @@ border-radius: 10px; display: flex; flex-direction: column; - padding: 5% 8%; + padding: 3vmin 4vmin; box-shadow: rgba(0, 0, 0, 0.6) 0 -2vmin 10vmin, rgba(255, 255, 255, 0.15) 0 10vmin 20vmin; position: relative; overflow: hidden; diff --git a/src/environment b/src/environment index fcd286a..4a34f5f 160000 --- a/src/environment +++ b/src/environment @@ -1 +1 @@ -Subproject commit fcd286a0ad3aef7cc583ddba870b216f1ea431ff +Subproject commit 4a34f5f9aec3ad07134b5a8564bb99b74b7e8948 diff --git a/webpack/webpack.config.js b/webpack/webpack.config.js index eb1ee65..0fd90a8 100644 --- a/webpack/webpack.config.js +++ b/webpack/webpack.config.js @@ -98,6 +98,7 @@ module.exports = (env = {}) => { __PACKAGE_BRANCH: JSON.stringify((env.WG ? "workgroup" : builder.pack.config.branch)), __PACKAGE_BUILD_TIME: webpack.DefinePlugin.runtimeValue(() => JSON.stringify(fecha.format(new Date(), "DD.MM.YYYY HH:mm:ss")), true), __PACKAGE_BUILD_FLAGS: JSON.stringify(buildFlags), + __PACKAGE_BUILD: '0', __PACKAGE_CHANGELOG: JSON.stringify(CHANGELOG), __PACKAGE_ANALYTICS: JSON.stringify(ANALYTICS_TAG), __PACKAGE_DOWNLOADABLE_LANG_PACKS: JSON.stringify(!!DOWNLOAD_LANG_PACKS),