Merge pull request #129 from oceanprotocol/fix/computePreviousOrder

fix compute previous order

src/components/organisms/AssetActions/Compute.tsx

@@ -58,7 +58,7 @@ export default function Compute({
 
   useEffect(() => {
     async function checkPreviousOrders() {
-      const orderId = await checkPreviousOrder(ocean, accountId, ddo)
+      const orderId = await checkPreviousOrder(ocean, accountId, ddo, 'compute')
       setPreviousOrderId(orderId)
       setHasPreviousOrder(!!orderId)
     }

src/components/organisms/AssetActions/Consume.tsx

@@ -44,7 +44,7 @@ export default function Consume({
 
   useEffect(() => {
     async function checkOrders() {
-      const orderId = await checkPreviousOrder(ocean, accountId, ddo)
+      const orderId = await checkPreviousOrder(ocean, accountId, ddo, 'access')
       setPreviousOrderId(orderId)
       setHasPreviousOrder(!!orderId)
     }

src/utils/checkPreviousOrder.ts

@@ -1,16 +1,18 @@
-import { DDO, Ocean } from '@oceanprotocol/lib'
+import { DDO, Ocean, ServiceType } from '@oceanprotocol/lib'
 
 export default async function checkPreviousOrder(
   ocean: Ocean,
   accountId: string,
-  ddo: DDO
+  ddo: DDO,
+  serviceType: ServiceType
 ) {
-  const service = ddo.findServiceByType('access')
+  const service = ddo.findServiceByType(serviceType)
+  // apparenlty cost and timeout are not found, even though they are there...
   const previousOrder = await ocean.datatokens.getPreviousValidOrders(
     ddo.dataToken,
-    service.attributes.main.cost,
+    (service.attributes.main as any).cost,
     service.index,
-    service.attributes.main.timeout,
+    (service.attributes.main as any).timeout,
     accountId
   )
   return previousOrder