merge fixes

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

@@ -146,7 +146,8 @@ export default function Edit({
     <Formik
       initialValues={getInitialValues(
         metadata,
-        ddo.findServiceByType('access').attributes.main.timeout,
+        (ddo.findServiceByType('access') || ddo.findServiceByType('compute'))
+          .attributes.main.timeout,
         price.value
       )}
       validationSchema={validationSchema}

src/models/FormEditMetadata.ts

@@ -21,7 +21,7 @@ export function getInitialValues(
   return {
     name: metadata.main.name,
     description: metadata.additionalInformation.description,
-    price: price,
+    price,
     links: metadata.additionalInformation.links,
     timeout: secondsToString(timeout)
   }