prettier formatting updates

apollo.config.js

@@ -2,8 +2,7 @@ module.exports = {
   client: {
     service: {
       name: 'ocean',
-      url:
+      url: 'https://subgraph.rinkeby.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
-        'https://subgraph.rinkeby.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph',
       // optional disable SSL validation check
       skipSSLValidation: true
     }

src/components/atoms/Input/InputElement.tsx

@@ -107,7 +107,7 @@ export default function InputElement({
     case 'assetSelection':
       return (
         <AssetSelection
-          assets={(options as unknown) as AssetSelectionAsset[]}
+          assets={options as unknown as AssetSelectionAsset[]}
           {...field}
           {...props}
         />
@@ -115,7 +115,7 @@ export default function InputElement({
     case 'assetSelectionMultiple':
       return (
         <AssetSelection
-          assets={(options as unknown) as AssetSelectionAsset[]}
+          assets={options as unknown as AssetSelectionAsset[]}
           multiple
           disabled={disabled}
           {...field}
@@ -132,7 +132,7 @@ export default function InputElement({
       return (
         <BoxSelection
           name={name}
-          options={(options as unknown) as BoxSelectionOption[]}
+          options={options as unknown as BoxSelectionOption[]}
           {...field}
           {...props}
         />

src/components/molecules/Wallet/Details.tsx

@@ -11,13 +11,8 @@ import Web3Feedback from './Feedback'
 import styles from './Details.module.css'
 
 export default function Details(): ReactElement {
-  const {
+  const { web3Provider, web3ProviderInfo, connect, logout, networkData } =
-    web3Provider,
+    useWeb3()
-    web3ProviderInfo,
-    connect,
-    logout,
-    networkData
-  } = useWeb3()
   const { balance, config } = useOcean()
   const { locale } = useUserPreferences()
 

src/components/organisms/AssetActions/Compute/FormComputeDataset.tsx

@@ -82,10 +82,8 @@ export default function FormStartCompute({
   const data = useStaticQuery(contentQuery)
   const content = data.content.edges[0].node.childPagesJson
 
-  const {
+  const { isValid, values }: FormikContextType<{ algorithm: string }> =
-    isValid,
+    useFormikContext()
-    values
-  }: FormikContextType<{ algorithm: string }> = useFormikContext()
   const { price, ddo } = useAsset()
   const [totalPrice, setTotalPrice] = useState(price?.value)
 

src/components/organisms/AssetActions/Compute/index.tsx

@@ -69,15 +69,12 @@ export default function Compute({
   const [isPublished, setIsPublished] = useState(false)
   const [hasPreviousDatasetOrder, setHasPreviousDatasetOrder] = useState(false)
   const [previousDatasetOrderId, setPreviousDatasetOrderId] = useState<string>()
-  const [hasPreviousAlgorithmOrder, setHasPreviousAlgorithmOrder] = useState(
+  const [hasPreviousAlgorithmOrder, setHasPreviousAlgorithmOrder] =
-    false
+    useState(false)
-  )
   const [algorithmDTBalance, setalgorithmDTBalance] = useState<string>()
   const [algorithmPrice, setAlgorithmPrice] = useState<BestPrice>()
-  const [
+  const [previousAlgorithmOrderId, setPreviousAlgorithmOrderId] =
-    previousAlgorithmOrderId,
+    useState<string>()
-    setPreviousAlgorithmOrderId
-  ] = useState<string>()
   const [datasetTimeout, setDatasetTimeout] = useState<string>()
   const [algorithmTimeout, setAlgorithmTimeout] = useState<string>()
 

src/components/organisms/AssetActions/Consume.tsx

@@ -48,12 +48,8 @@ export default function Consume({
   const [hasPreviousOrder, setHasPreviousOrder] = useState(false)
   const [previousOrderId, setPreviousOrderId] = useState<string>()
   const { isInPurgatory, price, type } = useAsset()
-  const {
+  const { buyDT, pricingStepText, pricingError, pricingIsLoading } =
-    buyDT,
+    usePricing()
-    pricingStepText,
-    pricingError,
-    pricingIsLoading
-  } = usePricing()
   const { consumeStepText, consume, consumeError } = useConsume()
   const [isDisabled, setIsDisabled] = useState(true)
   const [hasDatatoken, setHasDatatoken] = useState(false)

src/components/organisms/AssetActions/Edit/DebugEditCompute.tsx

@@ -13,10 +13,8 @@ export default function DebugEditCompute({
   ddo: DDO
 }): ReactElement {
   const { ocean } = useOcean()
-  const [
+  const [formTransformed, setFormTransformed] =
-    formTransformed,
+    useState<ServiceComputePrivacy>()
-    setFormTransformed
-  ] = useState<ServiceComputePrivacy>()
 
   useEffect(() => {
     if (!ocean) return

src/components/organisms/AssetActions/Edit/FormEditComputeDataset.tsx

@@ -29,15 +29,12 @@ export default function FormEditComputeDataset({
   const { accountId } = useWeb3()
   const { ocean, config } = useOcean()
   const { ddo } = useAsset()
-  const {
+  const { isValid, values }: FormikContextType<ComputePrivacyForm> =
-    isValid,
+    useFormikContext()
-    values
-  }: FormikContextType<ComputePrivacyForm> = useFormikContext()
   const [allAlgorithms, setAllAlgorithms] = useState<AssetSelectionAsset[]>()
 
-  const { publisherTrustedAlgorithms } = ddo?.findServiceByType(
+  const { publisherTrustedAlgorithms } =
-    'compute'
+    ddo?.findServiceByType('compute').attributes.main.privacy
-  ).attributes.main.privacy
 
   async function getAlgorithmList(
     publisherTrustedAlgorithms: PublisherTrustedAlgorithm[]

src/components/organisms/AssetActions/Pool/Add/Output.tsx

@@ -48,11 +48,8 @@ export default function Output({
   coin: string
 }): ReactElement {
   const data = useStaticQuery(contentQuery)
-  const {
+  const { help, titleIn, titleOut } =
-    help,
+    data.content.edges[0].node.childContentJson.pool.add.output
-    titleIn,
-    titleOut
-  } = data.content.edges[0].node.childContentJson.pool.add.output
 
   // Connect with form
   const { values }: FormikContextType<FormAddLiquidity> = useFormikContext()

src/components/organisms/AssetActions/Pool/index.tsx

@@ -83,10 +83,8 @@ export default function Pool(): ReactElement {
   const [totalUserLiquidityInOcean, setTotalUserLiquidityInOcean] = useState(0)
   const [totalLiquidityInOcean, setTotalLiquidityInOcean] = useState(0)
 
-  const [
+  const [creatorTotalLiquidityInOcean, setCreatorTotalLiquidityInOcean] =
-    creatorTotalLiquidityInOcean,
+    useState(0)
-    setCreatorTotalLiquidityInOcean
-  ] = useState(0)
   const [creatorLiquidity, setCreatorLiquidity] = useState<PoolBalance>()
   const [creatorPoolTokens, setCreatorPoolTokens] = useState<string>()
   const [creatorPoolShare, setCreatorPoolShare] = useState<string>()

src/components/organisms/AssetActions/Pool/utils.ts

@@ -9,10 +9,11 @@ export async function getMaxPercentRemove(
     poolAddress
   )
 
-  const amountMaxPoolShares = await ocean.pool.getPoolSharesRequiredToRemoveOcean(
+  const amountMaxPoolShares =
-    poolAddress,
+    await ocean.pool.getPoolSharesRequiredToRemoveOcean(
-    amountMaxOcean
+      poolAddress,
-  )
+      amountMaxOcean
+    )
 
   let amountMaxPercent = `${Math.floor(
     (Number(amountMaxPoolShares) / Number(poolTokens)) * 100

src/components/organisms/AssetActions/Trade/Slippage.tsx

@@ -6,10 +6,8 @@ import styles from './Slippage.module.css'
 
 export default function Slippage(): ReactElement {
   // Connect with form
-  const {
+  const { setFieldValue, values }: FormikContextType<FormTradeData> =
-    setFieldValue,
+    useFormikContext()
-    values
-  }: FormikContextType<FormTradeData> = useFormikContext()
 
   function handleChange(e: ChangeEvent<HTMLSelectElement>) {
     setFieldValue('slippage', e.target.value)

src/components/organisms/AssetContent/MetaFull.tsx

@@ -8,8 +8,8 @@ export default function MetaFull(): ReactElement {
   const { ddo, metadata, isInPurgatory, type } = useAsset()
 
   function DockerImage() {
-    const algorithmContainer = ddo.findServiceByType('metadata').attributes.main
+    const algorithmContainer =
-      .algorithm.container
+      ddo.findServiceByType('metadata').attributes.main.algorithm.container
     const { image } = algorithmContainer
     const { tag } = algorithmContainer
     return <span>{`${image}:${tag}`}</span>

src/components/organisms/AssetContent/Pricing/FormPricing/index.tsx

@@ -25,13 +25,8 @@ export default function FormPricing({
 
   // Connect with form
   const { values, setFieldValue, submitForm } = useFormikContext()
-  const {
+  const { price, oceanAmount, weightOnOcean, weightOnDataToken, type } =
-    price,
+    values as PriceOptionsMarket
-    oceanAmount,
-    weightOnOcean,
-    weightOnDataToken,
-    type
-  } = values as PriceOptionsMarket
 
   // Switch type value upon tab change
   function handleTabChange(tabName: string) {

src/components/organisms/AssetContent/Pricing/index.tsx

@@ -57,12 +57,8 @@ export default function Pricing({ ddo }: { ddo: DDO }): ReactElement {
   const [showPricing, setShowPricing] = useState(false)
   const [success, setSuccess] = useState<string>()
 
-  const {
+  const { createPricing, pricingIsLoading, pricingError, pricingStepText } =
-    createPricing,
+    usePricing()
-    pricingIsLoading,
-    pricingError,
-    pricingStepText
-  } = usePricing()
 
   const hasFeedback = pricingIsLoading || typeof success !== 'undefined'
 

src/components/pages/Publish/index.tsx

@@ -92,9 +92,8 @@ export default function PublishPage({
         .initialValues as MetadataPublishFormDataset)) ||
       initialValues
   )
-  const [publishType, setPublishType] = useState<MetadataMain['type']>(
+  const [publishType, setPublishType] =
-    'dataset'
+    useState<MetadataMain['type']>('dataset')
-  )
   const hasFeedback = isLoading || error || success
 
   const emptyAlgoDT = Object.values(algoInitialValues.dataTokenOptions).every(
@@ -137,7 +136,7 @@ export default function PublishPage({
       )
 
       const ddo = await publish(
-        (metadata as unknown) as Metadata,
+        metadata as unknown as Metadata,
         serviceType,
         values.dataTokenOptions,
         timeout
@@ -186,7 +185,7 @@ export default function PublishPage({
         Logger.log('Publish algorithm with ', metadata, values.dataTokenOptions)
 
         const ddo = await publish(
-          (metadata as unknown) as Metadata,
+          metadata as unknown as Metadata,
           values.algorithmPrivacy === true ? 'compute' : 'access',
           values.dataTokenOptions,
           timeout

src/components/templates/Search/filterService.tsx

@@ -36,8 +36,9 @@ export default function FilterPrice({
   async function handleSelectedFilter(isSelected: boolean, value: string) {
     if (isSelected) {
       if (serviceSelections.length > 1) {
-        const otherValue = serviceFilterItems.find((p) => p.value !== value)
+        const otherValue = serviceFilterItems.find(
-          .value
+          (p) => p.value !== value
+        ).value
         await applyServiceFilter(otherValue)
         setServiceSelections([otherValue])
       } else {

src/components/templates/Search/utils.ts

@@ -27,7 +27,8 @@ export const FilterByTypeOptions = {
   Data: 'dataset',
   Algorithm: 'algorithm'
 } as const
-type FilterByTypeOptions = typeof FilterByTypeOptions[keyof typeof FilterByTypeOptions]
+type FilterByTypeOptions =
+  typeof FilterByTypeOptions[keyof typeof FilterByTypeOptions]
 
 function addTypeFilterToQuery(sortTerm: string, typeFilter: string): string {
   sortTerm = typeFilter

src/hooks/usePricing.ts

@@ -202,13 +202,8 @@ function usePricing(): UsePricing {
 
     if (!ocean || !accountId || !dtSymbol) return
 
-    const {
+    const { type, oceanAmount, price, weightOnDataToken, swapFee } =
-      type,
+      priceOptions
-      oceanAmount,
-      price,
-      weightOnDataToken,
-      swapFee
-    } = priceOptions
 
     let { dtAmount } = priceOptions
     const isPool = type === 'dynamic'

src/hooks/usePublish.ts

@@ -69,13 +69,14 @@ function usePublish(): UsePublish {
       switch (serviceType) {
         case 'access': {
           if (!timeout) timeout = 0
-          const accessService = await ocean.assets.createAccessServiceAttributes(
+          const accessService =
-            account,
+            await ocean.assets.createAccessServiceAttributes(
-            price,
+              account,
-            publishedDate,
+              price,
-            timeout,
+              publishedDate,
-            providerUri
+              timeout,
-          )
+              providerUri
+            )
           Logger.log('access service created', accessService)
           services.push(accessService)
           break

src/models/FormAlgoPublish.ts

@@ -2,37 +2,38 @@ import { MetadataPublishFormAlgorithm } from '../@types/MetaData'
 import { File as FileMetadata } from '@oceanprotocol/lib'
 import * as Yup from 'yup'
 
-export const validationSchema: Yup.SchemaOf<MetadataPublishFormAlgorithm> = Yup.object()
+export const validationSchema: Yup.SchemaOf<MetadataPublishFormAlgorithm> =
-  .shape({
+  Yup.object()
-    // ---- required fields ----
+    .shape({
-    name: Yup.string()
+      // ---- required fields ----
-      .min(4, (param) => `Title must be at least ${param.min} characters`)
+      name: Yup.string()
-      .required('Required'),
+        .min(4, (param) => `Title must be at least ${param.min} characters`)
-    description: Yup.string().min(10).required('Required'),
+        .required('Required'),
-    files: Yup.array<FileMetadata>().required('Required').nullable(),
+      description: Yup.string().min(10).required('Required'),
-    timeout: Yup.string().required('Required'),
+      files: Yup.array<FileMetadata>().required('Required').nullable(),
-    dataTokenOptions: Yup.object()
+      timeout: Yup.string().required('Required'),
-      .shape({
+      dataTokenOptions: Yup.object()
-        name: Yup.string(),
+        .shape({
-        symbol: Yup.string()
+          name: Yup.string(),
-      })
+          symbol: Yup.string()
-      .required('Required'),
+        })
-    dockerImage: Yup.string()
+        .required('Required'),
-      .matches(/node:latest|python:latest|custom image/g, {
+      dockerImage: Yup.string()
-        excludeEmptyString: true
+        .matches(/node:latest|python:latest|custom image/g, {
-      })
+          excludeEmptyString: true
-      .required('Required'),
+        })
-    image: Yup.string().required('Required'),
+        .required('Required'),
-    containerTag: Yup.string().required('Required'),
+      image: Yup.string().required('Required'),
-    entrypoint: Yup.string().required('Required'),
+      containerTag: Yup.string().required('Required'),
-    author: Yup.string().required('Required'),
+      entrypoint: Yup.string().required('Required'),
-    termsAndConditions: Yup.boolean().required('Required'),
+      author: Yup.string().required('Required'),
-    // ---- optional fields ----
+      termsAndConditions: Yup.boolean().required('Required'),
-    algorithmPrivacy: Yup.boolean().nullable(),
+      // ---- optional fields ----
-    tags: Yup.string().nullable(),
+      algorithmPrivacy: Yup.boolean().nullable(),
-    links: Yup.array<FileMetadata[]>().nullable()
+      tags: Yup.string().nullable(),
-  })
+      links: Yup.array<FileMetadata[]>().nullable()
-  .defined()
+    })
+    .defined()
 
 export const initialValues: Partial<MetadataPublishFormAlgorithm> = {
   name: '',

src/models/FormEditComputeDataset.ts

@@ -6,12 +6,11 @@ export interface ComputePrivacyForm {
   publisherTrustedAlgorithms: string[]
 }
 
-export const validationSchema: Yup.SchemaOf<ComputePrivacyForm> = Yup.object().shape(
+export const validationSchema: Yup.SchemaOf<ComputePrivacyForm> =
-  {
+  Yup.object().shape({
     allowAllPublishedAlgorithms: Yup.boolean().nullable(),
     publisherTrustedAlgorithms: Yup.array().nullable()
-  }
+  })
-)
 
 export function getInitialValues(
   compute: ServiceComputePrivacy

src/models/FormPricing.ts

@@ -1,8 +1,8 @@
 import { PriceOptionsMarket } from '../@types/MetaData'
 import * as Yup from 'yup'
 
-export const validationSchema: Yup.SchemaOf<PriceOptionsMarket> = Yup.object().shape(
+export const validationSchema: Yup.SchemaOf<PriceOptionsMarket> =
-  {
+  Yup.object().shape({
     price: Yup.number()
       .min(1, (param) => `Must be more or equal to ${param.min}`)
       .required('Required'),
@@ -22,8 +22,7 @@ export const validationSchema: Yup.SchemaOf<PriceOptionsMarket> = Yup.object().s
       .max(10, 'Maximum is 10%')
       .required('Required')
       .nullable()
-  }
+  })
-)
 
 export const initialValues: PriceOptionsMarket = {
   price: 1,

src/models/FormPublish.ts

@@ -2,34 +2,35 @@ import { MetadataPublishFormDataset } from '../@types/MetaData'
 import { File as FileMetadata } from '@oceanprotocol/lib'
 import * as Yup from 'yup'
 
-export const validationSchema: Yup.SchemaOf<MetadataPublishFormDataset> = Yup.object()
+export const validationSchema: Yup.SchemaOf<MetadataPublishFormDataset> =
-  .shape({
+  Yup.object()
-    // ---- required fields ----
+    .shape({
-    name: Yup.string()
+      // ---- required fields ----
-      .min(4, (param) => `Title must be at least ${param.min} characters`)
+      name: Yup.string()
-      .required('Required'),
+        .min(4, (param) => `Title must be at least ${param.min} characters`)
-    author: Yup.string().required('Required'),
+        .required('Required'),
-    dataTokenOptions: Yup.object()
+      author: Yup.string().required('Required'),
-      .shape({
+      dataTokenOptions: Yup.object()
-        name: Yup.string(),
+        .shape({
-        symbol: Yup.string()
+          name: Yup.string(),
-      })
+          symbol: Yup.string()
-      .required('Required'),
+        })
-    files: Yup.array<FileMetadata>()
+        .required('Required'),
-      .required('Enter a valid URL and click "ADD FILE"')
+      files: Yup.array<FileMetadata>()
-      .nullable(),
+        .required('Enter a valid URL and click "ADD FILE"')
-    description: Yup.string().min(10).required('Required'),
+        .nullable(),
-    timeout: Yup.string().required('Required'),
+      description: Yup.string().min(10).required('Required'),
-    access: Yup.string()
+      timeout: Yup.string().required('Required'),
-      .matches(/Compute|Download/g, { excludeEmptyString: true })
+      access: Yup.string()
-      .required('Required'),
+        .matches(/Compute|Download/g, { excludeEmptyString: true })
-    termsAndConditions: Yup.boolean().required('Required'),
+        .required('Required'),
+      termsAndConditions: Yup.boolean().required('Required'),
 
-    // ---- optional fields ----
+      // ---- optional fields ----
-    tags: Yup.string().nullable(),
+      tags: Yup.string().nullable(),
-    links: Yup.array<FileMetadata[]>().nullable()
+      links: Yup.array<FileMetadata[]>().nullable()
-  })
+    })
-  .defined()
+    .defined()
 
 export const initialValues: Partial<MetadataPublishFormDataset> = {
   name: '',

src/pages/404.tsx

@@ -6,11 +6,8 @@ import { Helmet } from 'react-helmet'
 import Button from '../components/atoms/Button'
 
 export default function PageGatsby404(props: PageProps): ReactElement {
-  const {
+  const { title, description, actions } = (props.data as any).content.edges[0]
-    title,
+    .node.childPagesJson
-    description,
-    actions
-  } = (props.data as any).content.edges[0].node.childPagesJson
 
   return (
     <>

src/providers/Asset.tsx

@@ -122,7 +122,7 @@ function AssetProvider({
 
     // Get metadata from DDO
     const { attributes } = ddo.findServiceByType('metadata')
-    setMetadata((attributes as unknown) as MetadataMarket)
+    setMetadata(attributes as unknown as MetadataMarket)
     setTitle(attributes?.main.name)
     setType(attributes.main.type)
     setOwner(ddo.publicKey[0].owner)

src/providers/Ocean.tsx

@@ -51,9 +51,8 @@ function OceanProvider({
     eth: undefined,
     ocean: undefined
   })
-  const [config, setConfig] = useState<ConfigHelperConfig | Config>(
+  const [config, setConfig] =
-    initialConfig
+    useState<ConfigHelperConfig | Config>(initialConfig)
-  )
   const [loading, setLoading] = useState<boolean>()
 
   // -----------------------------------

src/utils/compute.ts

@@ -13,9 +13,10 @@ export async function createTrustedAlgorithmList(
   const trustedAlgorithms = []
 
   for (const selectedAlgorithm of selectedAlgorithms) {
-    const trustedAlgorithm = await ocean.compute.createPublisherTrustedAlgorithmfromDID(
+    const trustedAlgorithm =
-      selectedAlgorithm
+      await ocean.compute.createPublisherTrustedAlgorithmfromDID(
-    )
+        selectedAlgorithm
+      )
     trustedAlgorithms.push(trustedAlgorithm)
   }
   return trustedAlgorithms

src/utils/feedback.ts

@@ -28,9 +28,9 @@ export const computeFeedback: { [key in number]: string } = {
   2: '3/3 Access granted. Starting job...'
 }
 
-export function getCreatePricingPoolFeedback(
+export function getCreatePricingPoolFeedback(dtSymbol: string): {
-  dtSymbol: string
+  [key: number]: string
-): { [key: number]: string } {
+} {
   return {
     99: `Minting ${dtSymbol} ...`,
     0: 'Creating pool ...',
@@ -41,9 +41,9 @@ export function getCreatePricingPoolFeedback(
   }
 }
 
-export function getCreatePricingExchangeFeedback(
+export function getCreatePricingExchangeFeedback(dtSymbol: string): {
-  dtSymbol: string
+  [key: number]: string
-): { [key: number]: string } {
+} {
   return {
     99: `Minting ${dtSymbol} ...`,
     0: 'Creating exchange ...',

src/utils/subgraph.ts

@@ -127,10 +127,8 @@ export async function getPreviousOrders(
     id: id,
     account: account
   }
-  const fetchedPreviousOrders: ApolloQueryResult<AssetPreviousOrder> = await fetchData(
+  const fetchedPreviousOrders: ApolloQueryResult<AssetPreviousOrder> =
-    PreviousOrderQuery,
+    await fetchData(PreviousOrderQuery, variables)
-    variables
-  )
   if (fetchedPreviousOrders.data?.tokenOrders?.length === 0) return null
   if (assetTimeout === '0') {
     return fetchedPreviousOrders?.data?.tokenOrders[0]?.tx

tests/unit/__fixtures__/ddo.ts

@@ -5,8 +5,7 @@ const ddo: Partial<DDO> = {
   id: 'did:op:7b4e90b05ec243dbaaca2a503fdde119706577f9645b45b9ab65cf2c3970f757',
   publicKey: [
     {
-      id:
+      id: 'did:op:7b4e90b05ec243dbaaca2a503fdde119706577f9645b45b9ab65cf2c3970f757',
-        'did:op:7b4e90b05ec243dbaaca2a503fdde119706577f9645b45b9ab65cf2c3970f757',
       type: 'EthereumECDSAKey',
       owner: '0x4D156A2ef69ffdDC55838176C6712C90f60a2285'
     }