From 3840771a584b8020672ba00df981e501509209b2 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Wed, 28 Aug 2024 18:05:46 +0100
Subject: [PATCH 1/5] feat: Display - instead of 0 in Wallet Overview Widget -
 MEED-7354 - Meeds-io/MIPs#155 (#545)

---
 .../wallet-user-balance/components/WalletUserBalance.vue     | 2 +-
 .../weekly-earnings/components/WeeklyEarnings.vue            | 2 +-
 .../wallet-setup-admin/components/WalletAdminSetup.vue       | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
index f5a7965f2..571c4da37 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
@@ -10,7 +10,7 @@
         <span
           :class="typographyClass"
           class="ma-2 text-color font-weight-bold d-flex align-self-center">
-          {{ balanceToDisplay }}
+          {{ balanceToDisplay || '-' }}
         </span>
       </div>
     </div>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
index d3508da59..c4ba07675 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
@@ -25,7 +25,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <span
           :class="typographyClass"
           class="ma-2 text-color font-weight-bold d-flex align-self-center">
-          {{ weeklyRewardToDisplay }}
+          {{ weeklyRewardToDisplay || '-' }}
         </span>
       </div>
     </div>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-setup-admin/components/WalletAdminSetup.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-setup-admin/components/WalletAdminSetup.vue
index b3e00f33f..abab87f75 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-setup-admin/components/WalletAdminSetup.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-setup-admin/components/WalletAdminSetup.vue
@@ -22,7 +22,10 @@
 <template>
   <v-app flat>
     <div class="px-6">
-      <v-list-item class="px-0" two-line dense>
+      <v-list-item
+        class="px-0"
+        two-line
+        dense>
         <v-list-item-content>
           <v-list-item-title class="text-title">
             {{ $t('wallet.administration.title') }}

From 044a9f7b66ef58af8b83146d78f8361b0ff5f1ed Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Thu, 29 Aug 2024 12:14:24 +0100
Subject: [PATCH 2/5] fix: Fix Widgets Placeholder and height - MEED-7396 -
 Meeds-io/MIPs#155 (#546)

---
 .../src/main/webapp/WEB-INF/gatein-resources.xml       |  7 +++++++
 wallet-webapps/src/main/webapp/skin/less/wallet.less   | 10 ++++------
 .../components/WalletUserBalance.vue                   |  9 ++++-----
 .../weekly-earnings/components/WeeklyEarnings.vue      |  9 ++++-----
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml b/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
index ec35736e2..1f412fe54 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -67,6 +67,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <additional-module>wallet</additional-module>
   </portlet-skin>
 
+  <portlet-skin>
+    <application-name>gamification-portlets</application-name>
+    <portlet-name>myRewards</portlet-name>
+    <skin-name>Enterprise</skin-name>
+    <additional-module>wallet</additional-module>
+  </portlet-skin>
+
   <portlet>
     <name>WalletAPI</name>
     <module>
diff --git a/wallet-webapps/src/main/webapp/skin/less/wallet.less b/wallet-webapps/src/main/webapp/skin/less/wallet.less
index 8dd655b17..048ca10e4 100644
--- a/wallet-webapps/src/main/webapp/skin/less/wallet.less
+++ b/wallet-webapps/src/main/webapp/skin/less/wallet.less
@@ -831,12 +831,10 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 .fixLinkHeight {
   min-height: 31px;
 }
-#walletBalancePortlet {
-  .big-number {
-    font-size  : 2.4rem !important;
-    line-height: 2.5rem;
-    color      : @darkGrey;
-  }
+.big-number {
+  font-size  : 32px !important;
+  line-height: 32px;
+  color      : @darkGrey;
 }
 
 #WalletOverview {
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
index 571c4da37..606b4a23b 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
@@ -2,14 +2,13 @@
   <v-app id="WalletApp" class="ma-0">
     <div
       v-show="!loading"
-      flat
-      @click="$refs.accountDetail.open()"
-      class="clickable">
-      <div class="pa-0 d-flex justify-center flex-nowrap text-color display-1 font-weight-bold big-number">
+      class="clickable"
+      @click="$refs.accountDetail.open()">
+      <div class="pa-0 d-flex justify-center flex-nowrap text-color font-weight-bold big-number">
         <span class="my-2 tertiary-color">{{ symbol }}</span>
         <span
           :class="typographyClass"
-          class="ma-2 text-color font-weight-bold d-flex align-self-center">
+          class="ma-2 text-color text-h5 font-weight-bold d-flex align-self-center">
           {{ balanceToDisplay || '-' }}
         </span>
       </div>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
index c4ba07675..404d570e3 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
@@ -17,14 +17,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <template>
   <div v-show="!loading" class="ma-0">
     <div
-      flat
-      @click="openDrawer"
-      class="clickable">
-      <div class="pa-0 d-flex justify-center flex-nowrap text-color display-1 font-weight-bold big-number">
+      class="clickable"
+      @click="openDrawer">
+      <div class="pa-0 d-flex justify-center flex-nowrap text-color font-weight-bold big-number">
         <span class="my-2 tertiary-color">{{ symbol }}</span>
         <span
           :class="typographyClass"
-          class="ma-2 text-color font-weight-bold d-flex align-self-center">
+          class="ma-2 text-color text-h5 font-weight-bold d-flex align-self-center">
           {{ weeklyRewardToDisplay || '-' }}
         </span>
       </div>

From 658d7f999324e5cd0537d0c554eb8665795dc112 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <bkhanfir@exoplatform.com>
Date: Fri, 30 Aug 2024 08:07:02 +0100
Subject: [PATCH 3/5] feat: Retrieve Last reward amount instead of estimation
 in overview - MEED-7403 - Meeds-io/MIPs#155

---
 .../js/RewardService.js                       | 35 ++++++---------
 .../components/WalletOverviewDrawer.vue       | 18 +++-----
 .../vue-app/wallet-common/walletCommon.js     |  9 ++++
 .../components/WeeklyEarnings.vue             | 45 ++++++++-----------
 .../components/reward/TimeZoneSelectBox.vue   |  2 +-
 .../wallet-reward/js/WalletTimezoneUtils.js   | 43 ++++++++++++++++++
 .../main/webapp/vue-app/wallet-reward/main.js | 21 ++++-----
 .../webapp/vue-app/wallet-reward/services.js  | 27 +++++++++++
 8 files changed, 127 insertions(+), 73 deletions(-)
 rename wallet-webapps/src/main/webapp/vue-app/{wallet-reward => wallet-common}/js/RewardService.js (86%)
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/js/WalletTimezoneUtils.js
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/wallet-reward/services.js

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/js/RewardService.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
similarity index 86%
rename from wallet-webapps/src/main/webapp/vue-app/wallet-reward/js/RewardService.js
rename to wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
index d4270e726..2f4a01763 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/js/RewardService.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/js/RewardService.js
@@ -14,28 +14,6 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import TIMEZONE_IDS from '../json/timezones.json';
-export const TIMEZONES = [];
-
-export function getTimeZones() {
-  if (TIMEZONES.length) {
-    return TIMEZONES;
-  }
-  const dateObj = new Date(0);
-  TIMEZONE_IDS.forEach((timeZone) => {
-    const dateFormat = new Intl.DateTimeFormat(eXo.env.portal.language, {
-      timeZoneName: 'long',
-      second: 'numeric',
-      timeZone: timeZone,
-    });
-    const timeZoneName = dateFormat.format(dateObj);
-    TIMEZONES.push({
-      value: timeZone,
-      text: `${timeZoneName.charAt(2).toUpperCase() + timeZoneName.substring(3, timeZoneName.length)  } (${timeZone})`,
-    });
-  });
-  return TIMEZONES;
-}
 
 export function getRewardSettings() {
   return fetch('/portal/rest/wallet/api/reward/settings', {
@@ -157,3 +135,16 @@ export function computeRewardsByUser(date) {
     }
   });
 }
+
+export function getRewardsByUser(limit) {
+  return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/wallet/api/reward/list?limit=${limit || 10}`, {
+    method: 'GET',
+    credentials: 'include',
+  }).then(resp => {
+    if (!resp?.ok) {
+      throw new Error('Error while getting user rewards', resp);
+    } else {
+      return resp.json();
+    }
+  });
+}
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
index 02053432c..ca432acf6 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
@@ -16,8 +16,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -->
 <template>
   <exo-drawer
-    ref="rewardsOverviewDrawer"
+    ref="drawer"
     :right="!$vuetify.rtl"
+    :loading="loading"
     class="rewardsOverviewDrawer">
     <template slot="title">
       {{ title }}
@@ -59,6 +60,7 @@ export default {
     pageSize: 20,
     limit: 20,
     rewardsList: [],
+    loading: false,
   }),
   computed: {
     hasMore() {
@@ -75,19 +77,15 @@ export default {
       this.title = title;
       this.reset();
       this.retrieveList();
-      this.$refs.rewardsOverviewDrawer.open();
+      this.$refs.drawer.open();
     },
     loadMore() {
       this.limit += this.pageSize;
       this.retrieveList();
     },
     retrieveList() {
-      this.$refs.rewardsOverviewDrawer.startLoading();
-      return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/wallet/api/reward/list?limit=${this.limit}`, {
-        method: 'GET',
-        credentials: 'include',
-      })
-        .then((resp) => resp && resp.ok && resp.json())
+      this.loading = true;
+      return this.$rewardService.getRewardsByUser(this.limit)
         .then(data => {
           if (data && data.length) {
             this.rewardsList = data.filter(reward => reward.transaction && reward.status === 'success');
@@ -95,9 +93,7 @@ export default {
             this.rewardsList = [];
           }
         })
-        .finally(() => {
-          this.$refs.rewardsOverviewDrawer.endLoading();
-        });
+        .finally(() => this.loading = false);
     },
   }
 };
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js b/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js
index 7a29f8d35..bcdf99a9f 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/walletCommon.js
@@ -48,11 +48,13 @@ import WalletOverviewRewardItem from './wallet-overview/components/WalletOvervie
 import WalletOverviewRewardPluginItem from './wallet-overview/components/WalletOverviewRewardPluginItem.vue';
 import WalletUserBalance from './wallet-user-balance/components/WalletUserBalance.vue';
 import WeeklyEarnings from './weekly-earnings/components/WeeklyEarnings.vue';
+
 import * as constants from './js/Constants.js';
 import * as addressRegistry from './js/AddressRegistry.js';
 import * as walletUtils from './js/WalletUtils.js';
 import * as tokenUtils from './js/TokenUtils.js';
 import * as transactionUtils from './js/TransactionUtils.js';
+import * as rewardService from './js/RewardService.js';
 
 const WalletCommon = {
   install: (Vue) => {
@@ -63,6 +65,13 @@ const WalletCommon = {
     Vue.prototype.transactionUtils = transactionUtils;
   },
 };
+
+if (!Vue.prototype.$rewardService) {
+  window.Object.defineProperty(Vue.prototype, '$rewardService', {
+    value: rewardService,
+  });
+}
+
 export const components = {
   'wallet-reward-account-detail': AccountDetail,
   'wallet-reward-address-auto-complete': AddressAutoComplete,
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
index 404d570e3..225934a2f 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
@@ -24,7 +24,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <span
           :class="typographyClass"
           class="ma-2 text-color text-h5 font-weight-bold d-flex align-self-center">
-          {{ weeklyRewardToDisplay || '-' }}
+          {{ lastRewardToDisplay || '-' }}
         </span>
       </div>
     </div>
@@ -35,26 +35,26 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 </template>
 
 <script>
-import {computeRewardsByUser} from '../../../wallet-reward/js/RewardService.js';
 export default {
-  data() {
-    return {
-      weeklyReward: null,
-      wallet: null,
-      contractDetails: null,
-      loading: true,
-    };
-  },
+  data: () => ({
+    lastReward: null,
+    wallet: null,
+    contractDetails: null,
+    loading: true,
+    limit: 10,
+  }),
   computed: {
-    selectedDate() {
-      return new Date().toISOString().substring(0, 10);
-    },
     symbol() {
       return this.contractDetails?.symbol;
     },
-    weeklyRewardToDisplay() {
-      return Number.isFinite(Number(this.weeklyReward)) ? Math.trunc(this.weeklyReward) : '';
-    }
+    lastRewardToDisplay() {
+      return Number.isFinite(Number(this.lastReward)) ? Math.trunc(this.lastReward) : 0;
+    },
+  },
+  watch: {
+    lastReward() {
+      this.$root.$emit('wallet-last-reward', this.lastReward);
+    },
   },
   created() {
     this.init()
@@ -73,16 +73,9 @@ export default {
         .then(() => this.refreshRewards());
     },
     refreshRewards() {
-      return this.wallet?.address?.length && computeRewardsByUser(this.selectedDate)
-        .then(rewardReport => {
-          if (rewardReport) {
-            const walletAddress = this.wallet.address.toUpperCase();
-            const walletReward = rewardReport.rewards.find(reward => reward.wallet.address.toUpperCase() === walletAddress);
-            this.weeklyReward = walletReward?.tokensToSend || 0;
-          } else {
-            this.weeklyReward = 0;
-          }
-        });
+      return this.wallet?.address?.length && this.$rewardService.getRewardsByUser(this.limit)
+        .then(rewards => rewards.find(r => r.transaction && r.status === 'success'))
+        .then(reward => this.lastReward = reward?.tokensToSend || 0);
     },
     openDrawer() {
       this.$refs.walletOverviewDrawer.open(this.$t('exoplatform.wallet.title.rewardedBalance'));
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue
index f7989ae5a..bad87e15f 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/reward/TimeZoneSelectBox.vue
@@ -57,7 +57,7 @@ export default {
   },
   created() {
     this.timeZone = this.value;
-    this.timeZones = this.$rewardService.getTimeZones();
+    this.timeZones = this.$walletTimezoneUtils.getTimeZones();
   },
 };
 </script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/js/WalletTimezoneUtils.js b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/js/WalletTimezoneUtils.js
new file mode 100644
index 000000000..36545be97
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/js/WalletTimezoneUtils.js
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import TIMEZONE_IDS from '../json/timezones.json';
+
+export const TIMEZONES = [];
+
+export function getTimeZones() {
+  if (TIMEZONES.length) {
+    return TIMEZONES;
+  }
+  const dateObj = new Date(0);
+  TIMEZONE_IDS.forEach((timeZone) => {
+    const dateFormat = new Intl.DateTimeFormat(eXo.env.portal.language, {
+      timeZoneName: 'long',
+      second: 'numeric',
+      timeZone: timeZone,
+    });
+    const timeZoneName = dateFormat.format(dateObj);
+    TIMEZONES.push({
+      value: timeZone,
+      text: `${timeZoneName.charAt(2).toUpperCase() + timeZoneName.substring(3, timeZoneName.length)  } (${timeZone})`,
+    });
+  });
+  return TIMEZONES;
+}
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/main.js b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/main.js
index e6b7ee17a..31ca0348d 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/main.js
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/main.js
@@ -1,36 +1,31 @@
 /*
  * This file is part of the Meeds project (https://meeds.io/).
- * Copyright (C) 2020 Meeds Association
- * contact@meeds.io
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or (at your option) any later version.
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
+ * 
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import './initComponents.js';
-import * as rewardService from './js/RewardService.js';
 
-if (!Vue.prototype.$rewardService) {
-  window.Object.defineProperty(Vue.prototype, '$rewardService', {
-    value: rewardService,
-  });
-}
+import './initComponents.js';
+import './services.js';
 
 Vue.use(Vuetify);
 Vue.use(WalletCommon);
 
-const vuetify = new Vuetify(eXo.env.portal.vuetifyPreset);
-
 const lang = (eXo && eXo.env && eXo.env.portal && eXo.env.portal.language) || 'en';
 const url = `/wallet/i18n/locale.addon.Wallet?lang=${lang}`;
-
 const appId = 'RewardApp';
 
 export function init() {
@@ -39,7 +34,7 @@ export function init() {
       Vue.createApp({
         template: `<wallet-reward-app id="${appId}"></wallet-reward-app>`,
         i18n,
-        vuetify,
+        vuetify: Vue.prototype.vuetifyOptions,
       }, `#${appId}`, 'Wallet Reward');
     })
     .finally(() => Vue.prototype.$utils?.includeExtensions?.('WalletRewardingExtension'));
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/services.js b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/services.js
new file mode 100644
index 000000000..4bd23adda
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/services.js
@@ -0,0 +1,27 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import * as walletTimezoneUtils from './js/WalletTimezoneUtils.js';
+
+if (!Vue.prototype.$walletTimezoneUtils) {
+  window.Object.defineProperty(Vue.prototype, '$walletTimezoneUtils', {
+    value: walletTimezoneUtils,
+  });
+}

From b0aa217e85487e99f1d01ae7bb6cfc4a752904d7 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <boubaker.khanfir@exoplatform.com>
Date: Fri, 30 Aug 2024 13:46:49 +0100
Subject: [PATCH 4/5] feat: Enhance UX of My Rewards Overview Widget Drawer -
 MEED-7373 - Meeds-io/MIPs#155 (#548)

---
 .../locale/addon/Wallet_en.properties         |   5 +
 .../components/WalletOverview.vue             |   4 +-
 .../components/WalletOverviewDrawer.vue       | 104 ++++++++++++++----
 .../components/WalletOverviewRewardItem.vue   |  11 +-
 .../WalletOverviewRewardPluginItem.vue        |  21 +---
 .../components/WalletUserBalance.vue          |  58 ++++------
 .../components/WeeklyEarnings.vue             |  48 ++++----
 7 files changed, 144 insertions(+), 107 deletions(-)

diff --git a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
index 6afbe1f91..e544ed279 100644
--- a/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
+++ b/wallet-services/src/main/resources/locale/addon/Wallet_en.properties
@@ -494,3 +494,8 @@ wallet.administration.initialFundsMessagePlaceholder=Enter a default message to
 wallet.administration.apply=Apply
 wallet.administration.cancel=Cancel
 wallet.administration.reset=Reset
+
+wallet.overview.rewards.title=My Wallet History
+wallet.overview.points=Points
+wallet.overview.rewards=Rewards
+wallet.overview.transactions=Activity
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue
index ad3f83c7a..1159458d7 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverview.vue
@@ -57,10 +57,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         </div>
       </div>
     </div>
-
     <wallet-overview-drawer
-      ref="walletOverviewDrawer"
-      :symbol="currencySymbol" />
+      ref="walletOverviewDrawer" />
   </v-app>
 </template>
 
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
index ca432acf6..6d1f39a9e 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewDrawer.vue
@@ -17,21 +17,49 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <template>
   <exo-drawer
     ref="drawer"
+    v-model="drawer"
     :right="!$vuetify.rtl"
     :loading="loading"
-    class="rewardsOverviewDrawer">
+    class="rewardsOverviewDrawer"
+    allow-expand>
     <template slot="title">
-      {{ title }}
+      {{ $t('wallet.overview.rewards.title') }}
     </template>
-    <template slot="content">
-      <v-list v-if="rewardsList">
-        <wallet-overview-reward-item
-          v-for="reward in rewardsList"
-          :key="reward.technicalId"
-          :reward-item="reward"
-          :symbol="symbol"
-          class="border-color border-radius ma-4" />
-      </v-list>
+    <template v-if="drawer" slot="content">
+      <v-tabs
+        v-model="tabName"
+        slider-size="4">
+        <v-tab
+          tab-value="rewards"
+          href="#rewards">
+          {{ $t('wallet.overview.rewards') }}
+        </v-tab>
+        <v-tab
+          tab-value="transactions"
+          href="#transactions">
+          {{ $t('wallet.overview.transactions') }}
+        </v-tab>
+      </v-tabs>
+      <v-tabs-items
+        v-model="tabName"
+        class="px-4">
+        <v-tab-item value="rewards">
+          <v-list v-if="rewardsList">
+            <wallet-overview-reward-item
+              v-for="reward in rewardsList"
+              :key="reward.technicalId"
+              :reward-item="reward"
+              :symbol="symbol"
+              class="border-color border-radius mb-2" />
+          </v-list>
+        </v-tab-item>
+        <v-tab-item value="transactions">
+          <wallet-reward-transactions-list
+            :wallet="wallet"
+            :contract-details="contract"
+            class="lastTransactionsList overflow-x-hidden mb-2" />
+        </v-tab-item>
+      </v-tabs-items>
     </template>
     <template v-if="hasMore" slot="footer">
       <v-spacer />
@@ -47,38 +75,66 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </template>
   </exo-drawer>
 </template>
-
 <script>
 export default {
-  props: {
-    symbol: {
-      type: String,
-      default: 'sent',
-    },
-  },
   data: () => ({
+    drawer: false,
     pageSize: 20,
     limit: 20,
     rewardsList: [],
     loading: false,
+    contract: null,
+    wallet: null,
+    tabName: 'rewards',
   }),
   computed: {
     hasMore() {
       return this.rewardsList.length >= this.limit;
     },
+    symbol() {
+      return this.contract?.symbol;
+    },
+    identity() {
+      return {
+        id: this.wallet?.technicalId,
+        enabled: !this.wallet?.disabledUser,
+        deleted: this.wallet?.deletedUser,       
+        fullName: this.wallet?.name,
+        avatar: this.wallet?.avatar,
+        external: false,
+      };
+    },
+    balanceToDisplay() {
+      return Number.isFinite(Number(this.wallet?.tokenBalance))
+        ? new Intl.NumberFormat(eXo.env.portal.language, {
+          style: 'decimal',
+          minimumFractionDigits: 0,
+          maximumFractionDigits: 0,
+        }).format(Math.trunc(this.wallet?.tokenBalance))
+        : 0;
+    },
+  },
+  created() {
+    this.$root.$on('wallet-overview-drawer', this.open);
   },
   methods: {
+    open(tabName) {
+      this.tabName = tabName || 'rewards';
+      this.reset();
+      this.retrieveList();
+      this.$refs.drawer.open();
+    },
     reset() {
       this.limit = 20;
       this.size = 0;
+      this.wallet = window.walletSettings.wallet
+        && {...window.walletSettings.wallet}
+        || {};
+      this.contract = window.walletSettings.contractDetail
+        && {...window.walletSettings.contractDetail}
+        || {};
       this.rewardsList = [];
     },
-    open(title) {
-      this.title = title;
-      this.reset();
-      this.retrieveList();
-      this.$refs.drawer.open();
-    },
     loadMore() {
       this.limit += this.pageSize;
       this.retrieveList();
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue
index 641b043ff..332aa651b 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardItem.vue
@@ -19,17 +19,16 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <v-list-item>
       <v-list-item-content class="align-end text-start">
         <v-list-item-title :title="period">
-          <i class="fa fa-trophy px-2 tertiary--text"></i>
+          <v-icon class="me-2 tertiary--text">fa-calendar</v-icon>
           {{ periodShort }}
         </v-list-item-title>
-        <v-list-item-subtitle class="ps-10">
+        <v-list-item-subtitle class="ps-8">
           {{ $t('exoplatform.wallet.label.sentDate') }}: {{ sentDate }}
         </v-list-item-subtitle>
       </v-list-item-content>
-      <v-list-item-icon class="my-auto">
-        <span class="primary--text">
-          {{ rewardAmount }}
-        </span>
+      <v-list-item-icon class="d-flex flex-row justify-center align-center mt-3 mb-auto font-weight-bold">
+        <span class="tertiary-color me-2 ">{{ symbol }}</span>
+        <span>{{ rewardAmount }}</span>
       </v-list-item-icon>
     </v-list-item>
 
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue
index 70460f31e..5e10fd895 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-overview/components/WalletOverviewRewardPluginItem.vue
@@ -15,22 +15,17 @@ along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -->
 <template>
-  <v-list-item v-if="pluginEarnedAmount" dense>
-    <v-list-item-icon class="my-auto" />
+  <v-list-item v-if="pluginName === 'Gamification'" dense>
+    <v-list-item-icon class="me-2">
+      <v-icon size="18">fa-trophy</v-icon>
+    </v-list-item-icon>
     <v-list-item-content class="align-end text-start">
       <v-list-item-subtitle>
-        <span class="text-sub-title caption uiIcon" :class="iconClass"></span>
-        <span class="text-sub-title caption">{{ plugin.points }} {{ pluginName }}</span>
+        <span class="text-sub-title caption">{{ plugin.points }} {{ $t('wallet.overview.points') }}</span>
       </v-list-item-subtitle>
     </v-list-item-content>
-    <v-list-item-icon class="my-auto">
-      <span class="text-sub-title caption">
-        {{ pluginAmount }}
-      </span>
-    </v-list-item-icon>
   </v-list-item>
 </template>
-
 <script>
 export default {
   props: {
@@ -51,15 +46,9 @@ export default {
     pluginName() {
       return this.plugin.pluginId.charAt(0).toUpperCase() + this.plugin.pluginId.slice(1);
     },
-    iconClass() {
-      return `uiIconReward${this.pluginName}`;
-    },
     pluginEarnedAmount() {
       return parseInt(this.plugin.amount * 100) / 100;
     },
-    pluginAmount() {
-      return `${this.pluginEarnedAmount} ${this.symbol}`;
-    },
   },
 };
 </script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
index 606b4a23b..044f0125f 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-user-balance/components/WalletUserBalance.vue
@@ -1,24 +1,20 @@
 <template>
-  <v-app id="WalletApp" class="ma-0">
-    <div
+  <div>
+    <v-card
       v-show="!loading"
-      class="clickable"
-      @click="$refs.accountDetail.open()">
+      flat>
       <div class="pa-0 d-flex justify-center flex-nowrap text-color font-weight-bold big-number">
         <span class="my-2 tertiary-color">{{ symbol }}</span>
         <span
-          :class="typographyClass"
           class="ma-2 text-color text-h5 font-weight-bold d-flex align-self-center">
           {{ balanceToDisplay || '-' }}
         </span>
       </div>
-    </div>
-    <wallet-reward-account-detail
-      ref="accountDetail"
-      :fiat-symbol="symbol"
-      :wallet="wallet"
-      :contract-details="contractDetails" />
-  </v-app>
+    </v-card>
+    <wallet-overview-drawer
+      ref="walletOverviewDrawer"
+      :symbol="currencySymbol" />
+  </div>
 </template>
 <script>
 export default {
@@ -26,10 +22,6 @@ export default {
     wallet: null,
     contractDetails: null,
     loading: true,
-    isOverviewDisplay: {
-      type: Boolean,
-      default: () => false,
-    },
   }),
   computed: {
     symbol() {
@@ -39,31 +31,25 @@ export default {
       return this.wallet?.tokenBalance;
     },
     balanceToDisplay() {
-      return Number.isFinite(Number(this.balance)) ? Math.trunc(this.balance) : '';
-    },
-    typographyClass() {
-      switch (String(this.balanceToDisplay).length) {
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 5:
-        return 'text-h4';
-      case 6:
-        return 'text-h5';
-      case 7:
-      case 8:
-        return 'text-h6';
-      default:
-        return 'body-1';
-      }
+      return Number.isFinite(Number(this.balance))
+        ? new Intl.NumberFormat(eXo.env.portal.language, {
+          style: 'decimal',
+          minimumFractionDigits: 0,
+          maximumFractionDigits: 0,
+        }).format(Math.trunc(this.balance))
+        : 0;
     },
   },
   created() {
     this.walletUtils.initSettings(false, true, true)
       .then(() => {
-        this.wallet = Object.assign({}, window.walletSettings.wallet);
-        this.contractDetails = Object.assign({},window.walletSettings.contractDetail); 
+        this.wallet = window.walletSettings.wallet
+          && {...window.walletSettings.wallet}
+          || {};
+        this.contractDetails = window.walletSettings.contractDetail
+          && {...window.walletSettings.contractDetail}
+          || {};
+        this.$root.$emit('wallet-loaded', this.wallet?.tokenBalance);
       })
       .finally(() => this.loading = false);
   }
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
index 225934a2f..fbd9fbdea 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/weekly-earnings/components/WeeklyEarnings.vue
@@ -15,25 +15,19 @@ along with this program; if not, write to the Free Software Foundation,
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -->
 <template>
-  <div v-show="!loading" class="ma-0">
-    <div
-      class="clickable"
-      @click="openDrawer">
-      <div class="pa-0 d-flex justify-center flex-nowrap text-color font-weight-bold big-number">
-        <span class="my-2 tertiary-color">{{ symbol }}</span>
-        <span
-          :class="typographyClass"
-          class="ma-2 text-color text-h5 font-weight-bold d-flex align-self-center">
-          {{ lastRewardToDisplay || '-' }}
-        </span>
-      </div>
+  <v-card
+    v-show="!loading"
+    flat>
+    <div class="pa-0 d-flex justify-center flex-nowrap text-color font-weight-bold big-number">
+      <span class="my-2 tertiary-color">{{ symbol }}</span>
+      <span
+        :class="typographyClass"
+        class="ma-2 text-color text-h5 font-weight-bold d-flex align-self-center">
+        {{ lastRewardToDisplay || '-' }}
+      </span>
     </div>
-    <wallet-overview-drawer
-      ref="walletOverviewDrawer"
-      :symbol="symbol" />
-  </div>
+  </v-card>
 </template>
-
 <script>
 export default {
   data: () => ({
@@ -50,6 +44,15 @@ export default {
     lastRewardToDisplay() {
       return Number.isFinite(Number(this.lastReward)) ? Math.trunc(this.lastReward) : 0;
     },
+    balanceToDisplay() {
+      return Number.isFinite(Number(this.balance))
+        ? new Intl.NumberFormat(eXo.env.portal.language, {
+          style: 'decimal',
+          minimumFractionDigits: 0,
+          maximumFractionDigits: 0,
+        }).format(Math.trunc(this.balance))
+        : 0;
+    },
   },
   watch: {
     lastReward() {
@@ -65,8 +68,12 @@ export default {
       return this.walletUtils.initSettings(false, true, true)
         .then(() => {
           if (window.walletSettings) {
-            this.wallet = Object.assign({}, window.walletSettings.wallet);    
-            this.contractDetails = Object.assign({},window.walletSettings.contractDetail); 
+            this.wallet = window.walletSettings.wallet
+              && {...window.walletSettings.wallet}
+              || {};
+            this.contractDetails = window.walletSettings.contractDetail
+              && {...window.walletSettings.contractDetail}
+              || {};
           }
           return this.$nextTick();
         })
@@ -77,9 +84,6 @@ export default {
         .then(rewards => rewards.find(r => r.transaction && r.status === 'success'))
         .then(reward => this.lastReward = reward?.tokensToSend || 0);
     },
-    openDrawer() {
-      this.$refs.walletOverviewDrawer.open(this.$t('exoplatform.wallet.title.rewardedBalance'));
-    }
   },
 };
 </script>

From 69d3355454868153a5ade4f9a8146673471edd01 Mon Sep 17 00:00:00 2001
From: Boubaker Khanfir <bkhanfir@exoplatform.com>
Date: Sun, 1 Sep 2024 15:26:11 +0100
Subject: [PATCH 5/5] feat: Move My Rewards Portlet from Gamification -
 MEED-7019 - Meeds-io/MIPs#155

---
 .../src/main/resources/portlet-instances.json |  19 +++
 .../locale/portlet/LayoutEditor_en.properties |   2 +
 .../main/webapp/WEB-INF/gatein-resources.xml  |  34 +++-
 .../src/main/webapp/WEB-INF/portlet.xml       |  20 +++
 .../src/main/webapp/html/myRewards.html       |   7 +
 .../webapp/images/portlets/myRewards.webp     | Bin 0 -> 19891 bytes
 .../myRewards/components/RewardsOverview.vue  | 156 ++++++++++++++++++
 .../vue-app/myRewards/initComponents.js       |  25 +++
 .../src/main/webapp/vue-app/myRewards/main.js |  38 +++++
 wallet-webapps/webpack.prod.js                |   1 +
 10 files changed, 301 insertions(+), 1 deletion(-)
 create mode 100644 wallet-webapps/src/main/webapp/html/myRewards.html
 create mode 100644 wallet-webapps/src/main/webapp/images/portlets/myRewards.webp
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/myRewards/components/RewardsOverview.vue
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/myRewards/initComponents.js
 create mode 100644 wallet-webapps/src/main/webapp/vue-app/myRewards/main.js

diff --git a/wallet-services/src/main/resources/portlet-instances.json b/wallet-services/src/main/resources/portlet-instances.json
index 5da823805..6c2127f77 100644
--- a/wallet-services/src/main/resources/portlet-instances.json
+++ b/wallet-services/src/main/resources/portlet-instances.json
@@ -32,6 +32,25 @@
         "*:/platform/web-contributors"
       ],
       "system":true
+    },
+    {
+      "nameId":"myRewards",
+      "categoryNameId":"contributions",
+      "portletName":"myRewards",
+      "names":{
+        "en":"layout.portletInstance.myRewards.name"
+      },
+      "descriptions":{
+        "en":"layout.portletInstance.myRewards.description"
+      },
+      "illustrationPath":"war:/../images/portlets/myRewards.webp",
+      "preferences":[
+        
+      ],
+      "permissions":[
+        "*:/platform/users"
+      ],
+      "system":true
     }
   ]
 }
\ No newline at end of file
diff --git a/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties b/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties
index a830f6774..3b3760efe 100644
--- a/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties
+++ b/wallet-webapps/src/main/resources/locale/portlet/LayoutEditor_en.properties
@@ -2,3 +2,5 @@ layout.portletInstance.SpaceWallet.name=Wallet
 layout.portletInstance.SpaceWallet.description=Wallet of the space
 layout.portletInstance.WalletSettings.name=Wallet Settings
 layout.portletInstance.WalletSettings.description=Wallet Settings of the user
+layout.portletInstance.myRewards.name=My Rewards
+layout.portletInstance.myRewards.description=Gadget listing rewards and perks
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml b/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
index 1f412fe54..c225617e9 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -68,7 +68,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   </portlet-skin>
 
   <portlet-skin>
-    <application-name>gamification-portlets</application-name>
+    <application-name>wallet</application-name>
     <portlet-name>myRewards</portlet-name>
     <skin-name>Enterprise</skin-name>
     <additional-module>wallet</additional-module>
@@ -320,6 +320,38 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     </module>
   </portlet>
 
+  <portlet>
+    <name>myRewards</name>
+    <module>
+      <load-group>reward-overview-group</load-group>
+      <script>
+        <minify>false</minify>
+        <path>/js/myRewards.bundle.js</path>
+      </script>
+      <depends>
+        <module>vue</module>
+      </depends>
+      <depends>
+        <module>vuetify</module>
+      </depends>
+      <depends>
+        <module>eXoVueI18n</module>
+      </depends>
+      <depends>
+        <module>commonVueComponents</module>
+      </depends>
+      <depends>
+        <module>extensionRegistry</module>
+      </depends>
+      <depends>
+        <module>gamificationCommon</module>
+      </depends>
+      <depends>
+        <module>ruleExtensions</module>
+      </depends>
+    </module>
+  </portlet>
+
   <portlet>
     <name>WalletOverview</name>
     <module>
diff --git a/wallet-webapps/src/main/webapp/WEB-INF/portlet.xml b/wallet-webapps/src/main/webapp/WEB-INF/portlet.xml
index db348d3dd..1cb80e2ca 100644
--- a/wallet-webapps/src/main/webapp/WEB-INF/portlet.xml
+++ b/wallet-webapps/src/main/webapp/WEB-INF/portlet.xml
@@ -210,6 +210,26 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       <title>Wallet overview</title>
     </portlet-info>
   </portlet>
+
+  <portlet>
+    <portlet-name>myRewards</portlet-name>
+    <display-name>My Rewards</display-name>
+    <portlet-class>org.exoplatform.commons.api.portlet.GenericDispatchedViewPortlet</portlet-class>
+    <init-param>
+      <name>portlet-view-dispatched-file-path</name>
+      <value>/html/myRewards.html</value>
+    </init-param>
+    <expiration-cache>-1</expiration-cache>
+    <cache-scope>PUBLIC</cache-scope>
+    <supports>
+      <mime-type>text/html</mime-type>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <portlet-info>
+      <title>My Rewards</title>
+      <keywords>My Rewards</keywords>
+    </portlet-info>
+  </portlet>
   <portlet>
     <portlet-name>RewardAdmin</portlet-name>
     <display-name xml:lang="EN">Ethereum Wallet Application Administration</display-name>
diff --git a/wallet-webapps/src/main/webapp/html/myRewards.html b/wallet-webapps/src/main/webapp/html/myRewards.html
new file mode 100644
index 000000000..58db85084
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/html/myRewards.html
@@ -0,0 +1,7 @@
+<div class="VuetifyApp">
+  <div id="myRewards">
+    <script type="text/javascript">
+      require(['PORTLET/wallet/myRewards'], app => app.init());
+    </script>
+  </div>
+</div>
diff --git a/wallet-webapps/src/main/webapp/images/portlets/myRewards.webp b/wallet-webapps/src/main/webapp/images/portlets/myRewards.webp
new file mode 100644
index 0000000000000000000000000000000000000000..c90057e5db6b9a09f0d01b3337d8a37fdbd21691
GIT binary patch
literal 19891
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
a15Mh)JK~r6OZHBys-JfEb)%k)xb-L7>F4YK

literal 0
HcmV?d00001

diff --git a/wallet-webapps/src/main/webapp/vue-app/myRewards/components/RewardsOverview.vue b/wallet-webapps/src/main/webapp/vue-app/myRewards/components/RewardsOverview.vue
new file mode 100644
index 000000000..1139a3538
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/myRewards/components/RewardsOverview.vue
@@ -0,0 +1,156 @@
+<!--
+  This file is part of the Meeds project (https://meeds.io/).
+  Copyright (C) 2022 Meeds Association contact@meeds.io
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or (at your option) any later version.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-->
+<template>
+  <v-app>
+    <gamification-overview-widget v-if="!hasConfiguredWallet" :loading="loading">
+      <template #title>
+        <span></span>
+      </template>
+      <template #default>
+        <div v-if="!loading" class="d-flex flex-column align-center justify-center full-height full-width">
+          <v-icon color="tertiary" size="60">fa-money-bill</v-icon>
+          <span
+            v-html="noWalletSummaryText"
+            class="text-body mt-5"></span>
+        </div>
+      </template>
+    </gamification-overview-widget>
+    <gamification-overview-widget
+      v-else
+      :loading="loading">
+      <template #title>
+        <span>{{ $t('gamification.overview.rewardsTitle') }}</span>
+      </template>
+      <template #action>
+        <v-btn
+          height="auto"
+          min-width="auto"
+          class="pa-0"
+          text
+          @click="$root.$emit('wallet-overview-drawer')">
+          <span class="primary--text text-none">{{ $t('rules.seeAll') }}</span>
+        </v-btn>
+      </template>
+      <v-card
+        v-if="!loading"
+        class="my-auto"
+        flat>
+        <div class="d-flex">
+          <gamification-overview-widget-row
+            :clickable="!!lastReward"
+            class="d-flex flex-column col col-6 px-0"
+            normal-height
+            dense
+            v-on="lastReward && {
+              open: () => $root.$emit('wallet-overview-drawer', 'rewards'),
+            }">
+            <div class="d-flex flex-column align-center justify-center">
+              <extension-registry-components
+                :params="params"
+                name="my-rewards-overview"
+                type="my-rewards-item"
+                class="d-flex flex-row my-auto" />
+              <div v-if="lastReward" class="text-body text-body-1">{{ $t('gamification.overview.rewards.lastReward') }}</div>
+              <div v-else class="text-body text-body-1">{{ $t('gamification.overview.rewards.noRewardYet') }}</div>
+            </div>
+          </gamification-overview-widget-row>
+          <gamification-overview-widget-row
+            :clickable="!!walletBalance"
+            class="d-flex flex-column col col-6 px-0"
+            normal-height
+            dense
+            v-on="walletBalance && {
+              open: () => $root.$emit('wallet-overview-drawer', 'transactions'),
+            }">
+            <div class="d-flex flex-column align-center justify-center">
+              <extension-registry-components
+                :params="params"
+                name="my-rewards-wallet-overview"
+                type="my-rewards-wallet-item"
+                class="d-flex flex-row my-auto" />
+              <div class="text-body text-body-1">{{ $t('gamification.overview.rewards.walletTitle') }}</div>
+            </div>
+          </gamification-overview-widget-row>
+        </div>
+      </v-card>
+    </gamification-overview-widget>
+    <div id="WalletAPIApp"></div>
+  </v-app>
+</template>
+<script>
+export default {
+  data: () => ({
+    walletLink: `${eXo.env.portal.context}/${eXo.env.portal.myCraftSiteName}/wallet`,
+    walletBalance: 0,
+    lastReward: 0,
+    loading: true,
+    hasConfiguredWallet: false,
+  }),
+  computed: {
+    noWalletSummaryText() {
+      return this.$t('gamification.overview.noWalletMessage', {
+        0: `<a class="primary--text font-weight-bold" href="${this.walletLink}">`,
+        1: '</a>',
+      });
+    },
+    emptyWalletSummaryText() {
+      return this.$t('gamification.overview.rewardsWalletSummary', {
+        0: `<a class="primary--text font-weight-bold" href="${this.walletLink}">`,
+        1: '</a>',
+      });
+    },
+    params() {
+      return {
+        isOverviewDisplay: true,
+      };
+    },
+  },
+  created() {
+    document.addEventListener('exo-wallet-api-initialized', this.init);
+    document.addEventListener('exo-wallet-settings-loaded', this.checkUserWalletStatus);
+    this.$root.$on('wallet-last-reward', this.refreshLastReward);
+    this.$root.$on('wallet-loaded', this.refreshWalletBalance);
+  },
+  mounted() {
+    this.init();
+  },
+  beforeDestroy() {
+    document.removeEventListener('exo-wallet-api-initialized', this.init);
+    document.removeEventListener('exo-wallet-settings-loaded', this.checkUserWalletStatus);
+    this.$root.$off('wallet-last-reward', this.refreshLastReward);
+    this.$root.$off('wallet-loaded', this.refreshWalletBalance);
+  },
+  methods: {
+    init() {
+      if (!window.walletAPIInitialized) {
+        window.require(['SHARED/WalletAPIBundle'], () => {
+          document.dispatchEvent(new CustomEvent('exo-wallet-init'));
+        });
+      }
+    },
+    checkUserWalletStatus() {
+      this.hasConfiguredWallet = !!window?.walletSettings?.wallet.address;
+      this.loading = false;
+    },
+    refreshLastReward(data) {
+      this.lastReward = data;
+    },
+    refreshWalletBalance(data) {
+      this.walletBalance = data;
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/wallet-webapps/src/main/webapp/vue-app/myRewards/initComponents.js b/wallet-webapps/src/main/webapp/vue-app/myRewards/initComponents.js
new file mode 100644
index 000000000..2fd0a8f94
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/myRewards/initComponents.js
@@ -0,0 +1,25 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * Copyright (C) 2022 Meeds Association
+ * contact@meeds.io
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import RewardsOverview from './components/RewardsOverview.vue';
+
+const components = {
+  'gamification-overview-rewards': RewardsOverview,
+};
+
+for (const key in components) {
+  Vue.component(key, components[key]);
+}
diff --git a/wallet-webapps/src/main/webapp/vue-app/myRewards/main.js b/wallet-webapps/src/main/webapp/vue-app/myRewards/main.js
new file mode 100644
index 000000000..fc03a155a
--- /dev/null
+++ b/wallet-webapps/src/main/webapp/vue-app/myRewards/main.js
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the Meeds project (https://meeds.io/).
+ * Copyright (C) 2022 Meeds Association
+ * contact@meeds.io
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import './initComponents.js';
+
+const lang = eXo?.env?.portal?.language || 'en';
+const urls = [
+  `/gamification-portlets/i18n/locale.addon.Gamification?lang=${lang}`,
+  `/gamification-portlets/i18n/locale.portlet.Challenges?lang=${lang}`
+];
+const appId = 'myRewards';
+
+export function init() {
+  exoi18n.loadLanguageAsync(lang, urls)
+    .then(i18n => {
+      Vue.createApp({
+        template: `<gamification-overview-rewards id="${appId}" />`,
+        i18n,
+        vuetify: Vue.prototype.vuetifyOptions,
+      }, `#${appId}`, 'My Rewards');
+    }).finally(() => {
+      Vue.prototype.$utils.includeExtensions('WalletAPIBundle');
+      Vue.prototype.$utils.includeExtensions('PerkStoreOverviewAPI');
+    });
+}
\ No newline at end of file
diff --git a/wallet-webapps/webpack.prod.js b/wallet-webapps/webpack.prod.js
index 50c58740b..855ca9fd7 100644
--- a/wallet-webapps/webpack.prod.js
+++ b/wallet-webapps/webpack.prod.js
@@ -34,6 +34,7 @@ const config = merge(webpackCommonConfig, {
     connectorEventExtensions: './src/main/webapp/vue-app/connectorEventExtensions/extensions.js',
     achievementsExtensions: './src/main/webapp/vue-app/achievementsExtensions/extensions.js',
     notificationExtension: './src/main/webapp/vue-app/notification-extension/main.js',
+    myRewards: './src/main/webapp/vue-app/myRewards/main.js',
   },
   output: {
     path: path.join(__dirname, 'target/wallet/'),