diff --git a/src/components/BasicPacks/BasicPriceInput/src/utils/usePrice.ts b/src/components/BasicPacks/BasicPriceInput/src/utils/usePrice.ts
index 4e89d78..c022d39 100644
--- a/src/components/BasicPacks/BasicPriceInput/src/utils/usePrice.ts
+++ b/src/components/BasicPacks/BasicPriceInput/src/utils/usePrice.ts
@@ -1,17 +1 @@
-export function usePrice(price: number, digit = true, unit = 'ریال') {
-  let _price = price.toString()
-  if (digit) {
-    _price = _price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-  }
-  return `${_price} ${unit}`
-}
-
-export function useTowDecimal(num: string | number): string | number {
-  const temp = num.toString().match(/^-?\d+(?:\.\d{0,2})?/)
-  if (temp && temp.length > 0) return temp[0]
-  return Math.round(+num * 100) / 100
-}
-
-export function useFormat(num: string | number, unit = '') {
-  return usePrice(Math.abs(+useTowDecimal(num)), true, unit)
-}
+export { usePrice, usePriceWithoutType, useTowDecimal, useFormat } from '@/utils/usePrice'
diff --git a/src/utils/productAssets.ts b/src/utils/productAssets.ts
index 4533e04..5151b32 100644
--- a/src/utils/productAssets.ts
+++ b/src/utils/productAssets.ts
@@ -39,11 +39,13 @@ export function getProductDisplayImage(product?: {
   return resolveProductImageSrc(product)
 }
 
+import { formatGoldAmount } from '@/utils/usePrice'
+
 export function formatMetalTotal(
   metal: WalletMetalTotal,
   inventoryCards: WalletInventoryCard[]
 ): string {
-  return `${resolveSummaryMetalWeight(metal, inventoryCards)}${metal.unit}`
+  return `${formatGoldAmount(resolveSummaryMetalWeight(metal, inventoryCards))}${metal.unit}`
 }
 
 export function resolveAssetsRialValue(
diff --git a/src/utils/serviceFee.ts b/src/utils/serviceFee.ts
index c91b6aa..b95de92 100644
--- a/src/utils/serviceFee.ts
+++ b/src/utils/serviceFee.ts
@@ -6,6 +6,31 @@ export const serviceFeePercentage = ref<number>(0.01)
 /** true = مبالغ رند: فروش → ریال دقیق (کارمزد از طلا)؛ خرید → وزن دقیق (کارمزد از ریال) */
 export const feeDeductFromGold = ref(false)
 
+/** آخرین فیلدی که کاربر مستقیم ویرایش کرده — مبنای به‌روزرسانی هنگام تغییر قیمت */
+export type TradeInputLock = 'gram' | 'rial' | null
+
+/** حداکثر اعشار ذخیره/ارسال به سرور (مطابق orders.amount) */
+export const TRADE_GRAM_STORAGE_DECIMALS = 10
+
+/** حداکثر اعشار نمایش به کاربر در اپ */
+export const TRADE_GRAM_DISPLAY_DECIMALS = 8
+
+export function normalizeOrderGoldAmount(grams?: number | null): number {
+  const value = Number(grams ?? 0)
+  if (!Number.isFinite(value) || value === 0) return 0
+  return parseFloat(value.toFixed(TRADE_GRAM_STORAGE_DECIMALS))
+}
+
+export function formatTradeGramDisplay(grams?: number | null): number {
+  const value = Number(grams ?? 0)
+  if (!Number.isFinite(value)) return 0
+  return parseFloat(value.toFixed(TRADE_GRAM_DISPLAY_DECIMALS))
+}
+
+function feeRate() {
+  return Number(serviceFeePercentage.value)
+}
+
 export async function loadServiceFeeFromSettings() {
   try {
     const settings = await getSettings()
@@ -39,7 +64,58 @@ export function calcFeeInGrams(goldValue?: number | null) {
 /** گرم معادل برای دریافت دقیق مبلغ ریالی در فروش */
 export function calcGoldAmountFromTargetRial(rialAmount: number, unitPriceRial: number) {
   if (!rialAmount || !unitPriceRial) return 0
-  return parseFloat((rialAmount / unitPriceRial).toFixed(6))
+  return normalizeOrderGoldAmount(rialAmount / unitPriceRial)
+}
+
+/** وقتی کاربر گرم را قفل کرده — ریال نمایشی/قابل پرداخت از همان گرم */
+export function calcRialFromLockedGram(displayGram: number, unitPriceRial: number, isBuy: boolean) {
+  const grams = Number(displayGram)
+  const unit = Number(unitPriceRial)
+  if (!grams || !unit) return 0
+  const fee = feeRate()
+
+  if (isBuy) {
+    if (feeDeductFromGold.value) {
+      return Math.round(grams * unit * (1 + fee))
+    }
+    return Math.round(grams * unit)
+  }
+
+  if (feeDeductFromGold.value) {
+    return Math.round(grams * unit)
+  }
+  return Math.round(grams * unit * (1 - fee))
+}
+
+/** وقتی کاربر ریال را قفل کرده — گرم نمایشی از همان مبلغ */
+export function calcGramFromLockedRial(rialAmount: number, unitPriceRial: number, isBuy: boolean) {
+  const rial = Number(rialAmount)
+  const unit = Number(unitPriceRial)
+  if (!rial || !unit) return 0
+  const fee = feeRate()
+
+  if (isBuy) {
+    if (feeDeductFromGold.value) {
+      return rial / (unit * (1 + fee))
+    }
+    return (rial / unit) * (1 - fee)
+  }
+
+  if (feeDeductFromGold.value) {
+    return rial / unit
+  }
+  return rial / (unit * (1 - fee))
+}
+
+/** مبلغ ریالی قفل‌شده توسط کاربر — برای ارسال به سرور */
+export function calcTradeTargetCash(
+  goldCash?: number | null,
+  inputLock?: TradeInputLock,
+): number | undefined {
+  if (inputLock !== 'rial') return undefined
+  const cash = Number(goldCash ?? 0)
+  if (cash <= 0) return undefined
+  return Math.round(cash)
 }
 
 /** مبلغ نهایی قابل پرداخت (خرید) یا دریافت (فروش) به ریال */
@@ -49,41 +125,67 @@ export function calcPayablePriceRial(
   isBuy: boolean,
   targetRialCash?: number | null
 ) {
+  if (targetRialCash != null && Number(targetRialCash) > 0) {
+    return Number(targetRialCash)
+  }
+
   if (feeDeductFromGold.value) {
     if (isBuy) return finalPriceRial + feeInRial
-    if (targetRialCash != null && Number(targetRialCash) > 0) return Number(targetRialCash)
     return finalPriceRial
   }
   return isBuy ? finalPriceRial : Math.max(0, finalPriceRial - feeInRial)
 }
 
-/** وزن ارسالی به سرور — فروش رند: از مبلغ ریالی هدف */
+/** وزن ارسالی به سرور */
 export function calcOrderGoldAmount(
   goldValue?: number | null,
   goldCash?: number | null,
   unitPriceRial?: number,
-  isBuy?: boolean
+  isBuy?: boolean,
+  inputLock?: TradeInputLock
 ) {
   const gold = Number(goldValue ?? 0)
-  if (isBuy || !feeDeductFromGold.value) {
-    return parseFloat(gold.toFixed(6))
-  }
-  const targetCash = calcSellTargetCash(goldCash, goldValue, unitPriceRial)
+  const cash = Number(goldCash ?? 0)
   const unit = Number(unitPriceRial ?? 0)
-  if (targetCash != null && unit > 0) {
-    return calcGoldAmountFromTargetRial(targetCash, unit)
+
+  if (isBuy && inputLock === 'rial' && cash > 0 && unit > 0) {
+    if (feeDeductFromGold.value) {
+      const fee = feeRate()
+      return normalizeOrderGoldAmount(cash / (unit * (1 + fee)))
+    }
+    return normalizeOrderGoldAmount(cash / unit)
   }
-  return parseFloat(gold.toFixed(6))
+
+  if (!isBuy && feeDeductFromGold.value) {
+    if (inputLock === 'rial' && cash > 0 && unit > 0) {
+      return calcGoldAmountFromTargetRial(cash, unit)
+    }
+    if (inputLock !== 'rial') {
+      return normalizeOrderGoldAmount(gold)
+    }
+    const targetCash = calcSellTargetCash(goldCash, goldValue, unitPriceRial, inputLock)
+    if (targetCash != null && unit > 0) {
+      return calcGoldAmountFromTargetRial(targetCash, unit)
+    }
+  }
+
+  return normalizeOrderGoldAmount(gold)
 }
 
 /** مبلغ ریالی دقیق دریافتی در فروش (فقط وقتی کاربر با ریال وارد کرده) */
 export function calcSellTargetCash(
   goldCash?: number | null,
   goldValue?: number | null,
-  unitPriceRial?: number
+  unitPriceRial?: number,
+  inputLock?: TradeInputLock
 ) {
+  if (!feeDeductFromGold.value) return undefined
+  if (inputLock === 'gram') return undefined
+
   const cash = Number(goldCash ?? 0)
-  if (!feeDeductFromGold.value || cash <= 0) return undefined
+  if (cash <= 0) return undefined
+  if (inputLock === 'rial') return Math.round(cash)
+
   const gold = Number(goldValue ?? 0)
   const unit = Number(unitPriceRial ?? 0)
   if (gold > 0 && unit > 0) {
diff --git a/src/utils/usePrice.ts b/src/utils/usePrice.ts
index 0bf0c34..63b4960 100644
--- a/src/utils/usePrice.ts
+++ b/src/utils/usePrice.ts
@@ -1,24 +1,46 @@
-export function usePrice(price: number, digit = true, unit = 'ریال') {
-  price= price??0
-  let _price = price.toString()
+function formatGroupedPrice(price: string | number | null | undefined, digit: boolean) {
+  let value = price === null || price === undefined ? '' : String(price)
   if (digit) {
-    _price = _price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+    value = value.replace(/\B(?=(\d{3})+(?!\d))/g, ',')
   }
-  return `${_price} ${unit}`
+  return value
 }
 
-export function usePriceWithoutType(price?: number, digit = true, unit = 'ریال') {
-  let _price = price?.toString()
-  if (digit) {
-    _price = _price?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+/** مبلغ ریالی — بدون اعشار، گرد به بالا */
+export function ceilRial(price?: number | string | null): number {
+  const num = Number(price ?? 0)
+  if (!Number.isFinite(num)) {
+    return 0
   }
-  return `${_price}`
+
+  return Math.ceil(num)
+}
+
+export function formatNumber(value: string | number | null | undefined, grouped = false): string {
+  return formatGroupedPrice(value, grouped)
+}
+
+export function usePrice(price: number, digit = true, unit = 'ریال') {
+  const formatted = formatGroupedPrice(ceilRial(price), digit)
+  return `${formatted} ${unit}`
+}
+
+export function usePriceWithoutType(price?: number, digit = true) {
+  return formatGroupedPrice(ceilRial(price), digit)
 }
 
 export function useTowDecimal(num: string | number): string | number {
   const temp = num.toString().match(/^-?\d+(?:\.\d{0,2})?/)
-  if (temp && temp.length > 0) return temp[0]
-  return Math.round(+num * 100) / 100
+  if (temp && temp.length > 0) return formatGroupedPrice(temp[0], false)
+  return formatGroupedPrice(Math.round(+num * 100) / 100, false)
+}
+
+export function formatSignedPercentChange(value: number): string {
+  if (!value) return '0%'
+
+  const formatted = useTowDecimal(Math.abs(value))
+  const prefix = value > 0 ? '+' : '-'
+  return `${prefix}${formatted}%`
 }
 
 export function useFormat(num: string | number, unit = '') {
@@ -28,11 +50,26 @@ export function useFormat(num: string | number, unit = '') {
 type TransactionPriceSource = {
   cash?: number | null
   gold?: number | null
+  type?: number | null
   order?: {
     price?: number | null
     total_price?: number | null
     amount?: number | null
+    sts?: number | null
+    sts_str?: string | number | null
+    payment_sts?: number | null
   } | null
+  withdraw?: {
+    sts?: number | null
+    sts_str?: string | number | null
+  } | null
+  order_id?: number | null
+}
+
+const ORDER_STATUS_LABELS: Record<number, string> = {
+  1: 'باز',
+  2: 'موفق',
+  3: 'ناموفق',
 }
 
 export function getTransactionTradePrice(item: TransactionPriceSource): number {
@@ -57,6 +94,38 @@ export function getTransactionTradePrice(item: TransactionPriceSource): number {
   return 0
 }
 
+export function resolveTransactionStatusLabel(item?: TransactionPriceSource | null): string {
+  if (!item) return ''
+
+  const raw = item.order?.sts_str ?? item.withdraw?.sts_str
+  if (typeof raw === 'string') {
+    const trimmed = raw.trim()
+    if (trimmed && trimmed !== 'بدون مقدار') {
+      return trimmed
+    }
+  }
+
+  if (typeof raw === 'number' || (typeof raw === 'string' && /^\d+$/.test(String(raw).trim()))) {
+    const mapped = ORDER_STATUS_LABELS[Number(raw)]
+    if (mapped) return mapped
+  }
+
+  const sts = item.order?.sts ?? item.withdraw?.sts
+  if (sts != null && ORDER_STATUS_LABELS[Number(sts)]) {
+    return ORDER_STATUS_LABELS[Number(sts)]
+  }
+
+  if (item.order_id && Number(item.order?.payment_sts) === 4) {
+    return 'موفق'
+  }
+
+  if (item.order_id && (item.type === 1 || item.type === 2 || item.type === 10)) {
+    return 'موفق'
+  }
+
+  return ''
+}
+
 export function getTransactionGoldAmount(item: TransactionPriceSource): number {
   const gold = Number(item.gold) || 0
   if (Math.abs(gold) > 0) {
@@ -74,8 +143,13 @@ export function getTransactionGoldAmount(item: TransactionPriceSource): number {
   return gold
 }
 
-export function formatGoldAmount(amount?: number | null): string {
+export function formatGoldAmount(amount?: number | null, decimals = 8): string {
   const num = Number(amount)
   if (!Number.isFinite(num)) return '0'
-  return String(Number(num.toFixed(3)))
+  return formatGroupedPrice(Number(num.toFixed(decimals)), false)
+}
+
+/** وزن فلز (گرم) — بدون گرد کردن به بالا */
+export function formatWeightAmount(amount?: number | null): string {
+  return formatGoldAmount(amount)
 }
diff --git a/src/views/base/gold/index.vue b/src/views/base/gold/index.vue
index 7a06203..3cdd78a 100644
--- a/src/views/base/gold/index.vue
+++ b/src/views/base/gold/index.vue
@@ -24,14 +24,9 @@
           <img :src="img1" alt="" class="h-[88px] absolute">
           <div class="w-full items-center flex flex-col">
             <div class="text-gray-700 font-bold">{{ !isBuy ? 'قیمت فروش' : 'قیمت خرید' }}</div>
-            <div class="flex gap-1 mt-3 text-xs items-center">
-              <div class="gold-live-price">
-                <Vue3Odometer
-                  :key="isBuy ? 'buy' : 'sell'"
-                  :value="displayedGoldPrice"
-                  :class="[!isBuy ? 'text-red-700' : 'text-green-700', 'o-text !text-2xl font-bold color-transition']"
-                  style="font-family: iran-sans; direction: ltr"
-                />
+            <div v-if="price" class="flex gap-1 mt-3 text-xs items-center">
+              <div :class="!isBuy ? 'text-red-700' : 'text-green-700'" class="font-bold text-2xl color-transition">
+                {{ usePriceWithoutType(goldPriceValue) }}
               </div>
               ریال
             </div>
@@ -61,7 +56,7 @@
             <!--              {{walletStore?.walletInfo?.gold}}-->
             <Transition mode="out-in" name="fade">
               <div v-if="!isBuy" class="font-bold text-xs">
-                <div> {{ `موجودی کیف طلا: ${walletStore?.walletInfo?.gold ?? 0} گرم` }}</div>
+                <div> {{ `موجودی کیف طلا: ${formatGoldAmount(walletStore?.walletInfo?.gold ?? 0)} گرم` }}</div>
                 <!--                <div v-if="walletStore?.walletInfo?.gold_block !== 0">
                                   {{ `موجودی قابل برداشت طلا: ${walletStore?.walletInfo?.gold_block ?? 0} گرم` }}
                                 </div>-->
@@ -83,13 +78,6 @@
                           @change="percentChange" />
               </a-form-item>
             </Transition>
-            <Transition mode="out-in" name="fade">
-              <div v-if="priceErrorVisible" class="flex gap-1 items-center text-xs mt-[-15px] text-blue-600">
-                <BasicIcon icon="vuesax-linear:info-circle" />
-                ارزش کل وارد شده بر حسب گرم طلا محاسبه خواهد شد و قیمت وارد شده معادل {{ usePrice(parseInt(finalPrice.toFixed(0))) }} می
-                باشد!
-              </div>
-            </Transition>
           </div>
         </div>
         <GoldLoading v-model:show="infoVisible" />
@@ -150,14 +138,14 @@
         <div class="flex justify-between ">
           <div>وزن:</div>
           <div class="flex items-center">
-            <div class="font-bold">{{ form.goldValue }}</div>
+            <div class="font-bold">{{ displayTradeGoldAmount }}</div>
             <div class="text-xs mr-1">گرم</div>
           </div>
         </div>
         <div class="flex justify-between mt-3">
           <div>مظنه:</div>
           <div class="flex items-center">
-            <div class="font-bold">{{ usePriceWithoutType(isBuy ? price.buy ?? 0 : price.sell ?? 0) }}</div>
+            <div class="font-bold">{{ usePriceWithoutType(Math.round(goldPriceValue)) }}</div>
             <div class="text-xs mr-1">ریال</div>
           </div>
         </div>
@@ -172,7 +160,7 @@
         <div v-if="isBuy && feeDeductFromGold" class="flex justify-between mt-3">
           <div>طلا دریافتی:</div>
           <div class="flex items-center">
-            <div class="font-bold">{{ form.goldValue }}</div>
+            <div class="font-bold">{{ displayTradeGoldAmount }}</div>
             <div class="text-xs mr-1">گرم (دقیق — کارمزد از ریال)</div>
           </div>
         </div>
@@ -213,10 +201,10 @@
 
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import img1 from '@/assets/img/home_ly2.svg'
-import { usePrice, usePriceWithoutType } from '@/utils/usePrice'
+import { usePrice, usePriceWithoutType, formatGoldAmount } from '@/utils/usePrice'
 import BasicInput from '@/components/BasicPacks/BasicInput.vue'
 import type { Gold } from '@/models/gold'
-import { isIphone, loading, loadingMore, toFixedDownThreeChar } from '@/utils'
+import { isIphone, loading, loadingMore } from '@/utils'
 import BasicButton from '@/components/BasicPacks/BasicButton.vue'
 import router from '@/router'
 import { useWalletStore } from '@/store/walletStore'
@@ -238,21 +226,27 @@ import type { Transaction } from '@/models/transaction'
 import type { TableEngineInput, TableOutput } from '@/models/table'
 import { useInfiniteScroll } from '@vueuse/core'
 import { getTransactionTable } from '@/api/transaction'
-import { getLastPrices, lastPrice, setIntervalGetAllPrice, stopPriceInterval } from '@/utils/price'
+import { getLastPrices, getTradeBuyPrice, getTradeSellPrice, lastPrice, setIntervalGetAllPrice, stopPriceInterval } from '@/utils/price'
+import { isStoreClosed, getStoreClosedMessage } from '@/utils/storeHours'
 import type { Product } from '@/models/products'
 import { useFundUserStore } from '@/store/fundStore'
 import {
   calcFeeInGrams,
+  calcGramFromLockedRial,
   calcOrderGoldAmount,
   calcPayablePriceRial,
+  calcRialFromLockedGram,
   calcSellGoldDebit,
   calcSellTargetCash,
+  calcTradeTargetCash,
   feeDeductFromGold,
-  loadServiceFeeFromSettings
+  formatTradeGramDisplay,
+  loadServiceFeeFromSettings,
+  normalizeOrderGoldAmount,
+  serviceFeePercentage,
+  type TradeInputLock,
 } from '@/utils/serviceFee'
 import Bg_main from '@/components/bg_main.vue'
-import Vue3Odometer from 'vue3-odometer'
-import 'odometer/themes/odometer-theme-default.css'
 const infoVisible = ref(false)
 const walletStore = useWalletStore()
 const userStore = useUserStore()
@@ -261,7 +255,6 @@ const confirmAction = ref<boolean>(false)
 const noCompleteVisible = ref<boolean>(false)
 const buyItems = ref<Transaction[]>([])
 const sellItems = ref<Transaction[]>([])
-const priceErrorVisible = ref<boolean>(false)
 const buyTableOutput = ref<TableOutput<Transaction> | null>(null)
 const sellTableOutput = ref<TableOutput<Transaction> | null>(null)
 const el = ref()
@@ -272,6 +265,7 @@ interface Prop {
 
 const props = withDefaults(defineProps<Prop>(), {})
 const isBuy = ref<boolean>(true)
+const inputLock = ref<TradeInputLock>(null)
 
 const buyPagination = ref<TableEngineInput>({
   filters: [{
@@ -293,10 +287,16 @@ const sellPagination = ref<TableEngineInput>({
 })
 
 const unitPrice = computed(() =>
-  isBuy.value ? (price.value?.buy ?? 0) : (price.value?.sell ?? 0)
+  isBuy.value ? getTradeBuyPrice(lastPrice.value) : getTradeSellPrice(lastPrice.value)
 )
 const orderGoldAmount = computed(() =>
-  calcOrderGoldAmount(form.value?.goldValue, form.value?.goldCash, unitPrice.value, isBuy.value)
+  calcOrderGoldAmount(
+    form.value?.goldValue,
+    form.value?.goldCash,
+    unitPrice.value,
+    isBuy.value,
+    inputLock.value
+  )
 )
 const feeInGrams = computed(() => calcFeeInGrams(orderGoldAmount.value))
 const finalPrice = computed(() => orderGoldAmount.value * unitPrice.value)
@@ -307,13 +307,23 @@ const payablePrice = computed(() =>
     finalPrice.value,
     feeInRial.value,
     isBuy.value,
-    !isBuy.value ? form.value?.goldCash : undefined
+    inputLock.value === 'rial' ? form.value?.goldCash : undefined
   )
 )
 const sellGoldDebit = computed(() => calcSellGoldDebit(orderGoldAmount.value, feeInGrams.value))
 
+const displayTradeGoldAmount = computed(() =>
+  formatTradeGramDisplay(orderGoldAmount.value)
+)
+
+const priceUnavailable = computed(() => {
+  const unit = unitPrice.value
+  return !unit || Number.isNaN(unit) || unit <= 0
+})
+
 const disableTransaction = computed(() =>
   loading.value ||
+  isStoreClosed() ||
   form.value?.goldValue === undefined ||
   form.value?.goldValue === '' ||
   form.value?.goldCash === '' ||
@@ -321,7 +331,7 @@ const disableTransaction = computed(() =>
   (isBuy.value ? (form.value?.goldCash ?? 0) < 500000 : (form.value?.goldValue ?? 0) < 0.001) ||
   (!isBuy.value && sellGoldDebit.value > (walletStore?.walletInfo?.gold ?? 0)) ||
   (isBuy.value && payablePrice.value > (walletStore?.walletInfo?.cash ?? 0)) ||
-  price.value?.buy === undefined)
+  priceUnavailable.value)
 
 function refreshTable() {
   sellItems.value = []
@@ -518,20 +528,18 @@ onUnmounted(() => {
 })
 
 function percentChange(val: number) {
-  if (val !== 0)
+  if (val !== 0) {
     if (isBuy.value) {
       form.value.goldCash = unitCashCalculator.value * val
       calculateGold(form.value.goldCash)
-      calculateCash(form.value.goldValue)
     } else {
-      // console.log((unitGoldCalculator.value * val).toFixed(2))
-      // form.value.goldValue = parseFloat((unitGoldCalculator.value * val).toFixed(2))
-      form.value.goldValue = toFixedDownThreeChar(parseFloat(unitGoldCalculator.value * val))
+      form.value.goldValue = formatTradeGramDisplay(parseFloat(String(unitGoldCalculator.value * val)))
       calculateCash(form.value.goldValue)
     }
-  else {
+  } else {
     form.value.goldValue = undefined
     form.value.goldCash = undefined
+    inputLock.value = null
   }
 }
 
@@ -544,54 +552,61 @@ const unitCashCalculator = computed(() => {
   return (walletStore?.walletInfo?.cash ?? 0) / 100
 })
 
-function calculateCash(val: number) {
-  priceErrorVisible.value = false
-  // console.log(val)
-  if (price.value) {
-    if (isBuy.value) {
-      if (val) form.value.goldCash = parseFloat((val * price?.value?.buy).toFixed(0))
-      else form.value.goldCash = undefined
-    } else {
-      if (val) form.value.goldCash = parseFloat((val * price?.value?.sell).toFixed(0))
-      else form.value.goldCash = undefined
+function syncFormWithLatestPrice() {
+  const unit = unitPrice.value
+  if (!unit || Number.isNaN(unit) || !inputLock.value) return
+
+  if (inputLock.value === 'gram') {
+    const goldValue = form.value.goldValue
+    if (goldValue !== undefined && goldValue !== null && goldValue !== '' && !isNaN(Number(goldValue))) {
+      calculateCash(Number(goldValue))
     }
+    return
+  }
+
+  const goldCash = form.value.goldCash
+  if (goldCash !== undefined && goldCash !== null && goldCash !== '' && !isNaN(Number(goldCash))) {
+    calculateGold(Number(goldCash))
   }
 }
 
+watch(
+  () => [unitPrice.value, isBuy.value],
+  () => {
+    syncFormWithLatestPrice()
+  }
+)
+
+watch([feeDeductFromGold, () => serviceFeePercentage.value], () => {
+  syncFormWithLatestPrice()
+})
+
+function calculateCash(val: number) {
+  inputLock.value = 'gram'
+  const unit = unitPrice.value
+  if (!unit || Number.isNaN(unit)) return
+
+  if (val === undefined || val === null || Number.isNaN(val)) {
+    form.value.goldCash = undefined
+    inputLock.value = null
+    return
+  }
+
+  form.value.goldCash = calcRialFromLockedGram(val, unit, isBuy.value)
+}
+
 function calculateGold(val: number) {
-  // console.log(val)
-  // form.value.goldCash = usePriceWithoutType(form.value.goldCash)
-  if (price.value) {
-    if (isBuy.value) {
-      if (val) {
-        form.value.goldValue = toFixedDownThreeChar(parseFloat(val / price?.value?.buy))
-        if (parseInt(finalPrice.value) > 0) priceErrorVisible.value = true
-        if (parseInt(finalPrice.value) === 0) priceErrorVisible.value = false
-      } else if (val.toString() === '') {
-        form.value.goldValue = undefined
-        priceErrorVisible.value = false
-      } else {
-        form.value.goldValue = 0
-        priceErrorVisible.value = false
-      }
-    } else {
-      if (val) {
-        if (feeDeductFromGold.value) {
-          form.value.goldValue = parseFloat((val / (price?.value?.sell ?? 1)).toFixed(6))
-        } else {
-          form.value.goldValue = toFixedDownThreeChar(parseFloat(String(val / price?.value?.sell)))
-        }
-        if (parseInt(String(finalPrice.value)) > 0) priceErrorVisible.value = true
-        if (parseInt(String(finalPrice.value)) === 0) priceErrorVisible.value = false
-      } else if (val.toString() === '') {
-        // console.log('sasasasasasa')
-        form.value.goldValue = undefined
-        priceErrorVisible.value = false
-      } else {
-        form.value.goldValue = 0
-        priceErrorVisible.value = false
-      }
-    }
+  inputLock.value = 'rial'
+  const unit = unitPrice.value
+  if (!unit || Number.isNaN(unit)) return
+
+  if (val) {
+    form.value.goldValue = formatTradeGramDisplay(calcGramFromLockedRial(val, unit, isBuy.value))
+  } else if (val.toString() === '') {
+    form.value.goldValue = undefined
+    inputLock.value = null
+  } else {
+    form.value.goldValue = 0
   }
 }
 
@@ -613,7 +628,7 @@ function setIsBuy(val: boolean) {
   form.value.goldValue = undefined
   form.value.goldCash = undefined
   form.value.percentWallet = 0
-  priceErrorVisible.value = false
+  inputLock.value = null
   // console.log(bganim.value.classList)
   // bganim?.value?.classList.add(val?'right':'left')
   // bganim?.value?.style.transform = `translateX(${val ? '0' : '-100'});`
@@ -629,10 +644,7 @@ const formatter = (value: number) => {
 
 const price = computed((): Price => <Price>lastPrice.value ?? 0)
 
-const displayedGoldPrice = computed(() => {
-  if (!lastPrice.value) return 0
-  return isBuy.value ? (lastPrice.value.buy ?? 0) : (lastPrice.value.sell ?? 0)
-})
+const goldPriceValue = computed(() => unitPrice.value)
 
 async function initPrice() {
   try {
@@ -648,18 +660,32 @@ async function initPrice() {
 }
 
 function okConfirm() {
+  if (isStoreClosed()) {
+    message.warning(getStoreClosedMessage())
+    return
+  }
   confirmAction.value = true
 }
 
 async function ok() {
+  if (isStoreClosed()) {
+    message.warning(getStoreClosedMessage())
+    return
+  }
   try {
     loading.value = true
     infoVisible.value = true
     await createOrder({
       direction: isBuy.value ? 1 : 2,
       price: Math.round(unitPrice.value),
-      amount: orderGoldAmount.value,
-      target_cash: calcSellTargetCash(form.value.goldCash, form.value.goldValue, unitPrice.value),
+      amount: normalizeOrderGoldAmount(orderGoldAmount.value),
+      target_cash: calcTradeTargetCash(form.value.goldCash, inputLock.value)
+        ?? calcSellTargetCash(
+        form.value.goldCash,
+        form.value.goldValue,
+        unitPrice.value,
+        inputLock.value
+      ),
     })
     await walletStore.getMyWallet()
     await router.push({ name: 'transactions' })
@@ -668,6 +694,7 @@ async function ok() {
       goldCash: undefined,
       percentWallet: undefined
     }
+    inputLock.value = null
     // refreshTable()
     message.success('سفارش شما با موفقیت انجام شد')
     await fundStore.getMyFund()
@@ -716,14 +743,4 @@ async function ok() {
   right: 100%;
   transform: translate(100%, 0);
 }
-
-.gold-live-price {
-  :deep(.odometer) {
-    line-height: 1;
-  }
-
-  :deep(.odometer-digit) {
-    overflow: hidden;
-  }
-}
 </style>
diff --git a/src/views/base/home/desktop/GhatrehHomeDesktopView.vue b/src/views/base/home/desktop/GhatrehHomeDesktopView.vue
index b607d65..769d1b9 100644
--- a/src/views/base/home/desktop/GhatrehHomeDesktopView.vue
+++ b/src/views/base/home/desktop/GhatrehHomeDesktopView.vue
@@ -160,7 +160,7 @@ import { useUserStore } from '@/store/userStore'
 import { useWalletStore } from '@/store/walletStore'
 import { useWalletAssets } from '@/composables/useWalletAssets'
 import { resolveAssetsRialValue } from '@/utils/productAssets'
-import { usePrice, usePriceWithoutType, useTowDecimal } from '@/utils/usePrice'
+import { usePrice, usePriceWithoutType, useTowDecimal, formatGoldAmount } from '@/utils/usePrice'
 import {
   getLastPrices,
   getTradeBuyPrice,
@@ -210,10 +210,10 @@ const balanceLabel = computed(() => {
   }
   const metal = primaryMetalTotal.value
   if (metal && Number(metal.total_weight) > 0) {
-    return `${Number(metal.total_weight).toFixed(3)} ${metal.unit}`
+    return `${formatGoldAmount(metal.total_weight)} ${metal.unit}`
   }
   const fallback = walletStore.walletInfo?.gold_sum ?? userStore.userInfo?.wallet?.count_gold ?? 0
-  return `${Number(fallback).toFixed(3)} گرم`
+  return `${formatGoldAmount(fallback)} گرم`
 })
 
 const totalRialDisplay = computed(() =>
diff --git a/src/views/base/home/index.vue b/src/views/base/home/index.vue
index 9dc29b8..d8fc032 100644
--- a/src/views/base/home/index.vue
+++ b/src/views/base/home/index.vue
@@ -457,7 +457,7 @@ import { Swiper, SwiperSlide } from 'swiper/vue';
 import 'swiper/swiper-bundle.css';
 import img2 from '@/assets/img/banner/2.png'
 import Icon from '@/components/BasicPacks/BasicIcon.vue'
-import { usePrice, usePriceWithoutType, useTowDecimal } from '../../../utils/usePrice'
+import { usePrice, usePriceWithoutType, useTowDecimal, formatGoldAmount } from '../../../utils/usePrice'
 import {computed, createVNode, onActivated, onMounted, onUnmounted, ref, watch} from 'vue'
 import router from '@/router'
 import * as echarts from 'echarts'
@@ -526,14 +526,14 @@ const balanceLabel = computed(() => {
 
   const metal = primaryMetalTotal.value
   if (metal && Number(metal.total_weight) > 0) {
-    return `${Number(metal.total_weight).toFixed(3)} ${metal.unit}`
+    return `${formatGoldAmount(metal.total_weight)} ${metal.unit}`
   }
 
   const fallback =
     walletStore.walletInfo?.gold_sum ??
     userStore.userInfo?.wallet?.count_gold ??
     0
-  return `${Number(fallback).toFixed(3)} گرم`
+  return `${formatGoldAmount(fallback)} گرم`
 })
 
 const totalRialDisplay = computed(() =>