From c6c82ec0dc4f26c32223749703eb166e6140ad2a Mon Sep 17 00:00:00 2001 From: Georges KABBOUCHI Date: Sat, 28 Aug 2021 00:27:11 +0300 Subject: [PATCH] fixes --- assets/icons/currencies/rai.svg | 4 ++-- assets/img/icons/currencies/rai.svg | 4 ++-- .../context/reflexer/SidebarReflexerBorrow.vue | 12 ++++++------ .../context/reflexer/SidebarReflexerCollateral.vue | 4 ++-- .../context/reflexer/SidebarReflexerPayback.vue | 12 ++++++------ pages/mainnet/reflexer.vue | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/assets/icons/currencies/rai.svg b/assets/icons/currencies/rai.svg index 16e95ce..d399f42 100644 --- a/assets/icons/currencies/rai.svg +++ b/assets/icons/currencies/rai.svg @@ -1,5 +1,5 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/assets/img/icons/currencies/rai.svg b/assets/img/icons/currencies/rai.svg index 16e95ce..d399f42 100644 --- a/assets/img/icons/currencies/rai.svg +++ b/assets/img/icons/currencies/rai.svg @@ -1,5 +1,5 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/components/sidebar/context/reflexer/SidebarReflexerBorrow.vue b/components/sidebar/context/reflexer/SidebarReflexerBorrow.vue index 89ad92b..1b727f5 100644 --- a/components/sidebar/context/reflexer/SidebarReflexerBorrow.vue +++ b/components/sidebar/context/reflexer/SidebarReflexerBorrow.vue @@ -4,7 +4,7 @@ @@ -109,10 +109,10 @@ export default defineComponent({ const changedDebt = computed(() => plus(debt.value, amountParsed.value).toFixed()) const { liquidationPrice, status } = useReflexerPosition(collateral, changedDebt) - const daiTokenKey = ref('dai') - const daiToken = computed(() => getTokenByKey(daiTokenKey.value)) - const symbol = computed(() => daiToken.value?.symbol) - const decimals = computed(() => daiToken.value?.decimals) + const raiTokenKey = ref('rai') + const raiToken = computed(() => getTokenByKey(raiTokenKey.value)) + const symbol = computed(() => raiToken.value?.symbol) + const decimals = computed(() => raiToken.value?.decimals) const { validateAmount, @@ -173,7 +173,7 @@ export default defineComponent({ } return { - daiTokenKey, + raiTokenKey, symbol, debt, amount, diff --git a/components/sidebar/context/reflexer/SidebarReflexerCollateral.vue b/components/sidebar/context/reflexer/SidebarReflexerCollateral.vue index 54b69d0..62e05b7 100644 --- a/components/sidebar/context/reflexer/SidebarReflexerCollateral.vue +++ b/components/sidebar/context/reflexer/SidebarReflexerCollateral.vue @@ -54,11 +54,11 @@ export default defineComponent({ const { store, app, route } = useContext() const { formatPercent } = useFormatting() const { back } = useSidebar() - const { safeTypes: makerSafeTypes, safeType, isNewSafe } = useReflexerPosition() + const { safeTypes: reflexerSafeTypes, safeType, isNewSafe } = useReflexerPosition() const safeTypes = computed(() => { const shouldFilter = !!props.safeType && (props.safeType === 'token' || props.safeType === 'uniLPT') - const filtered = makerSafeTypes.value.filter((safe) => !safe.disabled) + const filtered = reflexerSafeTypes.value.filter((safe) => !safe.disabled) const final = shouldFilter ? filtered.filter((safe) => safe.safeTokenType === props.safeType) : filtered if (route.value.hash.startsWith('#collateral')) return final return filtered.filter((safe) => safe.safeTokenType === 'token') diff --git a/components/sidebar/context/reflexer/SidebarReflexerPayback.vue b/components/sidebar/context/reflexer/SidebarReflexerPayback.vue index 3b56008..4a22cd6 100644 --- a/components/sidebar/context/reflexer/SidebarReflexerPayback.vue +++ b/components/sidebar/context/reflexer/SidebarReflexerPayback.vue @@ -5,14 +5,14 @@
@@ -121,7 +121,7 @@ export default defineComponent({ const amount = ref('') const amountParsed = computed(() => parseSafeFloat(amount.value)) - const daiTokenKey = ref('dai') + const raiTokenKey = ref('rai') const tokenKey = computed(() => props.tokenKey) const token = computed(() => getTokenByKey(tokenKey.value)) const symbol = computed(() => token.value?.symbol) @@ -136,7 +136,7 @@ export default defineComponent({ const maxBalance = computed(() => min(balance.value, debt.value).toFixed()) const { toggle, isMaxAmount } = useMaxAmountActive(amount, maxBalance) - const { validateAmount, validateLiquidation, validateIsLoggedIn, validateMakerDebt } = useValidators() + const { validateAmount, validateLiquidation, validateIsLoggedIn, validateReflexerDebt } = useValidators() const errors = computed(() => { const hasAmountValue = !isZero(amount.value) @@ -145,7 +145,7 @@ export default defineComponent({ amount: { message: validateAmount(amountParsed.value, maxBalance.value), show: hasAmountValue }, liquidation: { message: validateLiquidation(status.value, liquidation.value), show: hasAmountValue }, auth: { message: validateIsLoggedIn(!!account.value), show: true }, - minDebt: { message: validateMakerDebt(changedDebt.value), show: hasAmountValue }, + minDebt: { message: validateReflexerDebt(changedDebt.value), show: hasAmountValue }, } }) const { errorMessages, isValid } = useValidation(errors) @@ -193,7 +193,7 @@ export default defineComponent({ } return { - daiTokenKey, + raiTokenKey, symbol, debt, balance, diff --git a/pages/mainnet/reflexer.vue b/pages/mainnet/reflexer.vue index a6abfbc..c292723 100644 --- a/pages/mainnet/reflexer.vue +++ b/pages/mainnet/reflexer.vue @@ -137,7 +137,7 @@ :amount="debt" :amount-usd="debt" position-type="borrow" - token-key="dai" + token-key="rai" :safe-token-type="safeTokenType" :supply-or-borrow="showBorrow" :withdraw-or-payback="showPayback" @@ -239,7 +239,7 @@ export default defineComponent({ if (isZero(collateral.value)) { showWarning("ReflexerDAO", "No collateral supplied!!"); } else { - router.push({ hash: "payback?tokenKey=dai" }); + router.push({ hash: "payback?tokenKey=rai" }); } } @@ -247,7 +247,7 @@ export default defineComponent({ if (isZero(collateral.value)) { showWarning("ReflexerDAO", "Deposit collateral before borrowing!!"); } else { - router.push({ hash: "borrow?tokenKey=dai" }); + router.push({ hash: "borrow?tokenKey=rai" }); } }