diff --git a/quasar.conf.js b/quasar.conf.js index b5ea96fb..652989b2 100755 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -251,6 +251,8 @@ module.exports = configure((ctx) => ({ 'Cookies', 'Loading', 'AppVisibility', + 'LocalStorage', + 'SessionStorage', ], get plugins_1() { return this._plugins; diff --git a/src/components/CContactUser/CContactUser.ts b/src/components/CContactUser/CContactUser.ts index e280f7f5..76f9189c 100755 --- a/src/components/CContactUser/CContactUser.ts +++ b/src/components/CContactUser/CContactUser.ts @@ -32,7 +32,7 @@ export default defineComponent({ const userStore = useUserStore() const globalStore = useGlobalStore() - const showsendCoinTo = ref(true) + const showsendCoinTo = ref(false) const showingtooltip = ref(false) const site = computed(() => globalStore.site) diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue index 3139cdeb..edc3f532 100755 --- a/src/components/CContactUser/CContactUser.vue +++ b/src/components/CContactUser/CContactUser.vue @@ -71,12 +71,12 @@ -
+
diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue index 472d98e8..aabd26f6 100755 --- a/src/components/CMyUser/CMyUser.vue +++ b/src/components/CMyUser/CMyUser.vue @@ -422,7 +422,7 @@ clickable v-close-popup dense - @click="naviga(`/my/` + contact.username)" + @click="naviga(`/my/` + contact.username + '?sendris=0')" > @@ -811,7 +811,7 @@ clickable v-close-popup dense - @click="naviga(`/my/` + contact.username)" + @click="naviga(`/my/` + contact.username + '?sendris=0')" > diff --git a/src/components/CSendCoins/CSendCoins.ts b/src/components/CSendCoins/CSendCoins.ts index de7715cd..e24dc2d9 100755 --- a/src/components/CSendCoins/CSendCoins.ts +++ b/src/components/CSendCoins/CSendCoins.ts @@ -282,7 +282,8 @@ export default defineComponent({ qty.value = props.qtydefault if (props.sendRIS) { - qty.value = props.sendRIS + if (props.sendRIS !== '0') + qty.value = props.sendRIS } await aggiorna() @@ -403,7 +404,7 @@ export default defineComponent({ } function checkRisValid() { - return qty.value ? qty.value && getQty() > 0.01 && accountloaded.value + return qty.value ? qty.value && getQty() >= 0.01 && accountloaded.value && getQty() <= circuitStore.getRemainingCoinsToSend(accountloaded.value) : false } diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue index c3d25763..5dff7e7c 100755 --- a/src/components/CSendCoins/CSendCoins.vue +++ b/src/components/CSendCoins/CSendCoins.vue @@ -14,10 +14,16 @@ {{ $t('circuit.sendcoins') }} - + - + -
+ + + + + + + + {{ $t('circuit.descr_casuale') }} @@ -242,7 +270,9 @@ > -
{{$t('circuit.sendcoinsto', { +
+ {{ + $t('circuit.sendcoinsto', { qty, coin: circuitloaded.symbol, dest: to_group @@ -250,7 +280,9 @@ : to_user ? tools.getNomeUtenteByRecUser(to_user) : to_contocom, - })}} sul {{circuitsel }} + }) + }} + sul {{ circuitsel }}
@@ -281,7 +313,9 @@ }) " color="positive" - :icon="(step === 2) ? 'img: images/1ris_rosso_100.png' : 'navigate_next'" + :icon=" + step === 2 ? 'img: images/1ris_rosso_100.png' : 'navigate_next' + " @click="clickAvanti(step)" > diff --git a/src/views/user/mycircuit/mycircuit.vue b/src/views/user/mycircuit/mycircuit.vue index 01f40c85..6b910833 100755 --- a/src/views/user/mycircuit/mycircuit.vue +++ b/src/views/user/mycircuit/mycircuit.vue @@ -1,5 +1,5 @@