From 12bff26338698d20eaf606ad26df2fa37c92ef87 Mon Sep 17 00:00:00 2001
From: Sara Boutej <40363501+SaraBoutej@users.noreply.github.com>
Date: Mon, 23 Oct 2023 14:27:55 +0100
Subject: [PATCH 1/2] feat:  Apply border-radius to apps (Wallet) - MEED-2680 -
 Meeds-io/MIPs#81  (#432)

This PR adds the new brandable border radius to all the wallet apps

(cherry picked from commit f3b6fec0004719203ea0457bbd45fc40e85282bd)
---
 .../vue-app/wallet-admin/components/admin/WalletAdminApp.vue | 5 +++--
 .../main/webapp/vue-app/wallet-app/components/WalletApp.vue  | 5 +++--
 .../wallet-settings/components/WalletSettings.vue            | 4 ++--
 .../wallet-settings/components/WalletSettingsDetails.vue     | 2 +-
 .../webapp/vue-app/wallet-reward/components/RewardApp.vue    | 3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue
index 626c88663..056292f7c 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue
@@ -25,7 +25,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <v-app class="mb-4 application-toolbar">
           <v-tabs
             v-model="selectedTab"
-            slider-size="4">
+            slider-size="4"
+            class="card-border-radius overflow-hidden">
             <v-tab
               key="wallets"
               href="#wallets">
@@ -37,7 +38,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               {{ $t('exoplatform.wallet.title.initialFundsTab') }}
             </v-tab>
           </v-tabs>
-          <v-tabs-items v-model="selectedTab" class="tabs-content">
+          <v-tabs-items v-model="selectedTab" class="tabs-content card-border-radius overflow-hidden">
             <v-tab-item
               id="wallets"
               value="wallets"
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/WalletApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/WalletApp.vue
index ae89af925..9c637db82 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/WalletApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-app/components/WalletApp.vue
@@ -26,10 +26,11 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
           <v-app class="mb-4 application-toolbar">
             <v-tabs
               v-model="tab"
-              slider-size="4">
+              slider-size="4"
+              class="card-border-radius overflow-hidden">
               <v-tab>{{ tabName }}</v-tab>
             </v-tabs>
-            <v-tabs-items v-model="tab" class="tabs-content">
+            <v-tabs-items v-model="tab" class="tabs-content card-border-radius overflow-hidden">
               <v-tab-item eager>
                 <v-flex>
                   <v-layout
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettings.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettings.vue
index 5274d9860..b3d3d52b2 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettings.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-app>
+  <v-app class="card-border-radius overflow-hidden">
     <wallet-settings-details
       v-if="displayDetails"
       :wallet-settings="walletSettings"
@@ -11,7 +11,7 @@
     <v-card
       v-else-if="displayed"
       :class="walletSettingsClass"
-      class="border-radius"
+      class="card-border-radius"
       flat>
       <v-list>
         <v-list-item>
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettingsDetails.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettingsDetails.vue
index 86ed83c95..f7ecce964 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettingsDetails.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-common/wallet-settings/components/WalletSettingsDetails.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card
     v-if="displayed"
-    class="walletSetting"
+    class="walletSetting card-border-radius"
     flat>
     <template v-if="!hideContent">
       <v-card-title class="px-0 pt-2">
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
index fc181587c..c18ae9963 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-reward/components/RewardApp.vue
@@ -72,6 +72,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
           <v-tabs
             v-model="selectedTab"
+            class="card-border-radius overflow-hidden"
             slider-size="4">
             <v-tab key="SendRewards" href="#SendRewards">
               {{ $t('exoplatform.wallet.title.sendRewardsTab') }}
@@ -84,7 +85,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             </v-tab>
           </v-tabs>
       
-          <v-tabs-items v-model="selectedTab" class="tabs-content">
+          <v-tabs-items v-model="selectedTab" class="tabs-content card-border-radius overflow-hidden">
             <v-tab-item
               id="SendRewards"
               value="SendRewards"

From e0cda8d9f8cd9e6d73ff1a0a1f9158a3570e7a2e Mon Sep 17 00:00:00 2001
From: Sara Boutej <40363501+SaraBoutej@users.noreply.github.com>
Date: Mon, 6 Nov 2023 17:47:05 +0100
Subject: [PATCH 2/2] feat: No access to items that are overflow -
 MEED-2728-Meeds-io/MIP#81 (#439)

(cherry picked from commit a5faf72ea27fce0d755f778b7394e8858e8fb402)
---
 .../vue-app/wallet-admin/components/admin/WalletAdminApp.vue   | 2 +-
 .../components/admin/wallets/WalletAdminWalletsTab.vue         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue
index 056292f7c..4e6d6f5f0 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/WalletAdminApp.vue
@@ -38,7 +38,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
               {{ $t('exoplatform.wallet.title.initialFundsTab') }}
             </v-tab>
           </v-tabs>
-          <v-tabs-items v-model="selectedTab" class="tabs-content card-border-radius overflow-hidden">
+          <v-tabs-items v-model="selectedTab" class="tabs-content card-border-radius">
             <v-tab-item
               id="wallets"
               value="wallets"
diff --git a/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/wallets/WalletAdminWalletsTab.vue b/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/wallets/WalletAdminWalletsTab.vue
index 3ca142f52..5cde6c1f7 100644
--- a/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/wallets/WalletAdminWalletsTab.vue
+++ b/wallet-webapps/src/main/webapp/vue-app/wallet-admin/components/admin/wallets/WalletAdminWalletsTab.vue
@@ -80,7 +80,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
       :headers="walletTableHeaders"
       :items="displayedWallets"
       :items-per-page="limit"
-      :loading="loadingWallets">
+      :loading="loadingWallets"
+      class="transparent">
       <template slot="item" slot-scope="props">
         <transition name="fade">
           <tr v-show="wallets">