Instadapp/assembly
1
0
Fork 0
mirror of https://github.com/Instadapp/assembly.git synced 2024-07-29 22:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Georges KABBOUCHI 2021-09-06 01:40:07 +03:00
parent f2e032f2ac
commit 988b722720
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/modal/web3/Web3Modal.vue
View File

@ -41,7 +41,7 @@
</button> </button>
</div> </div>
<div class="mt-6 text-center text-sm"> <div class="mt-6 text-center text-sm hidden">
Need help connecting a wallet? Need help connecting a wallet?
<nuxt-link to="/faqs" class="font-semibold text-ocean-blue-pure" <nuxt-link to="/faqs" class="font-semibold text-ocean-blue-pure"
>Read our FAQ</nuxt-link >Read our FAQ</nuxt-link

20
composables/useStrategy.ts
View File

@ -25,13 +25,15 @@ import useEventBus from "./useEventBus";
import { useNotification } from "./useNotification"; import { useNotification } from "./useNotification";
import { useSidebar } from "./useSidebar"; import { useSidebar } from "./useSidebar";
import { useToken } from "./useToken"; import { useToken } from "./useToken";
import { useWeb3 } from "./useWeb3"; import { useWeb3 } from "@instadapp/vue-web3";
import { useBigNumber } from "./useBigNumber"; import { useBigNumber } from "./useBigNumber";
import tokenIdMapping from "~/constant/tokenIdMapping"; import tokenIdMapping from "~/constant/tokenIdMapping";
import { useFormatting } from "./useFormatting"; import { useFormatting } from "./useFormatting";
import { useNetwork } from "./useNetwork";
export function useStrategy(defineStrategy: DefineStrategy) { export function useStrategy(defineStrategy: DefineStrategy) {
const { web3, networkName, account } = useWeb3(); const { library, account } = useWeb3();
const { activeNetworkId } = useNetwork()
const { dsa } = useDSA(); const { dsa } = useDSA();
const { prices, balances, fetchBalances } = useBalances(); const { prices, balances, fetchBalances } = useBalances();
const { close } = useSidebar(); const { close } = useSidebar();
@ -114,29 +116,29 @@ export function useStrategy(defineStrategy: DefineStrategy) {
{ immediate: true } { immediate: true }
); );
watch(web3, () => strategy.setWeb3(web3.value), { immediate: true }); watch(library, () => strategy.setWeb3(library.value), { immediate: true });
watch(dsa, () => strategy.setDSA(dsa.value), { immediate: true }); watch(dsa, () => strategy.setDSA(dsa.value), { immediate: true });
watch( watch(
prices, prices,
() => strategy.setProps({ prices: prices[networkName.value] }), () => strategy.setProps({ prices: prices[activeNetworkId.value] }),
{ immediate: true } { immediate: true }
); );
watch( watch(
balances, balances,
() => { () => {
strategy.setProps({ strategy.setProps({
dsaBalances: balances.dsa[networkName.value], dsaBalances: balances.dsa[activeNetworkId.value],
userBalances: balances.user[networkName.value] userBalances: balances.user[activeNetworkId.value]
}); });
}, },
{ immediate: true } { immediate: true }
); );
watch( watch(
networkName, activeNetworkId,
() => () =>
strategy.setProps({ strategy.setProps({
tokens: tokens[networkName.value].allTokens, tokens: tokens[activeNetworkId.value].allTokens,
tokenKeys: tokens[networkName.value].tokenKeys tokenKeys: tokens[activeNetworkId.value].tokenKeys
}), }),
{ immediate: true } { immediate: true }
); );

2
layouts/default.vue
View File

@ -110,7 +110,7 @@ export default defineComponent({
const { redirect } = useContext() const { redirect } = useContext()
const { showSidebarBalances } = useSidebar() const { showSidebarBalances } = useSidebar()
const { showNetworksMismatchDialog } = useModal() const { showNetworksMismatchDialog } = useModal()
// useEagerConnect() useEagerConnect()
const route = useRoute() const route = useRoute()
watch(isBackdropShown, () => { watch(isBackdropShown, () => {