Updated hide amounts to use the UI store instead of mints store.

cashubtc · Jun 26, 2024 · 37497ac · 37497ac
1 parent 103863e
commit 37497ac
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/boot/base.js b/src/boot/base.js
@@ -1,5 +1,5 @@
 import { copyToClipboard } from "quasar";
-import { useMintsStore } from "stores/mints";
+import { useUiStore } from "stores/ui";
 
 window.LOCALE = "en";
 // window.EventHub = new Vue();
@@ -40,7 +40,7 @@ window.windowMixin = {
       if (currency == undefined) {
         currency = "sat";
       }
-      if (useMintsStore().hideBalance && !showBalance) {
+      if (useUiStore().hideBalance && !showBalance) {
         return "****"
       }
       if (currency == "sat") return this.formatSat(value);

diff --git a/src/components/BalanceView.vue b/src/components/BalanceView.vue
@@ -113,6 +113,7 @@ import { mapState, mapWritableState, mapActions } from "pinia";
 import { useMintsStore } from "stores/mints";
 import { useSettingsStore } from "stores/settings";
 import { useTokensStore } from "stores/tokens";
+import { useUiStore } from "stores/ui";
 import { useWalletStore } from "stores/wallet";
 import ToggleUnit from "components/ToggleUnit.vue";
 
@@ -146,10 +147,8 @@ export default defineComponent({
     ]),
     ...mapState(useTokensStore, ["historyTokens"]),
     ...mapState(useSettingsStore, ["getBitcoinPrice"]),
-    ...mapWritableState(useMintsStore, [
-      "activeUnit",
-      "hideBalance"
-    ]),
+    ...mapWritableState(useMintsStore, ["activeUnit"]),
+    ...mapWritableState(useUiStore, ["hideBalance"]),
     pendingBalance: function () {
       return -this.historyTokens
         .filter((t) => t.status == "pending")

diff --git a/src/stores/mints.ts b/src/stores/mints.ts
@@ -80,7 +80,6 @@ type BlindSignatureAudit = {
 export const useMintsStore = defineStore("mints", {
   state: () => {
     return {
-      hideBalance: useLocalStorage<boolean>("cashu.hideBalance", false),
       activeUnit: useLocalStorage<string>("cashu.activeUnit", "sat"),
       activeMintUrl: useLocalStorage<string>("cashu.activeMintUrl", ""),
       addMintData: {

diff --git a/src/stores/ui.ts b/src/stores/ui.ts
@@ -9,6 +9,7 @@ const unitTickerShortMap = {
 
 export const useUiStore = defineStore("ui", {
   state: () => ({
+    hideBalance: useLocalStorage<boolean>("cashu.ui.hideBalance", false),
     tickerLong: "Satoshis",
     showInvoiceDetails: false,
     showSendDialog: false,

diff --git a/src/stores/wallet.ts b/src/stores/wallet.ts
@@ -50,7 +50,6 @@ type KeysetCounter = {
 
 const receiveStore = useReceiveTokensStore();
 const tokenStore = useTokensStore();
-const uIStore = useUiStore();
 
 export const useWalletStore = defineStore("wallet", {
   state: () => {
@@ -275,6 +274,7 @@ export const useWalletStore = defineStore("wallet", {
       return selectedProofs
     },
     spendableProofs: function (proofs: WalletProof[], amount: number) {
+      const uIStore = useUiStore();
       const proofsStore = useProofsStore();
       const mintStore = useMintsStore();
       const spendableProofs = proofsStore.getUnreservedProofs(proofs);
@@ -358,6 +358,7 @@ export const useWalletStore = defineStore("wallet", {
       /*
       uses split to receive new tokens.
       */
+      const uIStore = useUiStore();
       const mintStore = useMintsStore();
       receiveStore.showReceiveTokens = false;
       console.log("### receive tokens", receiveStore.receiveData.tokensBase64);
@@ -537,6 +538,7 @@ export const useWalletStore = defineStore("wallet", {
       }
     },
     melt: async function () {
+      const uIStore = useUiStore();
       const proofsStore = useProofsStore();
       const mintStore = useMintsStore();
       const tokenStore = useTokensStore();
@@ -708,6 +710,7 @@ export const useWalletStore = defineStore("wallet", {
       checks whether a base64-encoded token (from the history table) has been spent already.
       if it is spent, the appropraite entry in the history table is set to paid.
       */
+      const uIStore = useUiStore();
       const mintStore = useMintsStore();
       const tokenStore = useTokensStore();
       const proofsStore = useProofsStore();
@@ -763,6 +766,7 @@ export const useWalletStore = defineStore("wallet", {
       return true;
     },
     checkInvoice: async function (quote: string, verbose = true) {
+      const uIStore = useUiStore();
       const mintStore = useMintsStore();
       console.log("### checkInvoice.quote", quote);
       const invoice = this.invoiceHistory.find((i) => i.quote === quote);
@@ -786,6 +790,7 @@ export const useWalletStore = defineStore("wallet", {
       }
     },
     checkOutgoingInvoice: async function (quote: string, verbose = true) {
+      const uIStore = useUiStore();
       const mintStore = useMintsStore();
       const invoice = this.invoiceHistory.find((i) => i.quote === quote);
       if (!invoice) {