Skip to content

Commit

Permalink
TRM Sanctioned Wallets (#2017)
Browse files Browse the repository at this point in the history
* New footer

* Minor primary navigation updates

* Reformat default locales file to 2 spaces indent

* feature: 3rd party modals

* cp

* feature: TRM checking for wallets

* fix: typo

* Update privacy policy

* Updated privacy policy text

* Top align icons

* Updated Balancer entities

* replace dashes

* Updated compliance text

* Tweaks to the new 3rd party services modal

* Minor style tweaks

* final touches

* Updating the policies

* Update cookie policy date

* Updated licenses

* fix: grants url

Co-authored-by: pkattera <[email protected]>
Co-authored-by: Tim Robinson <[email protected]>
  • Loading branch information
3 people authored Jun 29, 2022
1 parent 4d8aaeb commit f1d07bd
Show file tree
Hide file tree
Showing 40 changed files with 1,161 additions and 282 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) Balancer Labs
Copyright (c) Balancer

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Balancer",
"description": "Swap tokens and manage your assets on Balancer Protocol",
"providedBy": {
"name": "Balancer Labs",
"name": "Balancer",
"url": "https://balancer.fi"
},
"icons": [
Expand Down
26 changes: 22 additions & 4 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useRoute } from 'vue-router';
import { useStore } from 'vuex';
import Notifications from '@/components/notifications/Notifications.vue';
import ThirdPartyServicesModal from '@/components/web3/ThirdPartyServicesModal.vue';
import WalletSelectModal from '@/components/web3/WalletSelectModal.vue';
import useWeb3Watchers from '@/composables/watchers/useWeb3Watchers';
import { DEFAULT_TOKEN_DECIMALS } from '@/constants/tokens';
Expand All @@ -14,6 +15,7 @@ import useWeb3 from '@/services/web3/useWeb3';
import GlobalModalContainer from './components/modals/GlobalModalContainer.vue';
import AppSidebar from './components/navs/AppNav/AppSidebar/AppSidebar.vue';
import SanctionedWalletModal from './components/web3/SanctionedWalletModal.vue';
import useBackgroundColor from './composables/useBackgroundColor';
import useGnosisSafeApp from './composables/useGnosisSafeApp';
import useNavigationGuards from './composables/useNavigationGuards';
Expand All @@ -24,11 +26,15 @@ import usePoolCreationWatcher from './composables/watchers/usePoolCreationWatche
BigNumber.config({ DECIMAL_PLACES: DEFAULT_TOKEN_DECIMALS });
export const isThirdPartyServicesModalVisible = ref(false);
export default defineComponent({
components: {
...Layouts,
VueQueryDevTools,
WalletSelectModal,
SanctionedWalletModal,
ThirdPartyServicesModal,
Notifications,
AppSidebar,
GlobalModalContainer
Expand All @@ -39,7 +45,6 @@ export default defineComponent({
* STATE
*/
const layout = ref('DefaultLayout');
/**
* COMPOSABLES
*/
Expand All @@ -51,7 +56,8 @@ export default defineComponent({
useNavigationGuards();
const {
isWalletSelectVisible,
toggleWalletSelectModal
toggleWalletSelectModal,
isSanctioned
// isMainnet
} = useWeb3();
const route = useRoute();
Expand All @@ -77,6 +83,10 @@ export default defineComponent({
store.dispatch('app/init');
});
function handleThirdPartyModalToggle(value: boolean) {
isThirdPartyServicesModalVisible.value = value;
}
/**
* WATCHERS
*/
Expand All @@ -92,11 +102,14 @@ export default defineComponent({
return {
// state
layout,
isSanctioned,
isThirdPartyServicesModalVisible,
// computed
isWalletSelectVisible,
sidebarOpen,
// methods
toggleWalletSelectModal
toggleWalletSelectModal,
handleThirdPartyModalToggle
};
}
});
Expand All @@ -109,9 +122,14 @@ export default defineComponent({
<VueQueryDevTools />
<WalletSelectModal
:isVisible="isWalletSelectVisible"
:onShowThirdParty="() => handleThirdPartyModalToggle(true, 'wallet')"
@close="toggleWalletSelectModal"
/>
<Notifications />
<SanctionedWalletModal v-if="isSanctioned" />
<ThirdPartyServicesModal
:isVisible="isThirdPartyServicesModalVisible"
@close="handleThirdPartyModalToggle(false, 'third')"
/>
<AppSidebar v-if="sidebarOpen" />
</div>
<GlobalModalContainer />
Expand Down
1 change: 1 addition & 0 deletions src/assets/css/global/all.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import "./typography.css";
@import "./backgrounds.css";
@import "./animations.css";
@import "./social-icons.css";

html,
body {
Expand Down
22 changes: 22 additions & 0 deletions src/assets/css/global/social-icons.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.social-icon:hover .logo {
fill: #fff; /* gray-900 */
transform-origin: center;
transform: scale(1.05);
}
.social-icon .bg {
fill: #0f172a; /* gray-900 */
@apply transition-all;
}
.social-icon .logo {
fill: #fff;
@apply transition-all;
}
.dark .social-icon:hover .logo {
fill: #fff;
}
.dark .social-icon .bg {
fill: #fff;
}
.dark .social-icon .logo {
fill: #0f172a; /* gray-900 */
}
5 changes: 5 additions & 0 deletions src/assets/images/services/TRM-labs.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/assets/images/services/alchemy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions src/assets/images/services/fathom-analytics.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/assets/images/services/google-analytics.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/images/services/infura.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/images/services/sentry.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/images/services/the-graph.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/_global/BalModal/BalModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ defineExpose({ hide });
}
.modal-bg {
@apply absolute h-full w-full bg-black bg-opacity-80;
@apply absolute h-full w-full bg-black bg-opacity-90;
}
.modal-card {
Expand Down
Loading

4 comments on commit f1d07bd

@vercel
Copy link

@vercel vercel bot commented on f1d07bd Jun 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on f1d07bd Jun 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on f1d07bd Jun 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on f1d07bd Jun 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.