Merge pull request #140 from reflexer-labs/develop

Develop
reflexer-labs · Mar 19, 2021 · 5b7c586 · 5b7c586
2 parents 43b736c + 3af9c75
commit 5b7c586
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/components/SafeOperations/SafeBody.tsx b/src/components/SafeOperations/SafeBody.tsx
@@ -181,7 +181,10 @@ const SafeBody = ({ isChecked }: Props) => {
  accumulatedRate
  )
 
- const liquidationPenaltyPercentage = getRatePercentage(liquidationPenalty)
+ const liquidationPenaltyPercentage = getRatePercentage(
+ liquidationPenalty,
+ 0
+ )
  const liquidationPrice = getLiquidationPrice(
  totalCollateral,
  totalDebt,

diff --git a/src/containers/OnBoarding/index.tsx b/src/containers/OnBoarding/index.tsx
@@ -103,7 +103,7 @@ const OnBoarding = ({ ...props }) => {
  />
  </HeaderContainer>
  {(account && !safeState.safeCreated) || !isOwner ? (
- <BtnContainer>
+ <BtnContainer className="top-up">
  <Button
  disabled={connectWalletState.isWrongNetwork}
  onClick={() =>
@@ -161,6 +161,13 @@ const BtnContainer = styled.div`
  min-width: 100px;
  padding: 4px 12px;
  }
+ ${({ theme }) => theme.mediaWidth.upToSmall`
+ position: static;
+ margin-bottom:20px;
+ &.top-up {
+ display:none;
+ }
+ `}
 `
 
 const BtnInner = styled.div`

diff --git a/src/utils/helper.ts b/src/utils/helper.ts
@@ -49,7 +49,7 @@ export const getEtherscanLink = (
  }
  }
 }
-// console.log('test for deployment')
+
 export const amountToFiat = (balance: number, fiatPrice: number) => {
  return (balance * fiatPrice).toFixed(4)
 }
@@ -59,7 +59,7 @@ export const formatNumber = (value: string, digits = 4, round = false) => {
  if (!value) {
  return '0'
  }
- const n = Number(value.slice(0, 6))
+ const n = Number(value)
  if (Number.isInteger(n) || value.length < 5) {
  return n
  }

diff --git a/src/utils/queries/safe.ts b/src/utils/queries/safe.ts
@@ -33,7 +33,7 @@ systemState(id: "current") {
 }`
 
 export const getUserSafesListQuery = (address: string) => `{
- safes(where: { owner: "${address}", proxy_not: null, safeId_not: null }) {
+ safes(where: { owner: "${address}", proxy_contains: "0x", safeId_not: null }) {
  safeId
  safeHandler
  collateral
@@ -47,7 +47,7 @@ export const getUserSafesListQuery = (address: string) => `{
 }`
 
 export const getSafeByIdQuery = (safeId: string, address: string) => `{
- safes(where: { safeId: "${safeId}" , proxy_not: null, safeId_not: null}) {
+ safes(where: { safeId: "${safeId}" , proxy_contains: "0x", safeId_not: null}) {
  safeId
  collateral
  createdAt