Merge branch 'suite' into aeddaqqa/fix-wallet-switcher-name

chain4travel · Sep 3, 2024 · 8a17766 · 8a17766
2 parents cc0e470 + cf233ff
commit 8a17766
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 1,111 deletions.
diff --git a/src/components/misc/ToS.vue b/src/components/misc/ToS.vue
@@ -2,7 +2,9 @@
     <div class="term-of-us">
         <p>
             By using this application you agree to the
-            <span class="link" @click="click('/legal')">Terms of Use.</span>
+            <span class="link" @click="redirect('https://camino.network/terms/')">
+                Terms of Use.
+            </span>
         </p>
     </div>
 </template>
@@ -13,9 +15,8 @@ import { Vue, Component, Prop } from 'vue-property-decorator'
 })
 export default class ToS extends Vue {
     helpers = this.globalHelper()
-
-    click(to: string) {
-        this.helpers.navigate(to)
+    redirect(to: string) {
+        window.open(to, '_blank')
     }
 }
 </script>

diff --git a/src/components/misc/ToSContent.vue b/src/components/misc/ToSContent.vue
diff --git a/src/components/wallet/earn/DepositOffers.vue b/src/components/wallet/earn/DepositOffers.vue
@@ -71,7 +71,11 @@ export default class DepositOffers extends Vue {
     }
 
     get platformOffers(): DepositOffer[] {
-        return this.$store.getters['Platform/depositOffers'](true)
+        const now = Date.now()
+        return this.$store.getters['Platform/depositOffers'](true).filter((offer: DepositOffer) => {
+            const endTime = offer.end.toNumber() * 1000
+            return now < endTime
+        })
     }
 
     get hasOffers(): boolean {
@@ -91,6 +95,7 @@ export default class DepositOffers extends Vue {
     get canAddOffers(): boolean {
         return this.$store.getters['Platform/isOfferCreator']
     }
+
     cleanAvaxBN(val: BN): string {
         return cleanAvaxBN(val)
     }

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -1,5 +1,4 @@
 import Create from '@/views/Create.vue'
-import Legal from '@/views/Legal.vue'
 import Wallet from '@/views/Wallet.vue'
 import Activity from '@/views/wallet/Activity.vue'
 import Advanced from '@/views/wallet/Advanced.vue'
@@ -34,11 +33,6 @@ const ifAuthenticated = (to: Route, from: Route, next: Function) => {
 }
 
 const routes = [
-    {
-        path: '/wallet/legal',
-        name: 'legal',
-        component: Legal,
-    },
     {
         path: '/wallet/create',
         name: 'create',

diff --git a/src/store/modules/platform/platform.ts b/src/store/modules/platform/platform.ts
@@ -347,17 +347,19 @@ const platform_module: Module<PlatformState, RootState> = {
         },
         updateExpiredDepositRewards:
             (state) => async (depositOfferID: string, timestamp: number) => {
-                if (!state.depositOffers.find((v) => v.id === depositOfferID)) {
-                    const l = await ava.PChain().getAllDepositOffers(timestamp)
-                    const offer = l.find((v) => v.id === depositOfferID)
+                const offerExists = state.depositOffers.some((v) => v.id === depositOfferID)
+
+                if (!offerExists) {
+                    const allOffers = await ava.PChain().getAllDepositOffers(timestamp)
+                    const offer = allOffers.find((v) => v.id === depositOfferID)
 
                     if (offer) {
                         state.depositOffers.push(offer)
                         return offer
                     }
                 }
 
-                return
+                return null
             },
         depositOffer: (state) => (depositOfferID: string) => {
             return state.depositOffers.find((v) => v.id === depositOfferID)

diff --git a/src/views/Legal.vue b/src/views/Legal.vue
diff --git a/src/views/mountLegal.ts b/src/views/mountLegal.ts
diff --git a/webpack.common.js b/webpack.common.js
@@ -74,7 +74,6 @@ module.exports = {
                 './moutHomePage': './src/mountHomePage.ts',
                 './mountCreate': './src/views/createMount.ts',
                 './mountAccessComponents': './src/views/access/mountAccessComponents.ts',
-                './mountLegal': './src/views/mountLegal.ts',
                 './mountAccountMenu': './src/components/wallet/sidebar/mountAccountMenu.ts',
                 './mountAccounts': './src/components/Access/mountAccounts.ts',
                 './mountKyesComponent': './src/components/wallet/manage/mountKyesComponent.ts',
@@ -83,7 +82,7 @@ module.exports = {
                 './mountVersionComponent': './src/components/misc/mountVersion.ts',
                 './mountCreateOfferForm': './src/components/wallet/earn/mountCreateOfferForm.ts',
                 './caminoClient': './src/AVA.ts',
-                './mountVerifyWalletSetting': './src/views/mountVerifyWalletSetting.ts'
+                './mountVerifyWalletSetting': './src/views/mountVerifyWalletSetting.ts',
             },
         }),
         new HtmlWebPackPlugin({