Merge branch 'main' into dexie-storage-2

cashubtc · Dec 30, 2024 · 334e64c · 334e64c
2 parents 81681e0 + 804cd4a
commit 334e64c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,5 @@
 dist
 src-capacitor
 src-cordova
+android
+ios
diff --git a/src/css/app.scss b/src/css/app.scss
@@ -5,13 +5,12 @@ body {
   overscroll-behavior-y: contain;
 }
 
+// margin for top elements for ios safe area
 body,
 .q-drawer,
 .q-header,
-.q-dialog__inner > div,
-.q-notification {
+.q-dialog__inner > div {
   margin-top: var(--safe-area-inset-top);
-  // margin-top: 100px; // for testing
 }
 
 .q-dialog__inner > div {

diff --git a/src/stores/settings.ts b/src/stores/settings.ts
@@ -48,7 +48,7 @@ export const useSettingsStore = defineStore("settings", {
       ),
       useNumericKeyboard: useLocalStorage<boolean>(
         "cashu.settings.useNumericKeyboard",
-        true
+        false
       ),
       enableReceiveSwaps: useLocalStorage<boolean>(
         "cashu.settings.enableReceiveSwaps",