Skip to content

Commit

Permalink
Release hotfix to main (AstarNetwork#1295)
Browse files Browse the repository at this point in the history
* Archisinal dapp Staking Promo Card (AstarNetwork#1288)

* Add files via upload

* Update dapp_promotions.json

Adding Archisinal to Promo card

* Rename Archisinal Logo.png to Archisinal.png

* Update dapp_promotions.json

* Inflation dashboard (AstarNetwork#1289)

* Pie chart

* Inflation rate chart

* Dashboard re-styling

* Fixes and cleanup

* PR comments fix

* Adjustable staker updates

* dapp_promotions.json fix

* useInflation hook fix (AstarNetwork#1296)

* useInflation hook fix

* PR comments fix

* Remove Yoki campaign (AstarNetwork#1297)

---------

Co-authored-by: Tom-STEM <82093564+Tom-STEM@users.noreply.github.com>
  • Loading branch information
bobo-k2 and Tom-STEM authored May 31, 2024
1 parent a443742 commit 3d8f890
Show file tree
Hide file tree
Showing 32 changed files with 839 additions and 720 deletions.
Binary file added public/images/dapp_promotions/Archisinal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 2 additions & 24 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@
</transition>
<notification-stack />

<modal-yoki-origins
v-if="showYokiOriginsModal"
:set-is-open="setYokiOriginsModal"
:show="showYokiOriginsModal"
/>

<modal-disclaimer
v-if="showDisclaimerModal"
:set-is-open="setShowDisclaimerModal"
Expand All @@ -50,7 +44,6 @@ import { defineComponent, computed, ref, watch, onMounted } from 'vue';
import DashboardLayout from 'layouts/DashboardLayout.vue';
import { useStore } from 'src/store';
import ModalLoading from 'components/common/ModalLoading.vue';
import ModalYokiOrigins from 'components/common/ModalYokiOrigins.vue';
import AlertBox from 'components/common/AlertBox.vue';
import CookiePolicy from 'components/common/CookiePolicy.vue';
import ModalDisclaimer from 'components/common/ModalDisclaimer.vue';
Expand Down Expand Up @@ -85,7 +78,6 @@ export default defineComponent({
ModalLoading,
AlertBox,
CookiePolicy,
ModalYokiOrigins,
ModalDisclaimer,
NotificationStack,
ModalOnboarding,
Expand All @@ -105,8 +97,7 @@ export default defineComponent({
isDappStakingV3,
} = useDappStaking();
const { fetchStakeAmountsToStore, fetchDappsToStore } = useDapps();
const { fetchActiveConfigurationToStore } = useInflation();
const { fetchActiveConfigurationToStore, fetchInflationParamsToStore } = useInflation();
const isLoading = computed(() => store.getters['general/isLoading']);
const showAlert = computed(() => store.getters['general/showAlert']);
const isEthWallet = computed<boolean>(() => store.getters['general/isEthWallet']);
Expand All @@ -124,18 +115,6 @@ export default defineComponent({
showDisclaimerModal.value = isOpen;
};
// Yoki Origins modal
const showYokiOriginsModal = ref<boolean>(false);
if (!localStorage.getItem(LOCAL_STORAGE.CLOSE_YOKI_ORIGINS_MODAL)) {
setTimeout(() => {
showYokiOriginsModal.value = true;
}, 2000);
}
const setYokiOriginsModal = (isOpen: boolean): void => {
showYokiOriginsModal.value = isOpen;
};
// Handle busy and extrinsic call status messages.
const eventAggregator = container.get<IEventAggregator>(Symbols.EventAggregator);
eventAggregator.subscribe(ExtrinsicStatusMessage.name, (m) => {
Expand Down Expand Up @@ -186,6 +165,7 @@ export default defineComponent({
fetchStakerInfoToStore(),
fetchEraLengthsToStore(),
fetchActiveConfigurationToStore(),
fetchInflationParamsToStore(),
]);
}
});
Expand Down Expand Up @@ -235,8 +215,6 @@ export default defineComponent({
isLoading,
showAlert,
showDisclaimerModal,
showYokiOriginsModal,
setYokiOriginsModal,
setShowDisclaimerModal,
};
},
Expand Down
Binary file removed src/assets/img/yoki-origins-background.png
Binary file not shown.
Binary file removed src/assets/img/yoki-origins-logo.png
Binary file not shown.
4 changes: 2 additions & 2 deletions src/components/common/ChartPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<q-skeleton class="skeleton--chart" />
</div>
<div v-else>
<div class="container--chart">
<div>
<div class="row">
<span class="text--accent container--title--color">{{ $t(title) }}</span>
</div>
Expand Down Expand Up @@ -95,7 +95,7 @@ export default defineComponent({
setup(props, { emit }) {
const store = useStore();
const isDarkTheme = computed(() => store.getters['general/theme'] === 'DARK');
const getBackgroundColor = (): string => (isDarkTheme.value ? '#060b23' : '#fff');
const getBackgroundColor = (): string => 'transparent';
const getLineColor = (): string => (isDarkTheme.value ? 'rgba(108,111,111,0.1)' : '#F7F7F8');
const getTextColor = (): string => (isDarkTheme.value ? '#5F656F' : '#B1B7C1');
const hasData = ref<boolean>(false);
Expand Down
7 changes: 4 additions & 3 deletions src/components/common/DoughnutChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
:fill="textColor"
:x="size * 0.55"
:y="size * 0.55 - 28"
font-size="24"
font-size="20"
font-weight="700"
text-anchor="middle"
>
{{ text }}
</text>
<text
v-if="value > 0"
v-if="value > 0 && tokenSymbol"
:fill="textColor"
:x="size * 0.55"
:y="size * 0.52"
Expand Down Expand Up @@ -85,7 +85,8 @@ export default defineComponent({
},
tokenSymbol: {
type: String,
required: true,
required: false,
default: undefined,
},
isDarkTheme: {
type: Boolean,
Expand Down
219 changes: 0 additions & 219 deletions src/components/common/ModalYokiOrigins.vue

This file was deleted.

20 changes: 0 additions & 20 deletions src/components/common/styles/chart-panel.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
@import 'src/css/quasar.variables.scss';

.container--chart {
box-shadow: $container-border-shadow-light;
background: $container-bg-white;
border-radius: 6px;
padding: 8px 16px;
@media (min-width: $md) {
padding: 8px 24px;
}
@media (min-width: $xxl) {
width: 560px;
}
}

.row {
padding: 16px 8px 0px 8px;
}
Expand Down Expand Up @@ -74,10 +61,3 @@
font-size: 26px;
}
}

.body--dark {
.container--chart {
box-shadow: $container-border-shadow-dark;
background-color: $container-bg-dark;
}
}
Loading

0 comments on commit 3d8f890

Please sign in to comment.