consolidate confirmation tiers and show Bitcoin tiers in shop settings.

cms/src/types/shopSettings/BitcoinConfirmationTier.ts

@@ -1,4 +0,0 @@
-export interface BitcoinConfirmationTier {
-    upToTotalFiat?: string;
-    minConfirmations: number;
-}

cms/src/types/shopSettings/ConfirmationTier.ts

@@ -1,4 +1,4 @@
-export interface MoneroConfirmationTier {
+export interface ConfirmationTier {
     upToTotalFiat?: string;
     minConfirmations: number;
 }

cms/src/types/shopSettings/ShopSettingsBitcoin.ts

@@ -1,5 +1,5 @@
-import type { BitcoinConfirmationTier } from './BitcoinConfirmationTier';
+import type { ConfirmationTier } from './ConfirmationTier';
 
 export interface ShopSettingsBitcoin {
-    confirmationTiers: BitcoinConfirmationTier[];
+    confirmationTiers: ConfirmationTier[];
 }

cms/src/types/shopSettings/ShopSettingsMonero.ts

@@ -1,5 +1,5 @@
-import type { MoneroConfirmationTier } from './MoneroConfirmationTier';
+import type { ConfirmationTier } from './ConfirmationTier';
 
 export interface ShopSettingsMonero {
-    confirmationTiers: MoneroConfirmationTier[];
+    confirmationTiers: ConfirmationTier[];
 }

cms/src/views/CmsShopSettingsView.vue

@@ -37,7 +37,14 @@
                     <el-descriptions-item label="Monero confirmation tiers">
                         <ul class="m-0 pl-20">
                             <li v-for="(tier, index) in settings.monero.confirmationTiers" :key="index">
-                                {{ formatMoneroConfirmationTier(tier, settings.shopFiatCurrency) }}
+                                {{ formatConfirmationTier(tier, settings.shopFiatCurrency) }}
+                            </li>
+                        </ul>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="Bitcoin confirmation tiers">
+                        <ul class="m-0 pl-20">
+                            <li v-for="(tier, index) in settings.bitcoin.confirmationTiers" :key="index">
+                                {{ formatConfirmationTier(tier, settings.shopFiatCurrency) }}
                             </li>
                         </ul>
                     </el-descriptions-item>
@@ -210,7 +217,7 @@
 <script setup lang="ts">
 import { config } from '@/config';
 import { useShopSettingsStore } from '@/stores/shopSettings';
-import type { MoneroConfirmationTier } from '@/types/shopSettings/MoneroConfirmationTier';
+import type { ConfirmationTier } from '@/types/shopSettings/ConfirmationTier';
 import { buildUploadHint } from '@/utils/upload/buildUploadHint';
 import { resolveAxiosErrorMessage } from '@/utils/resolveAxiosErrorMessage';
 import { resolveUploadPublicUrl } from '@/utils/upload/resolveUploadPublicUrl';
@@ -460,7 +467,7 @@ const submitShippingNote = async (): Promise<void> => {
     }
 };
 
-const formatMoneroConfirmationTier = (tier: MoneroConfirmationTier, currency: string): string => {
+const formatConfirmationTier = (tier: ConfirmationTier, currency: string): string => {
     const requirement = tier.minConfirmations === 0 ? '0 (tx-detected)' : `${tier.minConfirmations} confirmations`;
 
     if (tier.upToTotalFiat === undefined) {