From 964d8a574e661f1939a4ff858cce9d9684e5cdd5 Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Tue, 22 Jun 2021 15:52:55 -0700
Subject: [PATCH 01/11] plug download cart page into existing solution (where
 it is in a dialog for now)

---
 .../download_list/DownloadConfirmation.tsx    | 46 ++++++++++++-------
 .../download_list/DownloadListTable.tsx       | 13 +++---
 .../table/table-top/DownloadLoginModal.tsx    |  2 +-
 .../table/table-top/DownloadOptions.tsx       |  2 +-
 src/lib/template_style/_theme.scss            |  8 ++++
 src/lib/utils/SynapseClient.ts                | 36 +++++++++++++++
 .../AddToDownloadListRequest.ts               |  9 ++++
 .../AddToDownloadListResponse.ts              |  5 ++
 8 files changed, 96 insertions(+), 25 deletions(-)
 create mode 100644 src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListRequest.ts
 create mode 100644 src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListResponse.ts

diff --git a/src/lib/containers/download_list/DownloadConfirmation.tsx b/src/lib/containers/download_list/DownloadConfirmation.tsx
index dcf7271e30..adb098614b 100644
--- a/src/lib/containers/download_list/DownloadConfirmation.tsx
+++ b/src/lib/containers/download_list/DownloadConfirmation.tsx
@@ -17,8 +17,10 @@ import {
   QUERY_FILTERS_EXPANDED_CSS,
 } from '../QueryWrapper'
 import SignInButton from '../SignInButton'
-import { Alert } from 'react-bootstrap'
+import { Alert, Modal } from 'react-bootstrap'
 import { useSynapseContext } from '../../utils/SynapseContext'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import DownloadCartPage from '../download_list_v2/DownloadCartPage'
 
 enum StatusEnum {
   LOADING_INFO,
@@ -35,10 +37,9 @@ export type DownloadConfirmationState = {
   downloadEstimate?: string
   status: StatusEnum
   errorMessage?: string
-  ownerId?: string
 }
 export type DownloadConfirmationProps = {
-  fnClose?: Function
+  fnClose?: () => void
   getLastQueryRequest?: () => QueryBundleRequest
   topLevelControlsState?: TopLevelControlsState
   updateParentState?: <K extends keyof QueryWrapperState>(
@@ -52,15 +53,18 @@ async function addToDownload(
   query: Query,
   token: string,
 ): Promise<[StatusEnum, string]> {
-  const req: AddFilesToDownloadListRequest = {
-    concreteType:
-      'org.sagebionetworks.repo.model.file.AddFileToDownloadListRequest',
-    query: query,
-  }
   try {
-    const result = await SynapseClient.addFilesToDownloadList(req, token)
-    const ownerId = result.downloadList.ownerId
-    return [StatusEnum.SUCCESS, ownerId]
+    if (!SynapseClient.isInSynapseExperimentalMode()) {
+      const req: AddFilesToDownloadListRequest = {
+        concreteType:
+          'org.sagebionetworks.repo.model.file.AddFileToDownloadListRequest',
+        query: query,
+      }
+      await SynapseClient.addFilesToDownloadList(req, token)
+    } else {
+      await SynapseClient.addFilesToDownloadListV2(query, token)
+    }
+    return [StatusEnum.SUCCESS, '']
   } catch (error) {
     return [StatusEnum.ERROR, error.reason]
   }
@@ -199,7 +203,7 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
       const status = result[0]
 
       if (status === StatusEnum.SUCCESS) {
-        setState({ ...state, ownerId: result[1], status })
+        setState({ ...state, status })
       } else {
         setState({ ...state, errorMessage: result[1], status })
       }
@@ -208,7 +212,6 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
 
   const getContent = (
     { status, fileCount, fileSize, errorMessage }: DownloadConfirmationState,
-    token?: string,
   ): JSX.Element => {
     switch (status) {
       case StatusEnum.LOADING_INFO:
@@ -247,7 +250,6 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
             >
               View Download List
             </button>
-
             {onExportTable && (
               <span>
                 or
@@ -284,7 +286,7 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
           }
         `}
       >
-        <div>{getContent(state, accessToken)}</div>
+        <div>{getContent(state)}</div>
         <div className="download-confirmation-action">
           {state.status !== StatusEnum.PROCESSING && (
             <button className="btn btn-link" onClick={onCancel}>
@@ -303,12 +305,24 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
           )}
         </div>
       </Alert>
-      {showDownloadList && (
+      {showDownloadList && !SynapseClient.isInSynapseExperimentalMode() && (
         <DownloadListTable
           renderAsModal={true}
           onHide={() => setShowDownloadList(false)}
         />
       )}
+      {showDownloadList && SynapseClient.isInSynapseExperimentalMode() && (
+        <Modal
+          centered={true}
+          animation={false}
+          dialogClassName={'modal-90w modal-100h modal-no-content-padding'}
+          show={true}
+          onHide={() => setShowDownloadList(false)}
+        >
+          <Modal.Header closeButton style={{paddingRight: '20px'}} />
+          <DownloadCartPage />
+        </Modal>
+      )}
     </>
   )
 }
diff --git a/src/lib/containers/download_list/DownloadListTable.tsx b/src/lib/containers/download_list/DownloadListTable.tsx
index 8077232c4b..f198bc70e3 100644
--- a/src/lib/containers/download_list/DownloadListTable.tsx
+++ b/src/lib/containers/download_list/DownloadListTable.tsx
@@ -1,5 +1,9 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faTrash } from '@fortawesome/free-solid-svg-icons'
+import { 
+  faTrash, 
+  faSortAmountDown,
+  faSortAmountUp,
+ } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import moment from 'moment'
 import React, { useEffect, useState, useCallback } from 'react'
@@ -34,11 +38,6 @@ import DownloadDetails from './DownloadDetails'
 import AccessRequirementList, {
   AccessRequirementListProps,
 } from '../access_requirement_list/AccessRequirementList'
-
-import {
-  faSortAmountDown,
-  faSortAmountUp,
-} from '@fortawesome/free-solid-svg-icons'
 import { useSynapseContext } from '../../utils/SynapseContext'
 
 library.add(faTrash)
@@ -54,7 +53,7 @@ export type DownloadListTableProps = {
   listUpdatedCallback?: VoidFunction
   forceSamePage?: boolean
   renderAsModal?: boolean
-  onHide?: Function
+  onHide?: () => void
 }
 
 export const TESTING_TRASH_BTN_CLASS = 'TESTING_TRASH_BTN_CLASS'
diff --git a/src/lib/containers/table/table-top/DownloadLoginModal.tsx b/src/lib/containers/table/table-top/DownloadLoginModal.tsx
index d65e0b6bf5..344efaac53 100644
--- a/src/lib/containers/table/table-top/DownloadLoginModal.tsx
+++ b/src/lib/containers/table/table-top/DownloadLoginModal.tsx
@@ -4,7 +4,7 @@ import React from 'react'
 
 export type DownloadLoginModalProps = {
   showModal?: boolean
-  onHide: Function
+  onHide: () => void
 }
 
 export const DownloadLoginModal: React.FunctionComponent<DownloadLoginModalProps> = props => {
diff --git a/src/lib/containers/table/table-top/DownloadOptions.tsx b/src/lib/containers/table/table-top/DownloadOptions.tsx
index 3c922c1ba8..f93c549146 100644
--- a/src/lib/containers/table/table-top/DownloadOptions.tsx
+++ b/src/lib/containers/table/table-top/DownloadOptions.tsx
@@ -13,7 +13,7 @@ import { useSynapseContext } from '../../../utils/SynapseContext'
 export const DOWNLOAD_OPTIONS_CONTAINER_CLASS = 'SRC-download-options-container'
 
 type DownloadOptionsProps = {
-  onDownloadFiles: Function
+  onDownloadFiles: () => void
   isUnauthenticated?: boolean
   isFileView?: boolean
   darkTheme?: boolean
diff --git a/src/lib/template_style/_theme.scss b/src/lib/template_style/_theme.scss
index 13c9db627d..de7a7f22f5 100644
--- a/src/lib/template_style/_theme.scss
+++ b/src/lib/template_style/_theme.scss
@@ -161,6 +161,14 @@
     }
   }
 }
+.modal-100h {
+  .modal-content {
+    min-height: 97vh;
+  }
+}
+body:not(#unknown) .modal-no-content-padding > .modal-content {
+  padding: 0px;
+}
 
 .dropdown-menu.SRC-primary-color-hover-dropdown {
   a.dropdown-item:hover:not(.disabled) {
diff --git a/src/lib/utils/SynapseClient.ts b/src/lib/utils/SynapseClient.ts
index 33d7f60f75..043ed29c76 100644
--- a/src/lib/utils/SynapseClient.ts
+++ b/src/lib/utils/SynapseClient.ts
@@ -68,6 +68,7 @@ import {
   EntityBundleRequest,
   EntityBundle,
   ACTSubmissionStatus,
+  Query,
 } from './synapseTypes/'
 import UniversalCookies from 'universal-cookie'
 import { dispatchDownloadListChangeEvent } from './functions/dispatchDownloadListChangeEvent'
@@ -130,6 +131,8 @@ import {
   ACCESS_REQUIREMENT_BY_ID
 } from './APIConstants'
 import { ActionRequiredResponse, AvailableFilesResponse, FilesStatisticsResponse, QueryResponseDetails } from './synapseTypes/DownloadListV2/QueryResponseDetails'
+import { AddToDownloadListRequest } from './synapseTypes/DownloadListV2/AddToDownloadListRequest'
+import { AddToDownloadListResponse } from './synapseTypes/DownloadListV2/AddToDownloadListResponse'
 
 const cookies = new UniversalCookies()
 
@@ -1674,6 +1677,39 @@ export const addFileToDownloadListV2 = (
   )
 }
 
+
+/**
+ * http://rest-docs.synapse.org/rest/POST/download/list/add/async/start.html
+ * Start an asynchronous job to add files to a user's download list from either a view query or a folder. Use GET /download/list/add/async/get/{asyncToken} to get both the job status and job results.
+ */
+ export const addFilesToDownloadListV2 = async (
+  query: Query,
+  accessToken: string | undefined = undefined,
+  updateParentState?: any,
+): Promise<AddToDownloadListResponse> => {
+  const req:AddToDownloadListRequest = {
+    query,
+    concreteType: 'org.sagebionetworks.repo.model.download.AddToDownloadListRequest',
+  }
+  return doPost<AsyncJobId>(
+    '/repo/v1//download/list/add/async/start',
+    req,
+    accessToken,
+    undefined,
+    BackendDestinationEnum.REPO_ENDPOINT,
+  )
+    .then(resp => {
+      return getAsyncResultFromJobId<AddToDownloadListResponse>(
+        `/repo/v1/download/list/add/async/get/${resp.token}`,
+        accessToken,
+        updateParentState,
+      )
+    })
+    .catch((error: any) => {
+      throw error
+    })
+}
+
 /**
  * Create an ACL
  * https://rest-docs.synapse.org/rest/POST/entity/id/acl.html
diff --git a/src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListRequest.ts b/src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListRequest.ts
new file mode 100644
index 0000000000..76ba57c002
--- /dev/null
+++ b/src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListRequest.ts
@@ -0,0 +1,9 @@
+import { Query } from "../Table";
+
+// http://rest-docs.synapse.org/rest/org/sagebionetworks/repo/model/download/AddToDownloadListRequest.html
+export type AddToDownloadListRequest = {
+  concreteType: 'org.sagebionetworks.repo.model.download.AddToDownloadListRequest'
+  query?: Query
+  parentId?: string //The synID of a folder or project to add all of the children files to the user's download list. This parameter should be excluded when adding files from a query. Note: This is not recursive.
+  useVersionNumber?: boolean //When true (default), the version number will be included for each file added to the user's download list. When set to false, the version number will be excluded, indicating that the 'current' version should always be downloaded.
+}
diff --git a/src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListResponse.ts b/src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListResponse.ts
new file mode 100644
index 0000000000..3e75a9f84c
--- /dev/null
+++ b/src/lib/utils/synapseTypes/DownloadListV2/AddToDownloadListResponse.ts
@@ -0,0 +1,5 @@
+// http://rest-docs.synapse.org/rest/org/sagebionetworks/repo/model/download/AddToDownloadListResponse.html
+export type AddToDownloadListResponse = {
+  concreteType: 'org.sagebionetworks.repo.model.download.AddToDownloadListResponse'
+  numberOfFilesAdded: number
+}

From b14a1e2f5bcd8cf37c65caeed58bfaa06d09d986 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Wed, 23 Jun 2021 13:59:26 -0400
Subject: [PATCH 02/11] Fix undefined logs

---
 src/lib/utils/hooks/SynapseAPI/useUserBundle.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/utils/hooks/SynapseAPI/useUserBundle.ts b/src/lib/utils/hooks/SynapseAPI/useUserBundle.ts
index f2df939710..98467333d3 100644
--- a/src/lib/utils/hooks/SynapseAPI/useUserBundle.ts
+++ b/src/lib/utils/hooks/SynapseAPI/useUserBundle.ts
@@ -41,7 +41,9 @@ export function useGetUserProfileWithProfilePic(
   const { accessToken } = useSynapseContext()
   const queryKey = [accessToken, 'user', principalId, 'profile', 'withPic']
 
-  const { data: userProfile } = useGetUserProfile(principalId)
+  const { data: userProfile } = useGetUserProfile(principalId, {
+    enabled: options?.enabled ?? true,
+  })
 
   // TODO: create useGetFile hook with careful configuration to prevent serving expired pre-signed URLs
   return useQuery<UserProfileAndImg, SynapseClientError>(

From 0873b0964974676003b6752e3bc798d58b7b2ff2 Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Wed, 23 Jun 2021 11:36:44 -0700
Subject: [PATCH 03/11] working solution, send to Download Cart Page URL
 (configurable) after adding files to the list

---
 src/demo/containers/App.tsx                   |  2 +-
 src/demo/containers/Demo.tsx                  |  2 +-
 .../StyleGuidistComponentWrapper.tsx          |  2 +-
 .../download_list/DownloadConfirmation.tsx    | 22 ++++++-------------
 .../DownloadListActionsRequired.tsx           |  3 +--
 .../download_list_v2/DownloadListTable.tsx    |  2 +-
 .../QueryWrapperPlotNav.md                    |  1 +
 .../QueryWrapperPlotNav.tsx                   |  3 +++
 src/lib/containers/table/SynapseTable.tsx     |  8 -------
 src/lib/index.ts                              |  2 ++
 src/lib/rollup.index.ts                       |  2 ++
 src/lib/template_style/_theme.scss            |  8 -------
 src/lib/utils/SynapseClient.ts                |  5 -----
 13 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/src/demo/containers/App.tsx b/src/demo/containers/App.tsx
index 0fd96cd577..86d1cbe688 100644
--- a/src/demo/containers/App.tsx
+++ b/src/demo/containers/App.tsx
@@ -142,7 +142,7 @@ export default class App extends React.Component<{}, AppState> {
       <SynapseContextProvider
         synapseContext={{
           accessToken: token,
-          isInExperimentalMode: SynapseClient.getIsInExperimentalModeFromCookie(),
+          isInExperimentalMode: SynapseClient.isInSynapseExperimentalMode(),
           utcTime: SynapseClient.getUseUtcTimeFromCookie(),
         }}
       >
diff --git a/src/demo/containers/Demo.tsx b/src/demo/containers/Demo.tsx
index ba23ca0cd5..131eb548e7 100644
--- a/src/demo/containers/Demo.tsx
+++ b/src/demo/containers/Demo.tsx
@@ -109,7 +109,7 @@ class Demo extends React.Component<DemoProps, DemoState> {
       <SynapseContextProvider
         synapseContext={{
           accessToken: this.state.token ?? undefined,
-          isInExperimentalMode: SynapseClient.getIsInExperimentalModeFromCookie(),
+          isInExperimentalMode: SynapseClient.isInSynapseExperimentalMode(),
           utcTime: SynapseClient.getUseUtcTimeFromCookie(),
         }}
       >
diff --git a/src/lib/containers/StyleGuidistComponentWrapper.tsx b/src/lib/containers/StyleGuidistComponentWrapper.tsx
index f2a3187c90..22099c041b 100644
--- a/src/lib/containers/StyleGuidistComponentWrapper.tsx
+++ b/src/lib/containers/StyleGuidistComponentWrapper.tsx
@@ -9,7 +9,7 @@ export const StyleGuidistComponentWrapper: React.FC = props => {
     <SynapseContextProvider
       synapseContext={{
         accessToken: (global as any).accessToken,
-        isInExperimentalMode: SynapseClient.getIsInExperimentalModeFromCookie(),
+        isInExperimentalMode: SynapseClient.isInSynapseExperimentalMode(),
         utcTime: SynapseClient.getUseUtcTimeFromCookie(),
       }}
     >
diff --git a/src/lib/containers/download_list/DownloadConfirmation.tsx b/src/lib/containers/download_list/DownloadConfirmation.tsx
index adb098614b..b75b749d3c 100644
--- a/src/lib/containers/download_list/DownloadConfirmation.tsx
+++ b/src/lib/containers/download_list/DownloadConfirmation.tsx
@@ -17,10 +17,8 @@ import {
   QUERY_FILTERS_EXPANDED_CSS,
 } from '../QueryWrapper'
 import SignInButton from '../SignInButton'
-import { Alert, Modal } from 'react-bootstrap'
+import { Alert } from 'react-bootstrap'
 import { useSynapseContext } from '../../utils/SynapseContext'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import DownloadCartPage from '../download_list_v2/DownloadCartPage'
 
 enum StatusEnum {
   LOADING_INFO,
@@ -46,6 +44,7 @@ export type DownloadConfirmationProps = {
     param: Pick<QueryWrapperState, K>,
   ) => void
   onExportTable?: () => void
+  downloadCartPageUrl?: string
 }
 
 // add files to download list
@@ -128,6 +127,7 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
   updateParentState,
   topLevelControlsState,
   onExportTable,
+  downloadCartPageUrl,
 }) => {
   const { accessToken } = useSynapseContext()
   const { showDownloadConfirmation = true } = topLevelControlsState ?? {}
@@ -268,6 +268,10 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
         return <></>
     }
   }
+  if (showDownloadList && SynapseClient.isInSynapseExperimentalMode() && downloadCartPageUrl) {
+    // go to the Download Cart Page
+    window.location.href = downloadCartPageUrl
+  }
   const showFacetFilter = topLevelControlsState?.showFacetFilter
   return (
     <>
@@ -311,18 +315,6 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
           onHide={() => setShowDownloadList(false)}
         />
       )}
-      {showDownloadList && SynapseClient.isInSynapseExperimentalMode() && (
-        <Modal
-          centered={true}
-          animation={false}
-          dialogClassName={'modal-90w modal-100h modal-no-content-padding'}
-          show={true}
-          onHide={() => setShowDownloadList(false)}
-        >
-          <Modal.Header closeButton style={{paddingRight: '20px'}} />
-          <DownloadCartPage />
-        </Modal>
-      )}
     </>
   )
 }
diff --git a/src/lib/containers/download_list_v2/DownloadListActionsRequired.tsx b/src/lib/containers/download_list_v2/DownloadListActionsRequired.tsx
index be32f16677..0cf1ed079d 100644
--- a/src/lib/containers/download_list_v2/DownloadListActionsRequired.tsx
+++ b/src/lib/containers/download_list_v2/DownloadListActionsRequired.tsx
@@ -20,7 +20,6 @@ export default function DownloadListActionsRequired() {
     fetchNextPage,
     isError,
     error: newError,
-    refetch,
   } = useGetDownloadListActionsRequiredInfinite()
 
   useEffect(() => {
@@ -82,7 +81,7 @@ export default function DownloadListActionsRequired() {
         <div
           className="DownloadListActionsRequired"
         >
-            {allRows.map(item => {
+            {allRows.map((item:ActionRequiredCount) => {
               if (item) {
                 return renderActionRequired(item)
               } else return false
diff --git a/src/lib/containers/download_list_v2/DownloadListTable.tsx b/src/lib/containers/download_list_v2/DownloadListTable.tsx
index d22aaa37eb..185e24605f 100644
--- a/src/lib/containers/download_list_v2/DownloadListTable.tsx
+++ b/src/lib/containers/download_list_v2/DownloadListTable.tsx
@@ -148,7 +148,7 @@ export default function DownloadListTable() {
             </tr>
           </thead>
           <tbody>
-            {allRows.map(item => {
+            {allRows.map((item:DownloadListItemResult) => {
               if (item) {
                 const addedOn = moment(item.addedOn).format('L LT')
                 const createdOn = moment(item.createdOn).format('L LT')
diff --git a/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.md b/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.md
index 246e2017a6..4f3c48da78 100644
--- a/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.md
+++ b/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.md
@@ -65,5 +65,6 @@ Configured to show a table:
     name='Table Demo'
     sqlOperator='='
     sql='SELECT * FROM syn11346063.14'
+    downloadCartPageUrl='#/Other%20Components?id=downloadcartpage'
   />
 ```
\ No newline at end of file
diff --git a/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.tsx b/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.tsx
index 49c55688b2..f9fa7c28dd 100644
--- a/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.tsx
+++ b/src/lib/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.tsx
@@ -37,6 +37,7 @@ type OwnProps = {
   hideDownload?: boolean
   defaultColumn?: string
   defaultShowFacetVisualization?: boolean
+  downloadCartPageUrl?: string
 } & Omit<TopLevelControlsProps, 'entityId'>
 
 type SearchParams = {
@@ -67,6 +68,7 @@ const QueryWrapperPlotNav: React.FunctionComponent<QueryWrapperPlotNavProps> = p
     hideDownload,
     searchConfiguration,
     limit = DEFAULT_PAGE_SIZE,
+    downloadCartPageUrl,
     ...rest
   } = props
   let sqlUsed = sql
@@ -106,6 +108,7 @@ const QueryWrapperPlotNav: React.FunctionComponent<QueryWrapperPlotNavProps> = p
             <ErrorBanner />
             <DownloadConfirmation
               onExportTable={() => setShowExportMetadata(true)}
+              downloadCartPageUrl={downloadCartPageUrl}
             />
             <TopLevelControls
               showColumnSelection={tableConfiguration !== undefined}
diff --git a/src/lib/containers/table/SynapseTable.tsx b/src/lib/containers/table/SynapseTable.tsx
index 35c890fffc..2d5833c1cd 100644
--- a/src/lib/containers/table/SynapseTable.tsx
+++ b/src/lib/containers/table/SynapseTable.tsx
@@ -23,7 +23,6 @@ import {
   EntityColumnType,
   ColumnModel,
 } from '../../utils/synapseTypes/'
-import { DownloadConfirmation } from '../download_list/DownloadConfirmation'
 import HasAccess from '../HasAccess'
 import { QueryWrapperChildProps } from '../QueryWrapper'
 import TotalQueryResults from '../TotalQueryResults'
@@ -86,7 +85,6 @@ export interface Dictionary<T> {
 export type SynapseTableState = {
   sortedColumnSelection: SortItem[]
   columnIconSortState: number[]
-  isDownloadConfirmationOpen: boolean
   isExportTableDownloadOpen: boolean
   isExpanded: boolean
   isFileView: boolean
@@ -135,7 +133,6 @@ export default class SynapseTable extends React.Component<
           2 - show ascending icon selected
       */
       columnIconSortState: [],
-      isDownloadConfirmationOpen: false,
       isExportTableDownloadOpen: false,
       isExpanded: false,
       isColumnSelectionOpen: false,
@@ -502,11 +499,6 @@ export default class SynapseTable extends React.Component<
     const tableEntityId: string = lastQueryRequest?.entityId
     return (
       <div style={{ minHeight: '400px' }} className="SRC-overflowAuto">
-        {this.state.isDownloadConfirmationOpen && (
-          <DownloadConfirmation
-            getLastQueryRequest={this.props.getLastQueryRequest!}
-          />
-        )}
         <table
           ref={node => (this.tableElement = node)}
           className="table table-striped table-condensed"
diff --git a/src/lib/index.ts b/src/lib/index.ts
index bb8b673278..584a22a5e3 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -50,6 +50,7 @@ import './style/components/_spinner.scss'
 import { SynapseConstants, SynapseClient } from './utils'
 import { EvaluationCard } from './containers/evaluation_queues/EvaluationCard'
 import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationEditorPage'
+import DownloadCartPage from './containers/download_list_v2/DownloadCartPage'
 
 const SynapseContext = {
   SynapseContextProvider,
@@ -97,6 +98,7 @@ const SynapseComponents = {
   ProjectViewCarousel,
   EntityFinder,
   ExperimentalMode,
+  DownloadCartPage,
 }
 
 export { SynapseClient, SynapseConstants, SynapseComponents, SynapseContext }
diff --git a/src/lib/rollup.index.ts b/src/lib/rollup.index.ts
index 0354cc0552..93a0b52023 100644
--- a/src/lib/rollup.index.ts
+++ b/src/lib/rollup.index.ts
@@ -15,6 +15,7 @@ import TermsAndConditions from './containers/TermsAndConditions'
 import PageProgress from './containers/PageProgress'
 import ProjectViewCarousel from './containers/home_page/project_view_carousel/ProjectViewCarousel'
 import { SynapseHomepage } from './containers/SynapseHomepage'
+import DownloadCartPage from './containers/download_list_v2/DownloadCartPage'
 import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationEditorPage'
 import { EntityFinder } from './containers/entity_finder/EntityFinder'
 import ErrorPage from './containers/ErrorPage'
@@ -48,6 +49,7 @@ const SynapseComponents = {
   SynapseHomepage,
   EntityFinder,
   ErrorPage,
+  DownloadCartPage,
 }
 
 export { SynapseComponents, SynapseConstants, SynapseClient, SynapseContext }
diff --git a/src/lib/template_style/_theme.scss b/src/lib/template_style/_theme.scss
index de7a7f22f5..13c9db627d 100644
--- a/src/lib/template_style/_theme.scss
+++ b/src/lib/template_style/_theme.scss
@@ -161,14 +161,6 @@
     }
   }
 }
-.modal-100h {
-  .modal-content {
-    min-height: 97vh;
-  }
-}
-body:not(#unknown) .modal-no-content-padding > .modal-content {
-  padding: 0px;
-}
 
 .dropdown-menu.SRC-primary-color-hover-dropdown {
   a.dropdown-item:hover:not(.disabled) {
diff --git a/src/lib/utils/SynapseClient.ts b/src/lib/utils/SynapseClient.ts
index 043ed29c76..0e71f3b7ad 100644
--- a/src/lib/utils/SynapseClient.ts
+++ b/src/lib/utils/SynapseClient.ts
@@ -108,7 +108,6 @@ import { RemoveBatchOfFilesFromDownloadListResponse } from './synapseTypes/Downl
 import { RemoveBatchOfFilesFromDownloadListRequest } from './synapseTypes/DownloadListV2/RemoveBatchOfFilesFromDownloadListRequest'
 import {
   DATETIME_UTC_COOKIE_KEY,
-  EXPERIMENTAL_MODE_COOKIE,
 } from './SynapseConstants'
 import { AuthenticatedOn } from './synapseTypes/AuthenticatedOn'
 import { RenewalInterface } from './synapseTypes/AccessRequirement/RenewalInterface'
@@ -1217,10 +1216,6 @@ export const getAccessTokenFromCookie = async () => {
   )
 }
 
-export const getIsInExperimentalModeFromCookie = () => {
-  return !!cookies.get(EXPERIMENTAL_MODE_COOKIE)
-}
-
 export const getUseUtcTimeFromCookie = () => {
   return cookies.get(DATETIME_UTC_COOKIE_KEY) === 'true'
 }

From fb0368a8455a682e2876b196b0c1ab8c141b4c14 Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Wed, 23 Jun 2021 12:42:07 -0700
Subject: [PATCH 04/11] log an error message on click if the Download Cart Page
 was not set.

---
 src/lib/containers/download_list/DownloadConfirmation.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/containers/download_list/DownloadConfirmation.tsx b/src/lib/containers/download_list/DownloadConfirmation.tsx
index b75b749d3c..c2b93a60dd 100644
--- a/src/lib/containers/download_list/DownloadConfirmation.tsx
+++ b/src/lib/containers/download_list/DownloadConfirmation.tsx
@@ -268,9 +268,12 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
         return <></>
     }
   }
-  if (showDownloadList && SynapseClient.isInSynapseExperimentalMode() && downloadCartPageUrl) {
+  if (showDownloadList && SynapseClient.isInSynapseExperimentalMode()) {
     // go to the Download Cart Page
-    window.location.href = downloadCartPageUrl
+    if (downloadCartPageUrl)
+      window.location.href = downloadCartPageUrl
+    else
+      console.error('Missing the Download Cart Page URL in the component configuration.')
   }
   const showFacetFilter = topLevelControlsState?.showFacetFilter
   return (

From 350e7d3d20be41e1430c4df712ae74ef87c8ad7b Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Wed, 23 Jun 2021 14:51:27 -0700
Subject: [PATCH 05/11] a few modifications after integrating into a portal

---
 .../containers/download_list/ShowDownload.tsx |  3 +-
 .../download_list_v2/DownloadCartPage.tsx     |  4 ++-
 .../download_list_v2/ShowDownload.md          |  3 --
 .../download_list_v2/ShowDownloadV2.md        |  3 ++
 .../{ShowDownload.tsx => ShowDownloadV2.tsx}  | 12 ++++----
 src/lib/index.ts                              |  4 ++-
 src/lib/rollup.index.ts                       |  4 ++-
 .../style/components/_download-cart-page.scss |  2 +-
 .../style/components/_download-list-v2.scss   | 28 +++++++++++--------
 9 files changed, 39 insertions(+), 24 deletions(-)
 delete mode 100644 src/lib/containers/download_list_v2/ShowDownload.md
 create mode 100644 src/lib/containers/download_list_v2/ShowDownloadV2.md
 rename src/lib/containers/download_list_v2/{ShowDownload.tsx => ShowDownloadV2.tsx} (82%)

diff --git a/src/lib/containers/download_list/ShowDownload.tsx b/src/lib/containers/download_list/ShowDownload.tsx
index b3ceafe608..bb79aa5dde 100644
--- a/src/lib/containers/download_list/ShowDownload.tsx
+++ b/src/lib/containers/download_list/ShowDownload.tsx
@@ -30,8 +30,9 @@ function ShowDownload({ to }: ShowDownloadProps & RouteComponentProps) {
   const [showDownloadModal, setShowDownloadModal] = useState(false)
   const idForToolTip = 'SHOW_DOWNLOAD_TOOLTIP'
   const tooltipText = 'Click to view items in your download list.'
+  const isInExperimentalMode = SynapseClient.isInSynapseExperimentalMode()
   useEffect(() => {
-    if (!accessToken) {
+    if (!accessToken || isInExperimentalMode) {
       return
     }
     const updateDownloadList = async (
diff --git a/src/lib/containers/download_list_v2/DownloadCartPage.tsx b/src/lib/containers/download_list_v2/DownloadCartPage.tsx
index 3e97fed842..cc8812eada 100644
--- a/src/lib/containers/download_list_v2/DownloadCartPage.tsx
+++ b/src/lib/containers/download_list_v2/DownloadCartPage.tsx
@@ -10,10 +10,12 @@ import { useSynapseContext } from '../../utils/SynapseContext'
 import { SynapseClient } from '../../utils'
 import IconSvg from '../IconSvg'
 
+export type DownloadCartPageProps = Record<string, never>
+
 /**
  * Show the Download Cart page.
  */
-export default function DownloadCartPage() {
+export const DownloadCartPage:React.FunctionComponent<DownloadCartPageProps> = () => {
   const { accessToken } = useSynapseContext()
   const [selectedTabIndex, setSelectedTabIndex] = useState<number>(0)
   const handleError = useErrorHandler()
diff --git a/src/lib/containers/download_list_v2/ShowDownload.md b/src/lib/containers/download_list_v2/ShowDownload.md
deleted file mode 100644
index cf533c1586..0000000000
--- a/src/lib/containers/download_list_v2/ShowDownload.md
+++ /dev/null
@@ -1,3 +0,0 @@
-```jsx
-accessToken ? <ShowDownload to='/#/Other%20Components?id=availablefordownloadtable' /> : <>Sign in to view this component</>
-```
diff --git a/src/lib/containers/download_list_v2/ShowDownloadV2.md b/src/lib/containers/download_list_v2/ShowDownloadV2.md
new file mode 100644
index 0000000000..8b2b7f42d3
--- /dev/null
+++ b/src/lib/containers/download_list_v2/ShowDownloadV2.md
@@ -0,0 +1,3 @@
+```jsx
+accessToken ? <ShowDownloadV2 to='/#/Other%20Components?id=availablefordownloadtable' /> : <>Sign in to view this component</>
+```
diff --git a/src/lib/containers/download_list_v2/ShowDownload.tsx b/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
similarity index 82%
rename from src/lib/containers/download_list_v2/ShowDownload.tsx
rename to src/lib/containers/download_list_v2/ShowDownloadV2.tsx
index e893e93183..44b6e8d87a 100644
--- a/src/lib/containers/download_list_v2/ShowDownload.tsx
+++ b/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
@@ -3,12 +3,13 @@ import { Link, withRouter, RouteComponentProps } from 'react-router-dom'
 import ReactTooltip from 'react-tooltip'
 import { TOOLTIP_DELAY_SHOW } from '../table/SynapseTableConstants'
 import { useSynapseContext } from '../../utils/SynapseContext'
+import { isInSynapseExperimentalMode } from '../../utils/SynapseClient'
 import { useErrorHandler } from 'react-error-boundary'
 import { toError } from '../../utils/ErrorUtils'
 import { useGetDownloadListStatistics } from '../../utils/hooks/SynapseAPI/useGetDownloadListStatistics'
 import IconSvg from '../IconSvg'
 
-export type ShowDownloadProps = {
+export type ShowDownloadV2Props = {
   to: string
 }
 
@@ -16,7 +17,7 @@ export type ShowDownloadProps = {
  * Nav bar item, displayed when files have been added to the Download Cart.
  * This must be configured with the URL of a page dedicated to showing the Download Cart.
  */
-function ShowDownload({ to }: ShowDownloadProps & RouteComponentProps) {
+function ShowDownloadV2({ to }: ShowDownloadV2Props & RouteComponentProps) {
   const { accessToken } = useSynapseContext()
   const handleError = useErrorHandler()
   const idForToolTip = 'SHOW_DOWNLOAD_TOOLTIP'
@@ -35,7 +36,8 @@ function ShowDownload({ to }: ShowDownloadProps & RouteComponentProps) {
     }
   }, [isError, newError, handleError])
 
-  if (!accessToken || isFetching) {
+  const isInExperimentalMode = isInSynapseExperimentalMode()
+  if (!accessToken || isFetching || !isInExperimentalMode) {
     return <></>
   }
   
@@ -66,10 +68,10 @@ function ShowDownload({ to }: ShowDownloadProps & RouteComponentProps) {
     </>
   )
 
-  return <Link className="Download-Link SRC-userImgSmall" to={to}>
+  return <Link className="Download-Link v2" to={to}>
       {content}
     </Link>
   
 }
 
-export default withRouter(ShowDownload)
+export default withRouter(ShowDownloadV2)
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 584a22a5e3..88c2172e2c 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -50,7 +50,8 @@ import './style/components/_spinner.scss'
 import { SynapseConstants, SynapseClient } from './utils'
 import { EvaluationCard } from './containers/evaluation_queues/EvaluationCard'
 import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationEditorPage'
-import DownloadCartPage from './containers/download_list_v2/DownloadCartPage'
+import { DownloadCartPage } from './containers/download_list_v2/DownloadCartPage'
+import ShowDownloadV2 from './containers/download_list_v2/ShowDownloadV2'
 
 const SynapseContext = {
   SynapseContextProvider,
@@ -99,6 +100,7 @@ const SynapseComponents = {
   EntityFinder,
   ExperimentalMode,
   DownloadCartPage,
+  ShowDownloadV2,
 }
 
 export { SynapseClient, SynapseConstants, SynapseComponents, SynapseContext }
diff --git a/src/lib/rollup.index.ts b/src/lib/rollup.index.ts
index 93a0b52023..62f85556aa 100644
--- a/src/lib/rollup.index.ts
+++ b/src/lib/rollup.index.ts
@@ -15,10 +15,11 @@ import TermsAndConditions from './containers/TermsAndConditions'
 import PageProgress from './containers/PageProgress'
 import ProjectViewCarousel from './containers/home_page/project_view_carousel/ProjectViewCarousel'
 import { SynapseHomepage } from './containers/SynapseHomepage'
-import DownloadCartPage from './containers/download_list_v2/DownloadCartPage'
+import { DownloadCartPage } from './containers/download_list_v2/DownloadCartPage'
 import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationEditorPage'
 import { EntityFinder } from './containers/entity_finder/EntityFinder'
 import ErrorPage from './containers/ErrorPage'
+import ShowDownloadV2 from './containers/download_list_v2/ShowDownloadV2'
 import {
   SynapseContextProvider,
   SynapseContextConsumer,
@@ -50,6 +51,7 @@ const SynapseComponents = {
   EntityFinder,
   ErrorPage,
   DownloadCartPage,
+  ShowDownloadV2,
 }
 
 export { SynapseComponents, SynapseConstants, SynapseClient, SynapseContext }
diff --git a/src/lib/style/components/_download-cart-page.scss b/src/lib/style/components/_download-cart-page.scss
index 65c99586a4..1c163083b5 100644
--- a/src/lib/style/components/_download-cart-page.scss
+++ b/src/lib/style/components/_download-cart-page.scss
@@ -2,7 +2,7 @@
 @use '../abstracts/mixins' as SrcMixins;
 
 .DownloadCartPage {
-  padding-top: 20px;
+  padding-top: 60px;
   .description {
     max-width: 700px;
     padding-top: 10px;
diff --git a/src/lib/style/components/_download-list-v2.scss b/src/lib/style/components/_download-list-v2.scss
index 816ff6fdda..7ab9f60b29 100644
--- a/src/lib/style/components/_download-list-v2.scss
+++ b/src/lib/style/components/_download-list-v2.scss
@@ -31,14 +31,20 @@
   }
 }
 
-.download-cart-size {
-  background-color: SRC.$secondary-action-color;
-  text-align: center;
-  position: absolute;
-  width: 30px;
-  height: 18px;
-  color: white;
-  border-radius: 8px;
-  top: 0px;
-  right: -36px;
-}
+.Download-Link {
+  &.v2 {
+    margin: auto;
+    min-width: 55px;
+    .download-cart-size {
+      background-color: SRC.$secondary-action-color;
+      text-align: center;
+      position: absolute;
+      height: 18px;
+      color: white;
+      border-radius: 8px;
+      top: -12px;
+      left: 17px;
+      padding: 0px 3px;
+    }
+  }
+}
\ No newline at end of file

From 73e0798d9dca07ac89b1e79206ea5c8613158e48 Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Wed, 23 Jun 2021 15:30:13 -0700
Subject: [PATCH 06/11] add default download cart page route

---
 src/lib/containers/download_list/DownloadConfirmation.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/containers/download_list/DownloadConfirmation.tsx b/src/lib/containers/download_list/DownloadConfirmation.tsx
index c2b93a60dd..07643ba9c2 100644
--- a/src/lib/containers/download_list/DownloadConfirmation.tsx
+++ b/src/lib/containers/download_list/DownloadConfirmation.tsx
@@ -127,7 +127,7 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
   updateParentState,
   topLevelControlsState,
   onExportTable,
-  downloadCartPageUrl,
+  downloadCartPageUrl='/DownloadCart',
 }) => {
   const { accessToken } = useSynapseContext()
   const { showDownloadConfirmation = true } = topLevelControlsState ?? {}

From 0afb597eece0c6f815e7df6c0dd0702180e117ba Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Thu, 24 Jun 2021 11:00:03 -0700
Subject: [PATCH 07/11] modifications necessary for integration into SWC

---
 src/lib/assets/icons/download_list/easy.svg   | 33 -----------
 src/lib/assets/icons/download_list/medium.svg | 33 -----------
 .../assets/icons/download_list/variable.svg   | 33 -----------
 .../download_list_v2/DownloadCartPage.tsx     |  4 +-
 .../download_list_v2/DownloadListStats.tsx    | 55 ++++++-------------
 .../download_list_v2/DownloadListTable.tsx    |  3 +
 .../download_list_v2/ShowDownloadV2.tsx       | 10 ++--
 .../containers/row_renderers/utils/Icon.tsx   |  9 +--
 .../style/components/_download-cart-page.scss |  2 +-
 9 files changed, 32 insertions(+), 150 deletions(-)
 delete mode 100644 src/lib/assets/icons/download_list/easy.svg
 delete mode 100644 src/lib/assets/icons/download_list/medium.svg
 delete mode 100644 src/lib/assets/icons/download_list/variable.svg

diff --git a/src/lib/assets/icons/download_list/easy.svg b/src/lib/assets/icons/download_list/easy.svg
deleted file mode 100644
index 6ba198d269..0000000000
--- a/src/lib/assets/icons/download_list/easy.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<svg width="136" height="74" viewBox="0 0 136 74" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.2" filter="url(#filter0_i)">
-<path d="M116 68C116 41.4903 94.5097 20 68 20C41.4903 20 20 41.4903 20 68" stroke="#BDBDBD" stroke-width="10" stroke-linecap="round"/>
-</g>
-<path d="M9 69C9 67.9391 8.57857 66.9217 7.82843 66.1716C7.07828 65.4214 6.06087 65 5 65C3.93913 65 2.92172 65.4214 2.17157 66.1716C1.42143 66.9217 1 67.9391 1 69C1 70.0609 1.42143 71.0783 2.17157 71.8284C2.92172 72.5786 3.93913 73 5 73C6.06087 73 7.07828 72.5786 7.82843 71.8284C8.57857 71.0783 9 70.0609 9 69ZM10 69C10 70.3261 9.47322 71.5979 8.53553 72.5355C7.59785 73.4732 6.32608 74 5 74C4.34339 74 3.69321 73.8707 3.08658 73.6194C2.47995 73.3681 1.92876 72.9998 1.46447 72.5355C0.526784 71.5979 0 70.3261 0 69C0 67.6739 0.526784 66.4021 1.46447 65.4645C2.40215 64.5268 3.67392 64 5 64C5.65661 64 6.30679 64.1293 6.91342 64.3806C7.52005 64.6319 8.07124 65.0002 8.53553 65.4645C8.99983 65.9288 9.36812 66.48 9.6194 67.0866C9.87067 67.6932 10 68.3434 10 69ZM4 67.75C4 68.15 3.65 68.5 3.25 68.5C2.85 68.5 2.5 68.15 2.5 67.75C2.5 67.35 2.85 67 3.25 67C3.65 67 4 67.35 4 67.75ZM7.5 67.75C7.5 68.15 7.15 68.5 6.75 68.5C6.35 68.5 6 68.15 6 67.75C6 67.35 6.35 67 6.75 67C7.15 67 7.5 67.35 7.5 67.75ZM5 71.615C4.125 71.615 3.355 71.25 2.905 70.71L3.615 70C3.84 70.36 4.375 70.615 5 70.615C5.625 70.615 6.16 70.36 6.385 70L7.095 70.71C6.645 71.25 5.875 71.615 5 71.615Z" fill="#515359"/>
-<path d="M66.25 4.5C66.0511 4.5 65.8603 4.42098 65.7197 4.28033C65.579 4.13968 65.5 3.94891 65.5 3.75C65.5 3.55109 65.579 3.36032 65.7197 3.21967C65.8603 3.07902 66.0511 3 66.25 3C66.4489 3 66.6397 3.07902 66.7803 3.21967C66.921 3.36032 67 3.55109 67 3.75C67 3.94891 66.921 4.13968 66.7803 4.28033C66.6397 4.42098 66.4489 4.5 66.25 4.5ZM69.75 4.5C69.5511 4.5 69.3603 4.42098 69.2197 4.28033C69.079 4.13968 69 3.94891 69 3.75C69 3.55109 69.079 3.36032 69.2197 3.21967C69.3603 3.07902 69.5511 3 69.75 3C69.9489 3 70.1397 3.07902 70.2803 3.21967C70.421 3.36032 70.5 3.55109 70.5 3.75C70.5 3.94891 70.421 4.13968 70.2803 4.28033C70.1397 4.42098 69.9489 4.5 69.75 4.5ZM68 9C69.0609 9 70.0783 8.57857 70.8284 7.82843C71.5786 7.07828 72 6.06087 72 5C72 3.93913 71.5786 2.92172 70.8284 2.17157C70.0783 1.42143 69.0609 1 68 1C66.9391 1 65.9217 1.42143 65.1716 2.17157C64.4214 2.92172 64 3.93913 64 5C64 6.06087 64.4214 7.07828 65.1716 7.82843C65.9217 8.57857 66.9391 9 68 9ZM68 0C68.6566 0 69.3068 0.129329 69.9134 0.380602C70.52 0.631876 71.0712 1.00017 71.5355 1.46447C71.9998 1.92876 72.3681 2.47995 72.6194 3.08658C72.8707 3.69321 73 4.34339 73 5C73 6.32608 72.4732 7.59785 71.5355 8.53553C70.5979 9.47322 69.3261 10 68 10C65.235 10 63 7.75 63 5C63 3.67392 63.5268 2.40215 64.4645 1.46447C65.4021 0.526784 66.6739 0 68 0ZM66.5 6H69.5C69.6326 6 69.7598 6.05268 69.8536 6.14645C69.9473 6.24021 70 6.36739 70 6.5C70 6.63261 69.9473 6.75979 69.8536 6.85355C69.7598 6.94732 69.6326 7 69.5 7H66.5C66.3674 7 66.2402 6.94732 66.1464 6.85355C66.0527 6.75979 66 6.63261 66 6.5C66 6.36739 66.0527 6.24021 66.1464 6.14645C66.2402 6.05268 66.3674 6 66.5 6Z" fill="#DCDCDC"/>
-<path d="M130.5 72H131.5V71H130.5V72ZM131 64C130.343 64 129.693 64.1293 129.087 64.3806C128.48 64.6319 127.929 65.0002 127.464 65.4645C126.527 66.4021 126 67.6739 126 69C126 70.3261 126.527 71.5979 127.464 72.5355C127.929 72.9998 128.48 73.3681 129.087 73.6194C129.693 73.8707 130.343 74 131 74C132.326 74 133.598 73.4732 134.536 72.5355C135.473 71.5979 136 70.3261 136 69C136 68.3434 135.871 67.6932 135.619 67.0866C135.368 66.48 135 65.9288 134.536 65.4645C134.071 65.0002 133.52 64.6319 132.913 64.3806C132.307 64.1293 131.657 64 131 64ZM131 73C128.795 73 127 71.205 127 69C127 66.795 128.795 65 131 65C133.205 65 135 66.795 135 69C135 71.205 133.205 73 131 73ZM131 66C130.47 66 129.961 66.2107 129.586 66.5858C129.211 66.9609 129 67.4696 129 68H130C130 67.7348 130.105 67.4804 130.293 67.2929C130.48 67.1054 130.735 67 131 67C131.265 67 131.52 67.1054 131.707 67.2929C131.895 67.4804 132 67.7348 132 68C132 69 130.5 68.875 130.5 70.5H131.5C131.5 69.375 133 69.25 133 68C133 67.4696 132.789 66.9609 132.414 66.5858C132.039 66.2107 131.53 66 131 66Z" fill="#DCDCDC"/>
-<g filter="url(#filter1_d)">
-<path d="M20 68C20 54.1979 25.8254 41.7563 35.1516 33" stroke="#109488" stroke-width="10" stroke-linecap="round"/>
-</g>
-<path d="M61.4517 52.601V53.992H57.2852V56.5985H60.5677V57.944H57.2852V60.6025H61.4517V62H55.5237V52.601H61.4517ZM68.0982 62H67.3767C67.225 62 67.1058 61.9783 67.0192 61.935C66.9325 61.8873 66.8675 61.7942 66.8242 61.6555L66.6812 61.181C66.5122 61.3327 66.3453 61.467 66.1807 61.584C66.0203 61.6967 65.8535 61.792 65.6802 61.87C65.5068 61.948 65.3227 62.0065 65.1277 62.0455C64.9327 62.0845 64.716 62.104 64.4777 62.104C64.196 62.104 63.936 62.0672 63.6977 61.9935C63.4593 61.9155 63.2535 61.8007 63.0802 61.649C62.9112 61.4973 62.779 61.3088 62.6837 61.0835C62.5883 60.8582 62.5407 60.596 62.5407 60.297C62.5407 60.0457 62.6057 59.7987 62.7357 59.556C62.87 59.309 63.091 59.088 63.3987 58.893C63.7063 58.6937 64.1158 58.529 64.6272 58.399C65.1385 58.269 65.7733 58.1953 66.5317 58.178V57.788C66.5317 57.3417 66.4363 57.0123 66.2457 56.8C66.0593 56.5833 65.7863 56.475 65.4267 56.475C65.1667 56.475 64.95 56.5053 64.7767 56.566C64.6033 56.6267 64.4517 56.696 64.3217 56.774C64.196 56.8477 64.079 56.9148 63.9707 56.9755C63.8623 57.0362 63.7432 57.0665 63.6132 57.0665C63.5048 57.0665 63.4117 57.0383 63.3337 56.982C63.2557 56.9257 63.1928 56.8563 63.1452 56.774L62.8527 56.2605C63.6197 55.5585 64.5448 55.2075 65.6282 55.2075C66.0182 55.2075 66.3648 55.2725 66.6682 55.4025C66.9758 55.5282 67.2358 55.7058 67.4482 55.9355C67.6605 56.1608 67.8208 56.4317 67.9292 56.748C68.0418 57.0643 68.0982 57.411 68.0982 57.788V62ZM64.9782 60.999C65.1428 60.999 65.2945 60.9838 65.4332 60.9535C65.5718 60.9232 65.7018 60.8777 65.8232 60.817C65.9488 60.7563 66.068 60.6827 66.1807 60.596C66.2977 60.505 66.4147 60.3988 66.5317 60.2775V59.153C66.0637 59.1747 65.6715 59.2158 65.3552 59.2765C65.0432 59.3328 64.7918 59.4065 64.6012 59.4975C64.4105 59.5885 64.274 59.6947 64.1917 59.816C64.1137 59.9373 64.0747 60.0695 64.0747 60.2125C64.0747 60.4942 64.157 60.6957 64.3217 60.817C64.4907 60.9383 64.7095 60.999 64.9782 60.999ZM73.6353 56.631C73.592 56.7003 73.5465 56.7502 73.4988 56.7805C73.4512 56.8065 73.3905 56.8195 73.3168 56.8195C73.2388 56.8195 73.1543 56.7978 73.0633 56.7545C72.9767 56.7112 72.8748 56.6635 72.7578 56.6115C72.6408 56.5552 72.5065 56.5053 72.3548 56.462C72.2075 56.4187 72.032 56.397 71.8283 56.397C71.512 56.397 71.2628 56.4642 71.0808 56.5985C70.8988 56.7328 70.8078 56.9083 70.8078 57.125C70.8078 57.268 70.8533 57.3893 70.9443 57.489C71.0397 57.5843 71.1632 57.6688 71.3148 57.7425C71.4708 57.8162 71.6463 57.8833 71.8413 57.944C72.0363 58.0003 72.2357 58.0632 72.4393 58.1325C72.643 58.2018 72.8423 58.282 73.0373 58.373C73.2323 58.4597 73.4057 58.5723 73.5573 58.711C73.7133 58.8453 73.8368 59.0078 73.9278 59.1985C74.0232 59.3892 74.0708 59.6188 74.0708 59.8875C74.0708 60.2082 74.0123 60.505 73.8953 60.778C73.7783 61.0467 73.6072 61.2807 73.3818 61.48C73.1565 61.675 72.877 61.8288 72.5433 61.9415C72.214 62.0498 71.8348 62.104 71.4058 62.104C71.1762 62.104 70.9508 62.0823 70.7298 62.039C70.5132 62 70.303 61.9437 70.0993 61.87C69.9 61.7963 69.7137 61.7097 69.5403 61.61C69.3713 61.5103 69.2218 61.402 69.0918 61.285L69.4623 60.674C69.51 60.6003 69.5663 60.544 69.6313 60.505C69.6963 60.466 69.7787 60.4465 69.8783 60.4465C69.978 60.4465 70.0712 60.4747 70.1578 60.531C70.2488 60.5873 70.3528 60.648 70.4698 60.713C70.5868 60.778 70.7233 60.8387 70.8793 60.895C71.0397 60.9513 71.2412 60.9795 71.4838 60.9795C71.6745 60.9795 71.837 60.9578 71.9713 60.9145C72.11 60.8668 72.2227 60.8062 72.3093 60.7325C72.4003 60.6588 72.4653 60.5743 72.5043 60.479C72.5477 60.3793 72.5693 60.2775 72.5693 60.1735C72.5693 60.0175 72.5217 59.8897 72.4263 59.79C72.3353 59.6903 72.2118 59.6037 72.0558 59.53C71.9042 59.4563 71.7287 59.3913 71.5293 59.335C71.3343 59.2743 71.1328 59.2093 70.9248 59.14C70.7212 59.0707 70.5197 58.9905 70.3203 58.8995C70.1253 58.8042 69.9498 58.685 69.7938 58.542C69.6422 58.399 69.5187 58.2235 69.4233 58.0155C69.3323 57.8075 69.2868 57.5562 69.2868 57.2615C69.2868 56.9885 69.341 56.7285 69.4493 56.4815C69.5577 56.2345 69.7158 56.02 69.9238 55.838C70.1362 55.6517 70.3983 55.5043 70.7103 55.396C71.0267 55.2833 71.3907 55.227 71.8023 55.227C72.2617 55.227 72.6798 55.3028 73.0568 55.4545C73.4338 55.6062 73.748 55.8055 73.9993 56.0525L73.6353 56.631ZM77.7177 63.833C77.67 63.9457 77.6072 64.0302 77.5292 64.0865C77.4555 64.1472 77.3407 64.1775 77.1847 64.1775H75.9887L77.2367 61.506L74.5392 55.331H75.9432C76.0732 55.331 76.1728 55.3613 76.2422 55.422C76.3115 55.4827 76.3635 55.552 76.3982 55.63L77.8217 59.088C77.8693 59.2007 77.9105 59.3177 77.9452 59.439C77.9798 59.5603 78.0102 59.6817 78.0362 59.803C78.0708 59.6773 78.1077 59.556 78.1467 59.439C78.19 59.322 78.2355 59.2028 78.2832 59.0815L79.6222 55.63C79.6568 55.5433 79.7132 55.4718 79.7912 55.4155C79.8735 55.3592 79.9645 55.331 80.0642 55.331H81.3512L77.7177 63.833Z" fill="#515359"/>
-<defs>
-<filter id="filter0_i" x="15" y="15" width="106" height="62" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="4"/>
-<feGaussianBlur stdDeviation="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow"/>
-</filter>
-<filter id="filter1_d" x="14" y="27" width="27.1517" height="47" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="0.5"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/src/lib/assets/icons/download_list/medium.svg b/src/lib/assets/icons/download_list/medium.svg
deleted file mode 100644
index 1ede31d6e1..0000000000
--- a/src/lib/assets/icons/download_list/medium.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<svg width="136" height="74" viewBox="0 0 136 74" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.2" filter="url(#filter0_i)">
-<path d="M116 68C116 41.4903 94.5097 20 68 20C41.4903 20 20 41.4903 20 68" stroke="#BDBDBD" stroke-width="10" stroke-linecap="round"/>
-</g>
-<path d="M9 69C9 67.9391 8.57857 66.9217 7.82843 66.1716C7.07828 65.4214 6.06087 65 5 65C3.93913 65 2.92172 65.4214 2.17157 66.1716C1.42143 66.9217 1 67.9391 1 69C1 70.0609 1.42143 71.0783 2.17157 71.8284C2.92172 72.5786 3.93913 73 5 73C6.06087 73 7.07828 72.5786 7.82843 71.8284C8.57857 71.0783 9 70.0609 9 69ZM10 69C10 70.3261 9.47322 71.5979 8.53553 72.5355C7.59785 73.4732 6.32608 74 5 74C4.34339 74 3.69321 73.8707 3.08658 73.6194C2.47995 73.3681 1.92876 72.9998 1.46447 72.5355C0.526784 71.5979 0 70.3261 0 69C0 67.6739 0.526784 66.4021 1.46447 65.4645C2.40215 64.5268 3.67392 64 5 64C5.65661 64 6.30679 64.1293 6.91342 64.3806C7.52005 64.6319 8.07124 65.0002 8.53553 65.4645C8.99983 65.9288 9.36812 66.48 9.6194 67.0866C9.87067 67.6932 10 68.3434 10 69ZM4 67.75C4 68.15 3.65 68.5 3.25 68.5C2.85 68.5 2.5 68.15 2.5 67.75C2.5 67.35 2.85 67 3.25 67C3.65 67 4 67.35 4 67.75ZM7.5 67.75C7.5 68.15 7.15 68.5 6.75 68.5C6.35 68.5 6 68.15 6 67.75C6 67.35 6.35 67 6.75 67C7.15 67 7.5 67.35 7.5 67.75ZM5 71.615C4.125 71.615 3.355 71.25 2.905 70.71L3.615 70C3.84 70.36 4.375 70.615 5 70.615C5.625 70.615 6.16 70.36 6.385 70L7.095 70.71C6.645 71.25 5.875 71.615 5 71.615Z" fill="#DCDCDC"/>
-<path d="M66.25 4.5C66.0511 4.5 65.8603 4.42098 65.7197 4.28033C65.579 4.13968 65.5 3.94891 65.5 3.75C65.5 3.55109 65.579 3.36032 65.7197 3.21967C65.8603 3.07902 66.0511 3 66.25 3C66.4489 3 66.6397 3.07902 66.7803 3.21967C66.921 3.36032 67 3.55109 67 3.75C67 3.94891 66.921 4.13968 66.7803 4.28033C66.6397 4.42098 66.4489 4.5 66.25 4.5ZM69.75 4.5C69.5511 4.5 69.3603 4.42098 69.2197 4.28033C69.079 4.13968 69 3.94891 69 3.75C69 3.55109 69.079 3.36032 69.2197 3.21967C69.3603 3.07902 69.5511 3 69.75 3C69.9489 3 70.1397 3.07902 70.2803 3.21967C70.421 3.36032 70.5 3.55109 70.5 3.75C70.5 3.94891 70.421 4.13968 70.2803 4.28033C70.1397 4.42098 69.9489 4.5 69.75 4.5ZM68 9C69.0609 9 70.0783 8.57857 70.8284 7.82843C71.5786 7.07828 72 6.06087 72 5C72 3.93913 71.5786 2.92172 70.8284 2.17157C70.0783 1.42143 69.0609 1 68 1C66.9391 1 65.9217 1.42143 65.1716 2.17157C64.4214 2.92172 64 3.93913 64 5C64 6.06087 64.4214 7.07828 65.1716 7.82843C65.9217 8.57857 66.9391 9 68 9ZM68 0C68.6566 0 69.3068 0.129329 69.9134 0.380602C70.52 0.631876 71.0712 1.00017 71.5355 1.46447C71.9998 1.92876 72.3681 2.47995 72.6194 3.08658C72.8707 3.69321 73 4.34339 73 5C73 6.32608 72.4732 7.59785 71.5355 8.53553C70.5979 9.47322 69.3261 10 68 10C65.235 10 63 7.75 63 5C63 3.67392 63.5268 2.40215 64.4645 1.46447C65.4021 0.526784 66.6739 0 68 0ZM66.5 6H69.5C69.6326 6 69.7598 6.05268 69.8536 6.14645C69.9473 6.24021 70 6.36739 70 6.5C70 6.63261 69.9473 6.75979 69.8536 6.85355C69.7598 6.94732 69.6326 7 69.5 7H66.5C66.3674 7 66.2402 6.94732 66.1464 6.85355C66.0527 6.75979 66 6.63261 66 6.5C66 6.36739 66.0527 6.24021 66.1464 6.14645C66.2402 6.05268 66.3674 6 66.5 6Z" fill="#515359"/>
-<path d="M130.5 72H131.5V71H130.5V72ZM131 64C130.343 64 129.693 64.1293 129.087 64.3806C128.48 64.6319 127.929 65.0002 127.464 65.4645C126.527 66.4021 126 67.6739 126 69C126 70.3261 126.527 71.5979 127.464 72.5355C127.929 72.9998 128.48 73.3681 129.087 73.6194C129.693 73.8707 130.343 74 131 74C132.326 74 133.598 73.4732 134.536 72.5355C135.473 71.5979 136 70.3261 136 69C136 68.3434 135.871 67.6932 135.619 67.0866C135.368 66.48 135 65.9288 134.536 65.4645C134.071 65.0002 133.52 64.6319 132.913 64.3806C132.307 64.1293 131.657 64 131 64ZM131 73C128.795 73 127 71.205 127 69C127 66.795 128.795 65 131 65C133.205 65 135 66.795 135 69C135 71.205 133.205 73 131 73ZM131 66C130.47 66 129.961 66.2107 129.586 66.5858C129.211 66.9609 129 67.4696 129 68H130C130 67.7348 130.105 67.4804 130.293 67.2929C130.48 67.1054 130.735 67 131 67C131.265 67 131.52 67.1054 131.707 67.2929C131.895 67.4804 132 67.7348 132 68C132 69 130.5 68.875 130.5 70.5H131.5C131.5 69.375 133 69.25 133 68C133 67.4696 132.789 66.9609 132.414 66.5858C132.039 66.2107 131.53 66 131 66Z" fill="#DCDCDC"/>
-<g filter="url(#filter1_d)">
-<path d="M20 68C20 41.4903 41.4903 20 68 20" stroke="#FFB020" stroke-width="10" stroke-linecap="round"/>
-</g>
-<path d="M49.5152 58.1C49.5888 58.2387 49.656 58.3838 49.7167 58.5355C49.7817 58.6828 49.8445 58.8323 49.9052 58.984C49.9658 58.828 50.0287 58.6742 50.0937 58.5225C50.1587 58.3708 50.228 58.2257 50.3017 58.087L53.0837 52.8805C53.1183 52.8155 53.153 52.7635 53.1877 52.7245C53.2267 52.6855 53.2678 52.6573 53.3112 52.64C53.3588 52.6227 53.4108 52.6118 53.4672 52.6075C53.5235 52.6032 53.5907 52.601 53.6687 52.601H54.9882V62H53.4477V55.929C53.4477 55.8163 53.4498 55.6928 53.4542 55.5585C53.4628 55.4242 53.4737 55.2877 53.4867 55.149L50.6462 60.479C50.5812 60.6003 50.4967 60.6957 50.3927 60.765C50.2887 60.83 50.1673 60.8625 50.0287 60.8625H49.7882C49.6495 60.8625 49.5282 60.83 49.4242 60.765C49.3202 60.6957 49.2357 60.6003 49.1707 60.479L46.2912 55.1295C46.3085 55.2725 46.3193 55.4133 46.3237 55.552C46.3323 55.6863 46.3367 55.812 46.3367 55.929V62H44.7962V52.601H46.1157C46.1937 52.601 46.2608 52.6032 46.3172 52.6075C46.3735 52.6118 46.4233 52.6227 46.4667 52.64C46.5143 52.6573 46.5577 52.6855 46.5967 52.7245C46.6357 52.7635 46.6725 52.8155 46.7072 52.8805L49.5152 58.1ZM59.5471 55.227C59.9674 55.227 60.3531 55.2942 60.7041 55.4285C61.0594 55.5628 61.3649 55.76 61.6206 56.02C61.8763 56.2757 62.0756 56.592 62.2186 56.969C62.3616 57.3417 62.4331 57.7685 62.4331 58.2495C62.4331 58.3708 62.4266 58.4727 62.4136 58.555C62.4049 58.633 62.3854 58.6958 62.3551 58.7435C62.3291 58.7868 62.2923 58.8193 62.2446 58.841C62.1969 58.8583 62.1363 58.867 62.0626 58.867H57.9416C57.9893 59.5517 58.1734 60.0543 58.4941 60.375C58.8148 60.6957 59.2394 60.856 59.7681 60.856C60.0281 60.856 60.2513 60.8257 60.4376 60.765C60.6283 60.7043 60.7929 60.6372 60.9316 60.5635C61.0746 60.4898 61.1981 60.4227 61.3021 60.362C61.4104 60.3013 61.5144 60.271 61.6141 60.271C61.6791 60.271 61.7354 60.284 61.7831 60.31C61.8308 60.336 61.8719 60.3728 61.9066 60.4205L62.3746 61.0055C62.1969 61.2135 61.9976 61.389 61.7766 61.532C61.5556 61.6707 61.3238 61.7833 61.0811 61.87C60.8428 61.9523 60.5979 62.0108 60.3466 62.0455C60.0996 62.0802 59.8591 62.0975 59.6251 62.0975C59.1614 62.0975 58.7303 62.0217 58.3316 61.87C57.9329 61.714 57.5863 61.4865 57.2916 61.1875C56.9969 60.8842 56.7651 60.5115 56.5961 60.0695C56.4271 59.6232 56.3426 59.1075 56.3426 58.5225C56.3426 58.0675 56.4163 57.6407 56.5636 57.242C56.7109 56.839 56.9211 56.4902 57.1941 56.1955C57.4714 55.8965 57.8073 55.6603 58.2016 55.487C58.6003 55.3137 59.0488 55.227 59.5471 55.227ZM59.5796 56.3775C59.1116 56.3775 58.7454 56.5097 58.4811 56.774C58.2168 57.0383 58.0478 57.4132 57.9741 57.8985H60.9901C60.9901 57.6905 60.9619 57.4955 60.9056 57.3135C60.8493 57.1272 60.7626 56.9647 60.6456 56.826C60.5286 56.6873 60.3813 56.579 60.2036 56.501C60.0259 56.4187 59.8179 56.3775 59.5796 56.3775ZM68.4284 62C68.2204 62 68.0839 61.9025 68.0189 61.7075L67.8889 61.064C67.7503 61.22 67.6051 61.3608 67.4534 61.4865C67.3018 61.6122 67.1371 61.7205 66.9594 61.8115C66.7861 61.9025 66.5976 61.9718 66.3939 62.0195C66.1946 62.0715 65.9779 62.0975 65.7439 62.0975C65.3799 62.0975 65.0463 62.0217 64.7429 61.87C64.4396 61.7183 64.1774 61.4995 63.9564 61.2135C63.7398 60.9232 63.5708 60.5657 63.4494 60.141C63.3324 59.7163 63.2739 59.231 63.2739 58.685C63.2739 58.191 63.3411 57.7317 63.4754 57.307C63.6098 56.8823 63.8026 56.514 64.0539 56.202C64.3053 55.89 64.6064 55.6473 64.9574 55.474C65.3084 55.2963 65.7028 55.2075 66.1404 55.2075C66.5131 55.2075 66.8316 55.2682 67.0959 55.3895C67.3603 55.5065 67.5964 55.6647 67.8044 55.864V52.341H69.4099V62H68.4284ZM66.2899 60.8235C66.6236 60.8235 66.9074 60.7542 67.1414 60.6155C67.3754 60.4768 67.5964 60.2797 67.8044 60.024V57.034C67.6224 56.813 67.4231 56.657 67.2064 56.566C66.9941 56.475 66.7644 56.4295 66.5174 56.4295C66.2748 56.4295 66.0538 56.475 65.8544 56.566C65.6594 56.657 65.4926 56.7957 65.3539 56.982C65.2196 57.164 65.1156 57.398 65.0419 57.684C64.9683 57.9657 64.9314 58.2993 64.9314 58.685C64.9314 59.075 64.9618 59.4065 65.0224 59.6795C65.0874 59.9482 65.1784 60.1692 65.2954 60.3425C65.4124 60.5115 65.5554 60.635 65.7244 60.713C65.8934 60.7867 66.0819 60.8235 66.2899 60.8235ZM72.859 55.331V62H71.2535V55.331H72.859ZM73.0995 53.3875C73.0995 53.5262 73.0713 53.6562 73.015 53.7775C72.9587 53.8988 72.8828 54.005 72.7875 54.096C72.6965 54.187 72.5882 54.2607 72.4625 54.317C72.3368 54.369 72.2025 54.395 72.0595 54.395C71.9208 54.395 71.7887 54.369 71.663 54.317C71.5417 54.2607 71.4355 54.187 71.3445 54.096C71.2535 54.005 71.1798 53.8988 71.1235 53.7775C71.0715 53.6562 71.0455 53.5262 71.0455 53.3875C71.0455 53.2445 71.0715 53.1102 71.1235 52.9845C71.1798 52.8588 71.2535 52.7505 71.3445 52.6595C71.4355 52.5685 71.5417 52.497 71.663 52.445C71.7887 52.3887 71.9208 52.3605 72.0595 52.3605C72.2025 52.3605 72.3368 52.3887 72.4625 52.445C72.5882 52.497 72.6965 52.5685 72.7875 52.6595C72.8828 52.7505 72.9587 52.8588 73.015 52.9845C73.0713 53.1102 73.0995 53.2445 73.0995 53.3875ZM76.1478 55.331V59.569C76.1478 59.9763 76.241 60.2927 76.4273 60.518C76.618 60.739 76.9018 60.8495 77.2788 60.8495C77.5561 60.8495 77.8161 60.7888 78.0588 60.6675C78.3015 60.5418 78.5311 60.3707 78.7478 60.154V55.331H80.3533V62H79.3718C79.1638 62 79.0273 61.9025 78.9623 61.7075L78.8518 61.1745C78.7131 61.3132 78.5701 61.441 78.4228 61.558C78.2755 61.6707 78.1173 61.7682 77.9483 61.8505C77.7836 61.9285 77.6038 61.9892 77.4088 62.0325C77.2181 62.0802 77.0123 62.104 76.7913 62.104C76.4273 62.104 76.1045 62.0433 75.8228 61.922C75.5455 61.7963 75.3115 61.6208 75.1208 61.3955C74.9301 61.1702 74.785 60.9037 74.6853 60.596C74.59 60.284 74.5423 59.9417 74.5423 59.569V55.331H76.1478ZM82.0675 62V55.331H83.049C83.257 55.331 83.3935 55.4285 83.4585 55.6235L83.5625 56.1175C83.6795 55.9875 83.8008 55.8683 83.9265 55.76C84.0565 55.6517 84.193 55.5585 84.336 55.4805C84.4833 55.4025 84.6393 55.3418 84.804 55.2985C84.973 55.2508 85.1571 55.227 85.3565 55.227C85.7768 55.227 86.1213 55.3418 86.39 55.5715C86.663 55.7968 86.8666 56.098 87.001 56.475C87.105 56.254 87.235 56.0655 87.391 55.9095C87.547 55.7492 87.7181 55.6192 87.9045 55.5195C88.0908 55.4198 88.288 55.3462 88.496 55.2985C88.7083 55.2508 88.9206 55.227 89.133 55.227C89.5013 55.227 89.8285 55.2833 90.1145 55.396C90.4005 55.5087 90.641 55.6733 90.836 55.89C91.031 56.1067 91.1783 56.371 91.278 56.683C91.382 56.995 91.434 57.3525 91.434 57.7555V62H89.8285V57.7555C89.8285 57.3308 89.7353 57.0123 89.549 56.8C89.3626 56.5833 89.0896 56.475 88.73 56.475C88.5653 56.475 88.4115 56.5032 88.2685 56.5595C88.1298 56.6158 88.0063 56.6982 87.898 56.8065C87.794 56.9105 87.7116 57.0427 87.651 57.203C87.5903 57.3633 87.56 57.5475 87.56 57.7555V62H85.948V57.7555C85.948 57.3092 85.857 56.9842 85.675 56.7805C85.4973 56.5768 85.233 56.475 84.882 56.475C84.6523 56.475 84.4356 56.5335 84.232 56.6505C84.0326 56.7632 83.8463 56.9192 83.673 57.1185V62H82.0675Z" fill="#515359"/>
-<defs>
-<filter id="filter0_i" x="15" y="15" width="106" height="62" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="4"/>
-<feGaussianBlur stdDeviation="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow"/>
-</filter>
-<filter id="filter1_d" x="14" y="14" width="60" height="60" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="0.5"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/src/lib/assets/icons/download_list/variable.svg b/src/lib/assets/icons/download_list/variable.svg
deleted file mode 100644
index 235de63fb5..0000000000
--- a/src/lib/assets/icons/download_list/variable.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<svg width="136" height="74" viewBox="0 0 136 74" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g opacity="0.2" filter="url(#filter0_i)">
-<path d="M116 68C116 41.4903 94.5097 20 68 20C41.4903 20 20 41.4903 20 68" stroke="#BDBDBD" stroke-width="10" stroke-linecap="round"/>
-</g>
-<path d="M9 69C9 67.9391 8.57857 66.9217 7.82843 66.1716C7.07828 65.4214 6.06087 65 5 65C3.93913 65 2.92172 65.4214 2.17157 66.1716C1.42143 66.9217 1 67.9391 1 69C1 70.0609 1.42143 71.0783 2.17157 71.8284C2.92172 72.5786 3.93913 73 5 73C6.06087 73 7.07828 72.5786 7.82843 71.8284C8.57857 71.0783 9 70.0609 9 69ZM10 69C10 70.3261 9.47322 71.5979 8.53553 72.5355C7.59785 73.4732 6.32608 74 5 74C4.34339 74 3.69321 73.8707 3.08658 73.6194C2.47995 73.3681 1.92876 72.9998 1.46447 72.5355C0.526784 71.5979 0 70.3261 0 69C0 67.6739 0.526784 66.4021 1.46447 65.4645C2.40215 64.5268 3.67392 64 5 64C5.65661 64 6.30679 64.1293 6.91342 64.3806C7.52005 64.6319 8.07124 65.0002 8.53553 65.4645C8.99983 65.9288 9.36812 66.48 9.6194 67.0866C9.87067 67.6932 10 68.3434 10 69ZM4 67.75C4 68.15 3.65 68.5 3.25 68.5C2.85 68.5 2.5 68.15 2.5 67.75C2.5 67.35 2.85 67 3.25 67C3.65 67 4 67.35 4 67.75ZM7.5 67.75C7.5 68.15 7.15 68.5 6.75 68.5C6.35 68.5 6 68.15 6 67.75C6 67.35 6.35 67 6.75 67C7.15 67 7.5 67.35 7.5 67.75ZM5 71.615C4.125 71.615 3.355 71.25 2.905 70.71L3.615 70C3.84 70.36 4.375 70.615 5 70.615C5.625 70.615 6.16 70.36 6.385 70L7.095 70.71C6.645 71.25 5.875 71.615 5 71.615Z" fill="#DCDCDC"/>
-<path d="M66.25 4.5C66.0511 4.5 65.8603 4.42098 65.7197 4.28033C65.579 4.13968 65.5 3.94891 65.5 3.75C65.5 3.55109 65.579 3.36032 65.7197 3.21967C65.8603 3.07902 66.0511 3 66.25 3C66.4489 3 66.6397 3.07902 66.7803 3.21967C66.921 3.36032 67 3.55109 67 3.75C67 3.94891 66.921 4.13968 66.7803 4.28033C66.6397 4.42098 66.4489 4.5 66.25 4.5ZM69.75 4.5C69.5511 4.5 69.3603 4.42098 69.2197 4.28033C69.079 4.13968 69 3.94891 69 3.75C69 3.55109 69.079 3.36032 69.2197 3.21967C69.3603 3.07902 69.5511 3 69.75 3C69.9489 3 70.1397 3.07902 70.2803 3.21967C70.421 3.36032 70.5 3.55109 70.5 3.75C70.5 3.94891 70.421 4.13968 70.2803 4.28033C70.1397 4.42098 69.9489 4.5 69.75 4.5ZM68 9C69.0609 9 70.0783 8.57857 70.8284 7.82843C71.5786 7.07828 72 6.06087 72 5C72 3.93913 71.5786 2.92172 70.8284 2.17157C70.0783 1.42143 69.0609 1 68 1C66.9391 1 65.9217 1.42143 65.1716 2.17157C64.4214 2.92172 64 3.93913 64 5C64 6.06087 64.4214 7.07828 65.1716 7.82843C65.9217 8.57857 66.9391 9 68 9ZM68 0C68.6566 0 69.3068 0.129329 69.9134 0.380602C70.52 0.631876 71.0712 1.00017 71.5355 1.46447C71.9998 1.92876 72.3681 2.47995 72.6194 3.08658C72.8707 3.69321 73 4.34339 73 5C73 6.32608 72.4732 7.59785 71.5355 8.53553C70.5979 9.47322 69.3261 10 68 10C65.235 10 63 7.75 63 5C63 3.67392 63.5268 2.40215 64.4645 1.46447C65.4021 0.526784 66.6739 0 68 0ZM66.5 6H69.5C69.6326 6 69.7598 6.05268 69.8536 6.14645C69.9473 6.24021 70 6.36739 70 6.5C70 6.63261 69.9473 6.75979 69.8536 6.85355C69.7598 6.94732 69.6326 7 69.5 7H66.5C66.3674 7 66.2402 6.94732 66.1464 6.85355C66.0527 6.75979 66 6.63261 66 6.5C66 6.36739 66.0527 6.24021 66.1464 6.14645C66.2402 6.05268 66.3674 6 66.5 6Z" fill="#DCDCDC"/>
-<path d="M130.5 72H131.5V71H130.5V72ZM131 64C130.343 64 129.693 64.1293 129.087 64.3806C128.48 64.6319 127.929 65.0002 127.464 65.4645C126.527 66.4021 126 67.6739 126 69C126 70.3261 126.527 71.5979 127.464 72.5355C127.929 72.9998 128.48 73.3681 129.087 73.6194C129.693 73.8707 130.343 74 131 74C132.326 74 133.598 73.4732 134.536 72.5355C135.473 71.5979 136 70.3261 136 69C136 68.3434 135.871 67.6932 135.619 67.0866C135.368 66.48 135 65.9288 134.536 65.4645C134.071 65.0002 133.52 64.6319 132.913 64.3806C132.307 64.1293 131.657 64 131 64ZM131 73C128.795 73 127 71.205 127 69C127 66.795 128.795 65 131 65C133.205 65 135 66.795 135 69C135 71.205 133.205 73 131 73ZM131 66C130.47 66 129.961 66.2107 129.586 66.5858C129.211 66.9609 129 67.4696 129 68H130C130 67.7348 130.105 67.4804 130.293 67.2929C130.48 67.1054 130.735 67 131 67C131.265 67 131.52 67.1054 131.707 67.2929C131.895 67.4804 132 67.7348 132 68C132 69 130.5 68.875 130.5 70.5H131.5C131.5 69.375 133 69.25 133 68C133 67.4696 132.789 66.9609 132.414 66.5858C132.039 66.2107 131.53 66 131 66Z" fill="#515359"/>
-<g filter="url(#filter1_d)">
-<path d="M116 68C116 41.4903 94.5097 20 68 20C41.4903 20 20 41.4903 20 68" stroke="#E8762B" stroke-width="10" stroke-linecap="round"/>
-</g>
-<path d="M43.6447 52.601H45.0552C45.2068 52.601 45.3303 52.6378 45.4257 52.7115C45.521 52.7852 45.5925 52.8805 45.6402 52.9975L47.8502 58.7305C47.9238 58.9168 47.9932 59.1227 48.0582 59.348C48.1275 59.569 48.1925 59.803 48.2532 60.05C48.3528 59.5517 48.4763 59.1118 48.6237 58.7305L50.8272 52.9975C50.8662 52.8978 50.9355 52.8068 51.0352 52.7245C51.1348 52.6422 51.2583 52.601 51.4057 52.601H52.8162L49.0202 62H47.4407L43.6447 52.601ZM58.1323 62H57.4108C57.2592 62 57.14 61.9783 57.0533 61.935C56.9667 61.8873 56.9017 61.7942 56.8583 61.6555L56.7153 61.181C56.5463 61.3327 56.3795 61.467 56.2148 61.584C56.0545 61.6967 55.8877 61.792 55.7143 61.87C55.541 61.948 55.3568 62.0065 55.1618 62.0455C54.9668 62.0845 54.7502 62.104 54.5118 62.104C54.2302 62.104 53.9702 62.0672 53.7318 61.9935C53.4935 61.9155 53.2877 61.8007 53.1143 61.649C52.9453 61.4973 52.8132 61.3088 52.7178 61.0835C52.6225 60.8582 52.5748 60.596 52.5748 60.297C52.5748 60.0457 52.6398 59.7987 52.7698 59.556C52.9042 59.309 53.1252 59.088 53.4328 58.893C53.7405 58.6937 54.15 58.529 54.6613 58.399C55.1727 58.269 55.8075 58.1953 56.5658 58.178V57.788C56.5658 57.3417 56.4705 57.0123 56.2798 56.8C56.0935 56.5833 55.8205 56.475 55.4608 56.475C55.2008 56.475 54.9842 56.5053 54.8108 56.566C54.6375 56.6267 54.4858 56.696 54.3558 56.774C54.2302 56.8477 54.1132 56.9148 54.0048 56.9755C53.8965 57.0362 53.7773 57.0665 53.6473 57.0665C53.539 57.0665 53.4458 57.0383 53.3678 56.982C53.2898 56.9257 53.227 56.8563 53.1793 56.774L52.8868 56.2605C53.6538 55.5585 54.579 55.2075 55.6623 55.2075C56.0523 55.2075 56.399 55.2725 56.7023 55.4025C57.01 55.5282 57.27 55.7058 57.4823 55.9355C57.6947 56.1608 57.855 56.4317 57.9633 56.748C58.076 57.0643 58.1323 57.411 58.1323 57.788V62ZM55.0123 60.999C55.177 60.999 55.3287 60.9838 55.4673 60.9535C55.606 60.9232 55.736 60.8777 55.8573 60.817C55.983 60.7563 56.1022 60.6827 56.2148 60.596C56.3318 60.505 56.4488 60.3988 56.5658 60.2775V59.153C56.0978 59.1747 55.7057 59.2158 55.3893 59.2765C55.0773 59.3328 54.826 59.4065 54.6353 59.4975C54.4447 59.5885 54.3082 59.6947 54.2258 59.816C54.1478 59.9373 54.1088 60.0695 54.1088 60.2125C54.1088 60.4942 54.1912 60.6957 54.3558 60.817C54.5248 60.9383 54.7437 60.999 55.0123 60.999ZM59.711 62V55.331H60.6535C60.8182 55.331 60.933 55.3613 60.998 55.422C61.063 55.4827 61.1064 55.5867 61.128 55.734L61.2255 56.54C61.4639 56.1283 61.7434 55.8033 62.064 55.565C62.3847 55.3267 62.7444 55.2075 63.143 55.2075C63.4724 55.2075 63.7454 55.2833 63.962 55.435L63.754 56.6375C63.741 56.7155 63.7129 56.7718 63.6695 56.8065C63.6262 56.8368 63.5677 56.852 63.494 56.852C63.429 56.852 63.3402 56.8368 63.2275 56.8065C63.1149 56.7762 62.9654 56.761 62.779 56.761C62.4454 56.761 62.1594 56.8542 61.921 57.0405C61.6827 57.2225 61.4812 57.4912 61.3165 57.8465V62H59.711ZM66.7272 55.331V62H65.1217V55.331H66.7272ZM66.9677 53.3875C66.9677 53.5262 66.9395 53.6562 66.8832 53.7775C66.8268 53.8988 66.751 54.005 66.6557 54.096C66.5647 54.187 66.4563 54.2607 66.3307 54.317C66.205 54.369 66.0707 54.395 65.9277 54.395C65.789 54.395 65.6568 54.369 65.5312 54.317C65.4098 54.2607 65.3037 54.187 65.2127 54.096C65.1217 54.005 65.048 53.8988 64.9917 53.7775C64.9397 53.6562 64.9137 53.5262 64.9137 53.3875C64.9137 53.2445 64.9397 53.1102 64.9917 52.9845C65.048 52.8588 65.1217 52.7505 65.2127 52.6595C65.3037 52.5685 65.4098 52.497 65.5312 52.445C65.6568 52.3887 65.789 52.3605 65.9277 52.3605C66.0707 52.3605 66.205 52.3887 66.3307 52.445C66.4563 52.497 66.5647 52.5685 66.6557 52.6595C66.751 52.7505 66.8268 52.8588 66.8832 52.9845C66.9395 53.1102 66.9677 53.2445 66.9677 53.3875ZM73.773 62H73.0515C72.8998 62 72.7806 61.9783 72.694 61.935C72.6073 61.8873 72.5423 61.7942 72.499 61.6555L72.356 61.181C72.187 61.3327 72.0201 61.467 71.8555 61.584C71.6951 61.6967 71.5283 61.792 71.355 61.87C71.1816 61.948 70.9975 62.0065 70.8025 62.0455C70.6075 62.0845 70.3908 62.104 70.1525 62.104C69.8708 62.104 69.6108 62.0672 69.3725 61.9935C69.1341 61.9155 68.9283 61.8007 68.755 61.649C68.586 61.4973 68.4538 61.3088 68.3585 61.0835C68.2631 60.8582 68.2155 60.596 68.2155 60.297C68.2155 60.0457 68.2805 59.7987 68.4105 59.556C68.5448 59.309 68.7658 59.088 69.0735 58.893C69.3811 58.6937 69.7906 58.529 70.302 58.399C70.8133 58.269 71.4481 58.1953 72.2065 58.178V57.788C72.2065 57.3417 72.1111 57.0123 71.9205 56.8C71.7341 56.5833 71.4611 56.475 71.1015 56.475C70.8415 56.475 70.6248 56.5053 70.4515 56.566C70.2781 56.6267 70.1265 56.696 69.9965 56.774C69.8708 56.8477 69.7538 56.9148 69.6455 56.9755C69.5371 57.0362 69.418 57.0665 69.288 57.0665C69.1796 57.0665 69.0865 57.0383 69.0085 56.982C68.9305 56.9257 68.8676 56.8563 68.82 56.774L68.5275 56.2605C69.2945 55.5585 70.2196 55.2075 71.303 55.2075C71.693 55.2075 72.0396 55.2725 72.343 55.4025C72.6506 55.5282 72.9106 55.7058 73.123 55.9355C73.3353 56.1608 73.4956 56.4317 73.604 56.748C73.7166 57.0643 73.773 57.411 73.773 57.788V62ZM70.653 60.999C70.8176 60.999 70.9693 60.9838 71.108 60.9535C71.2466 60.9232 71.3766 60.8777 71.498 60.817C71.6236 60.7563 71.7428 60.6827 71.8555 60.596C71.9725 60.505 72.0895 60.3988 72.2065 60.2775V59.153C71.7385 59.1747 71.3463 59.2158 71.03 59.2765C70.718 59.3328 70.4666 59.4065 70.276 59.4975C70.0853 59.5885 69.9488 59.6947 69.8665 59.816C69.7885 59.9373 69.7495 60.0695 69.7495 60.2125C69.7495 60.4942 69.8318 60.6957 69.9965 60.817C70.1655 60.9383 70.3843 60.999 70.653 60.999ZM75.3712 62V52.341H76.9767V56.15C77.241 55.8683 77.54 55.6452 77.8737 55.4805C78.2073 55.3115 78.5973 55.227 79.0437 55.227C79.4077 55.227 79.7392 55.3028 80.0382 55.4545C80.3415 55.6018 80.6015 55.8185 80.8182 56.1045C81.0392 56.3905 81.2082 56.7437 81.3252 57.164C81.4465 57.5843 81.5072 58.0675 81.5072 58.6135C81.5072 59.1118 81.44 59.5733 81.3057 59.998C81.1713 60.4227 80.9785 60.791 80.7272 61.103C80.4802 61.415 80.179 61.6598 79.8237 61.8375C79.4727 62.0108 79.0783 62.0975 78.6407 62.0975C78.437 62.0975 78.2507 62.0758 78.0817 62.0325C77.9127 61.9935 77.7588 61.9372 77.6202 61.8635C77.4815 61.7898 77.3515 61.701 77.2302 61.597C77.1132 61.4887 77.0005 61.3695 76.8922 61.2395L76.8207 61.688C76.7947 61.8007 76.7492 61.8808 76.6842 61.9285C76.6235 61.9762 76.539 62 76.4307 62H75.3712ZM78.4912 56.475C78.1575 56.475 77.8715 56.5465 77.6332 56.6895C77.3992 56.8282 77.1803 57.0253 76.9767 57.281V60.271C77.1587 60.4963 77.3558 60.6545 77.5682 60.7455C77.7848 60.8322 78.0188 60.8755 78.2702 60.8755C78.5128 60.8755 78.7317 60.83 78.9267 60.739C79.1217 60.648 79.2863 60.5093 79.4207 60.323C79.5593 60.1367 79.6655 59.9027 79.7392 59.621C79.8128 59.335 79.8497 58.9992 79.8497 58.6135C79.8497 58.2235 79.8172 57.8942 79.7522 57.6255C79.6915 57.3525 79.6027 57.1315 79.4857 56.9625C79.3687 56.7935 79.2257 56.67 79.0567 56.592C78.892 56.514 78.7035 56.475 78.4912 56.475ZM84.4752 52.341V62H82.8697V52.341H84.4752ZM89.051 55.227C89.4713 55.227 89.857 55.2942 90.208 55.4285C90.5633 55.5628 90.8688 55.76 91.1245 56.02C91.3802 56.2757 91.5795 56.592 91.7225 56.969C91.8655 57.3417 91.937 57.7685 91.937 58.2495C91.937 58.3708 91.9305 58.4727 91.9175 58.555C91.9088 58.633 91.8893 58.6958 91.859 58.7435C91.833 58.7868 91.7962 58.8193 91.7485 58.841C91.7008 58.8583 91.6402 58.867 91.5665 58.867H87.4455C87.4932 59.5517 87.6773 60.0543 87.998 60.375C88.3187 60.6957 88.7433 60.856 89.272 60.856C89.532 60.856 89.7552 60.8257 89.9415 60.765C90.1322 60.7043 90.2968 60.6372 90.4355 60.5635C90.5785 60.4898 90.702 60.4227 90.806 60.362C90.9143 60.3013 91.0183 60.271 91.118 60.271C91.183 60.271 91.2393 60.284 91.287 60.31C91.3347 60.336 91.3758 60.3728 91.4105 60.4205L91.8785 61.0055C91.7008 61.2135 91.5015 61.389 91.2805 61.532C91.0595 61.6707 90.8277 61.7833 90.585 61.87C90.3467 61.9523 90.1018 62.0108 89.8505 62.0455C89.6035 62.0802 89.363 62.0975 89.129 62.0975C88.6653 62.0975 88.2342 62.0217 87.8355 61.87C87.4368 61.714 87.0902 61.4865 86.7955 61.1875C86.5008 60.8842 86.269 60.5115 86.1 60.0695C85.931 59.6232 85.8465 59.1075 85.8465 58.5225C85.8465 58.0675 85.9202 57.6407 86.0675 57.242C86.2148 56.839 86.425 56.4902 86.698 56.1955C86.9753 55.8965 87.3112 55.6603 87.7055 55.487C88.1042 55.3137 88.5527 55.227 89.051 55.227ZM89.0835 56.3775C88.6155 56.3775 88.2493 56.5097 87.985 56.774C87.7207 57.0383 87.5517 57.4132 87.478 57.8985H90.494C90.494 57.6905 90.4658 57.4955 90.4095 57.3135C90.3532 57.1272 90.2665 56.9647 90.1495 56.826C90.0325 56.6873 89.8852 56.579 89.7075 56.501C89.5298 56.4187 89.3218 56.3775 89.0835 56.3775Z" fill="#515359"/>
-<defs>
-<filter id="filter0_i" x="15" y="15" width="106" height="62" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="4"/>
-<feGaussianBlur stdDeviation="2"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow"/>
-</filter>
-<filter id="filter1_d" x="14" y="14" width="108" height="60" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="0.5"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/src/lib/containers/download_list_v2/DownloadCartPage.tsx b/src/lib/containers/download_list_v2/DownloadCartPage.tsx
index cc8812eada..eab1d0fb51 100644
--- a/src/lib/containers/download_list_v2/DownloadCartPage.tsx
+++ b/src/lib/containers/download_list_v2/DownloadCartPage.tsx
@@ -28,6 +28,8 @@ export const DownloadCartPage:React.FunctionComponent<DownloadCartPageProps> = (
   } = useGetDownloadListStatistics()
   useEffect(() => {
     if (isError && newError) {
+      console.error('!!! There was an error while getting the DL stats in DownloadCartPage')
+      console.error(newError)
       handleError(toError(newError))
     }
   }, [isError, newError, handleError])
@@ -108,7 +110,7 @@ export const DownloadCartPage:React.FunctionComponent<DownloadCartPageProps> = (
                 <div className="container">
                   <div className="subSectionContainer">
                     <span className="subSectionTitle">Complete Your Download</span>
-                    <DownloadListStats />
+                    <DownloadListStats numBytes={data.sumOfFileSizesAvailableForDownload} numFiles={data.numberOfFilesAvailableForDownload}/>
                   </div>
                   <p className="description">Downloading your files programmatically is the quickest and most efficient way to get all of your files, 
                   both internal and externally hosted. Metadata will always be included in your download automatically when downloading programmatically. 
diff --git a/src/lib/containers/download_list_v2/DownloadListStats.tsx b/src/lib/containers/download_list_v2/DownloadListStats.tsx
index 91857ec7bf..417900fd68 100644
--- a/src/lib/containers/download_list_v2/DownloadListStats.tsx
+++ b/src/lib/containers/download_list_v2/DownloadListStats.tsx
@@ -1,43 +1,24 @@
-import React, { useEffect } from 'react'
-import { useErrorHandler } from 'react-error-boundary'
-import { toError } from '../../utils/ErrorUtils'
-import { SynapseSpinner } from '../LoadingScreen'
-import { useGetDownloadListStatistics } from '../../utils/hooks/SynapseAPI/useGetDownloadListStatistics'
+import React from 'react'
 import DownloadDetails from './DownloadDetails'
 
-export default function DownloadListStats() {
-  const handleError = useErrorHandler()
-  const {
-    data,
-    isFetching,
-    isError,
-    error: newError,
-  } = useGetDownloadListStatistics()
-  useEffect(() => {
-    if (isError && newError) {
-      handleError(toError(newError))
-    }
-  }, [isError, newError, handleError])
+export type DownloadListStatsProps = {
+  numFiles: number
+  numBytes: number
+}
 
+export default function DownloadListStats(props: DownloadListStatsProps) {
+  const { numFiles, numBytes } = props
+  
   return (
-    <>
-      {!isError && !isFetching && data && (
-        <div>
-            <DownloadDetails
-              numFiles={data.numberOfFilesAvailableForDownload}
-              numBytes={data.sumOfFileSizesAvailableForDownload}
-            ></DownloadDetails>
-          {
-          // also have access to fileStats.numberOfFilesRequiringAction 
-          // and fileStats.totalNumberOfFiles
-          }
-        </div>
-      )}
-      {isFetching && (
-        <div className="placeholder">
-          <SynapseSpinner size={30} />
-        </div>
-      )}
-    </>
+    <div>
+        <DownloadDetails
+          numFiles={numFiles}
+          numBytes={numBytes}
+        ></DownloadDetails>
+      {
+      // also have access to fileStats.numberOfFilesRequiringAction 
+      // and fileStats.totalNumberOfFiles
+      }
+    </div>
   )
 }
diff --git a/src/lib/containers/download_list_v2/DownloadListTable.tsx b/src/lib/containers/download_list_v2/DownloadListTable.tsx
index 185e24605f..5b6f0c56f7 100644
--- a/src/lib/containers/download_list_v2/DownloadListTable.tsx
+++ b/src/lib/containers/download_list_v2/DownloadListTable.tsx
@@ -41,6 +41,9 @@ export default function DownloadListTable() {
 
   useEffect(() => {
     if (isError && newError) {
+      console.error('!!! There was an error while getting Available Files to download')
+      console.error(newError)
+      
       handleError(toError(newError))
     }
   }, [isError, newError, handleError])
diff --git a/src/lib/containers/download_list_v2/ShowDownloadV2.tsx b/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
index 44b6e8d87a..624daae389 100644
--- a/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
+++ b/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
@@ -1,5 +1,4 @@
 import React, {useEffect} from 'react'
-import { Link, withRouter, RouteComponentProps } from 'react-router-dom'
 import ReactTooltip from 'react-tooltip'
 import { TOOLTIP_DELAY_SHOW } from '../table/SynapseTableConstants'
 import { useSynapseContext } from '../../utils/SynapseContext'
@@ -17,7 +16,7 @@ export type ShowDownloadV2Props = {
  * Nav bar item, displayed when files have been added to the Download Cart.
  * This must be configured with the URL of a page dedicated to showing the Download Cart.
  */
-function ShowDownloadV2({ to }: ShowDownloadV2Props & RouteComponentProps) {
+function ShowDownloadV2({ to }: ShowDownloadV2Props) {
   const { accessToken } = useSynapseContext()
   const handleError = useErrorHandler()
   const idForToolTip = 'SHOW_DOWNLOAD_TOOLTIP'
@@ -67,11 +66,10 @@ function ShowDownloadV2({ to }: ShowDownloadV2Props & RouteComponentProps) {
       />
     </>
   )
-
-  return <Link className="Download-Link v2" to={to}>
+  return <a className="Download-Link v2" href={to} rel="noopener noreferrer">
       {content}
-    </Link>
+    </a>
   
 }
 
-export default withRouter(ShowDownloadV2)
+export default ShowDownloadV2
diff --git a/src/lib/containers/row_renderers/utils/Icon.tsx b/src/lib/containers/row_renderers/utils/Icon.tsx
index 8d9bb1f29d..a36d53b4be 100644
--- a/src/lib/containers/row_renderers/utils/Icon.tsx
+++ b/src/lib/containers/row_renderers/utils/Icon.tsx
@@ -47,9 +47,6 @@ import personSvg from '../../../assets/icons/person.svg'
 import mouseSvg from '../../../assets/icons/mouse.svg'
 import chart2Svg from '../../../assets/icons/chart2.svg'
 import fileSvg from '../../../assets/icons/file.svg'
-import easySvg from '../../../assets/icons/download_list/easy.svg'
-import mediumSvg from '../../../assets/icons/download_list/medium.svg'
-import variableSvg from '../../../assets/icons/download_list/variable.svg'
 
 import {
   Project,
@@ -121,9 +118,9 @@ const defaultIcons = {
   [CHART2]: chart2Svg,
   [FILE]: fileSvg,
   [EXTERNALLINK]: ExternalLink,
-  [EASY_DIFFICULTY]: easySvg,
-  [MEDIUM_DIFFICULTY]: mediumSvg,
-  [VARIABLE_DIFFICULTY]: variableSvg,
+  [EASY_DIFFICULTY]: 'https://s3.amazonaws.com/static.synapse.org/images/easy.svg',
+  [MEDIUM_DIFFICULTY]: 'https://s3.amazonaws.com/static.synapse.org/images/medium.svg',
+  [VARIABLE_DIFFICULTY]: 'https://s3.amazonaws.com/static.synapse.org/images/variable.svg',
 }
 const Icon: React.FunctionComponent<IconProps> = ({
   type,
diff --git a/src/lib/style/components/_download-cart-page.scss b/src/lib/style/components/_download-cart-page.scss
index 1c163083b5..96377585a2 100644
--- a/src/lib/style/components/_download-cart-page.scss
+++ b/src/lib/style/components/_download-cart-page.scss
@@ -2,7 +2,7 @@
 @use '../abstracts/mixins' as SrcMixins;
 
 .DownloadCartPage {
-  padding-top: 60px;
+  padding: 60px 0px;
   .description {
     max-width: 700px;
     padding-top: 10px;

From 49a367dc6d6c45bedd2b2853bd752e58b9ee188c Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Thu, 24 Jun 2021 12:08:18 -0700
Subject: [PATCH 08/11] style fixes from integration into SWC

---
 src/lib/containers/download_list_v2/ShowDownloadV2.tsx | 6 +++---
 src/lib/style/components/_download-list-v2.scss        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/containers/download_list_v2/ShowDownloadV2.tsx b/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
index 624daae389..e83fd25819 100644
--- a/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
+++ b/src/lib/containers/download_list_v2/ShowDownloadV2.tsx
@@ -21,7 +21,7 @@ function ShowDownloadV2({ to }: ShowDownloadV2Props) {
   const handleError = useErrorHandler()
   const idForToolTip = 'SHOW_DOWNLOAD_TOOLTIP'
   const tooltipText = 'Click to view items in your download cart.'
-
+  
   const {
     data,
     isFetching,
@@ -30,10 +30,10 @@ function ShowDownloadV2({ to }: ShowDownloadV2Props) {
   } = useGetDownloadListStatistics()
   
   useEffect(() => {
-    if (isError && newError) {
+    if (isError && newError && accessToken) {
       handleError(toError(newError))
     }
-  }, [isError, newError, handleError])
+  }, [isError, newError, handleError, accessToken])
 
   const isInExperimentalMode = isInSynapseExperimentalMode()
   if (!accessToken || isFetching || !isInExperimentalMode) {
diff --git a/src/lib/style/components/_download-list-v2.scss b/src/lib/style/components/_download-list-v2.scss
index 7ab9f60b29..9b646cfd89 100644
--- a/src/lib/style/components/_download-list-v2.scss
+++ b/src/lib/style/components/_download-list-v2.scss
@@ -39,7 +39,7 @@
       background-color: SRC.$secondary-action-color;
       text-align: center;
       position: absolute;
-      height: 18px;
+      height: 21px;
       color: white;
       border-radius: 8px;
       top: -12px;

From 8f982304726ea01c742b5bab1d4da1f9e2e82468 Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Thu, 24 Jun 2021 14:54:15 -0700
Subject: [PATCH 09/11] export DownloadConfirmation component to be used in SWC

---
 src/lib/rollup.index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/rollup.index.ts b/src/lib/rollup.index.ts
index 62f85556aa..d3ae87b770 100644
--- a/src/lib/rollup.index.ts
+++ b/src/lib/rollup.index.ts
@@ -20,6 +20,7 @@ import { EvaluationEditorPage } from './containers/evaluation_queues/EvaluationE
 import { EntityFinder } from './containers/entity_finder/EntityFinder'
 import ErrorPage from './containers/ErrorPage'
 import ShowDownloadV2 from './containers/download_list_v2/ShowDownloadV2'
+import { DownloadConfirmation } from './containers/download_list/DownloadConfirmation'
 import {
   SynapseContextProvider,
   SynapseContextConsumer,
@@ -52,6 +53,7 @@ const SynapseComponents = {
   ErrorPage,
   DownloadCartPage,
   ShowDownloadV2,
+  DownloadConfirmation
 }
 
 export { SynapseComponents, SynapseConstants, SynapseClient, SynapseContext }

From 332b669d80bb52ff6c06c9be37c1cdd73383179a Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Thu, 24 Jun 2021 17:57:12 -0700
Subject: [PATCH 10/11] working DownloadConfirmation component for both use
 cases (from container or from query)

---
 .../download_list/DownloadConfirmation.tsx    | 135 +++++++++++-------
 src/lib/utils/SynapseClient.ts                |   9 +-
 .../AddFilesToDownloadListRequest.ts          |   2 +-
 src/lib/utils/synapseTypes/EntityChildren.ts  |   2 +-
 4 files changed, 89 insertions(+), 59 deletions(-)

diff --git a/src/lib/containers/download_list/DownloadConfirmation.tsx b/src/lib/containers/download_list/DownloadConfirmation.tsx
index 07643ba9c2..50cade0d28 100644
--- a/src/lib/containers/download_list/DownloadConfirmation.tsx
+++ b/src/lib/containers/download_list/DownloadConfirmation.tsx
@@ -1,10 +1,10 @@
 import moment from 'moment'
-import React, { useState } from 'react'
+import React, { useState, useEffect, useCallback } from 'react'
 import { SynapseClient, SynapseConstants } from '../../utils'
 import { testDownloadSpeed } from '../../utils/functions/testDownloadSpeed'
 import {
   AddFilesToDownloadListRequest,
-  Query,
+  EntityType,
   QueryBundleRequest,
 } from '../../utils/synapseTypes/'
 import DownloadDetails from './DownloadDetails'
@@ -19,6 +19,8 @@ import {
 import SignInButton from '../SignInButton'
 import { Alert } from 'react-bootstrap'
 import { useSynapseContext } from '../../utils/SynapseContext'
+import { AddToDownloadListRequest } from '../../utils/synapseTypes/DownloadListV2/AddToDownloadListRequest'
+import { useGetEntityChildren } from '../../utils/hooks/SynapseAPI/useGetEntityChildren'
 
 enum StatusEnum {
   LOADING_INFO,
@@ -33,12 +35,18 @@ export type DownloadConfirmationState = {
   fileCount: number
   fileSize: number
   downloadEstimate?: string
-  status: StatusEnum
   errorMessage?: string
 }
+
+type QueryOrFolder = {
+  queryBundleRequest?:QueryBundleRequest
+  folderId?: string
+}
+
 export type DownloadConfirmationProps = {
   fnClose?: () => void
   getLastQueryRequest?: () => QueryBundleRequest
+  folderId?: string
   topLevelControlsState?: TopLevelControlsState
   updateParentState?: <K extends keyof QueryWrapperState>(
     param: Pick<QueryWrapperState, K>,
@@ -49,24 +57,32 @@ export type DownloadConfirmationProps = {
 
 // add files to download list
 async function addToDownload(
-  query: Query,
   token: string,
+  queryBundleRequest?: QueryBundleRequest,
+  folderId?: string,
 ): Promise<[StatusEnum, string]> {
   try {
     if (!SynapseClient.isInSynapseExperimentalMode()) {
       const req: AddFilesToDownloadListRequest = {
         concreteType:
           'org.sagebionetworks.repo.model.file.AddFileToDownloadListRequest',
-        query: query,
+        query: queryBundleRequest?.query,
+        folderId: folderId,
       }
       await SynapseClient.addFilesToDownloadList(req, token)
     } else {
-      await SynapseClient.addFilesToDownloadListV2(query, token)
+      const req:AddToDownloadListRequest = {
+        query: queryBundleRequest?.query,
+        concreteType: 'org.sagebionetworks.repo.model.download.AddToDownloadListRequest',
+        parentId: folderId,
+      }
+      await SynapseClient.addFilesToDownloadListV2(req, token)
     }
     return [StatusEnum.SUCCESS, '']
   } catch (error) {
     return [StatusEnum.ERROR, error.reason]
   }
+  
 }
 
 type UiStateDictionary = {
@@ -123,6 +139,7 @@ const StatusConstruct: UiStateDictionary = {
 
 export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationProps> = ({
   getLastQueryRequest,
+  folderId,
   fnClose,
   updateParentState,
   topLevelControlsState,
@@ -131,57 +148,77 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
 }) => {
   const { accessToken } = useSynapseContext()
   const { showDownloadConfirmation = true } = topLevelControlsState ?? {}
+  const [status, setStatus] = useState<StatusEnum>(accessToken ? StatusEnum.LOADING_INFO : StatusEnum.SIGNED_OUT)
   const [state, setState] = useState<DownloadConfirmationState>({
     fileCount: 0,
-    fileSize: 0,
-    status: accessToken ? StatusEnum.LOADING_INFO : StatusEnum.SIGNED_OUT,
+    fileSize: 0
   })
+  const [queryOrFolder] = useState<QueryOrFolder>({
+    queryBundleRequest: getLastQueryRequest!(),
+    folderId: folderId
+  }) // useDeepCompareEffect() throws an error if you only pass primitives, which is the case when queryBundleRequest 
+     // is not defined (configured for a container)
   const [showDownloadList, setShowDownloadList] = useState(false)
-  const queryBundleRequest = getLastQueryRequest!()
+  
+  const updateStats = useCallback(async (count?: number, bytes?: number) => {
+    if (accessToken) {
+      const estimatedDownloadBytesPerSecond = await testDownloadSpeed(accessToken)
+      const size = bytes ?? 0
+      const fileCount = count ?? 0
+      const durationSeconds = size / estimatedDownloadBytesPerSecond
+      const duration = moment.duration(durationSeconds, 'seconds').humanize()
+      setStatus(StatusEnum.INFO)
+      setState({
+        fileCount: fileCount,
+        fileSize: size,
+        downloadEstimate: duration,
+      })
+    }
+  }, [accessToken])
+
+  const {
+    data,
+    isSuccess
+  } = useGetEntityChildren (
+    {
+      parentId: queryOrFolder.folderId,
+      includeSumFileSizes: true,
+      includeTotalChildCount: true,
+      includeTypes: [EntityType.FILE]
+    }
+  )
+  useEffect(() => {
+    if (isSuccess && data) {
+      updateStats(data.totalChildCount, data.sumFileSizesBytes)
+    }
+  }, [updateStats, queryOrFolder, isSuccess, data])
 
-  const getFilesInformation = async (
-    queryBundleRequest: QueryBundleRequest,
+  const getFilesInformation = useCallback(async (
     token: string,
   ) => {
-    setState({
-      ...state,
-      status: StatusEnum.LOADING_INFO,
-    })
+    setStatus(StatusEnum.LOADING_INFO)
 
     const partMask =
-      SynapseConstants.BUNDLE_MASK_QUERY_COUNT |
-      SynapseConstants.BUNDLE_MASK_SUM_FILES_SIZE_BYTES
+    SynapseConstants.BUNDLE_MASK_QUERY_COUNT |
+    SynapseConstants.BUNDLE_MASK_SUM_FILES_SIZE_BYTES
 
     const queryBundleRequestSizeInformation: QueryBundleRequest = {
-      ...queryBundleRequest,
+      ...queryOrFolder.queryBundleRequest!,
       partMask,
     }
-
-    const {
-      queryCount,
-      sumFileSizes,
-    } = await SynapseClient.getQueryTableResults(
+    const {queryCount, sumFileSizes} = await SynapseClient.getQueryTableResults(
       queryBundleRequestSizeInformation,
       token,
     )
-    const estimatedDownloadBytesPerSecond = await testDownloadSpeed(token)
-    const size = sumFileSizes ? sumFileSizes['sumFileSizesBytes'] : 0
-    const durationSeconds = size / estimatedDownloadBytesPerSecond
-    const duration = moment.duration(durationSeconds, 'seconds').humanize()
-    setState({
-      fileCount: queryCount || 0,
-      fileSize: size,
-      downloadEstimate: duration,
-      status: StatusEnum.INFO,
-    })
-  }
+    updateStats(queryCount, sumFileSizes?.sumFileSizesBytes)
+  }, [queryOrFolder, setStatus, updateStats])
 
   // UseEffect memoization only works for arguments where a direct === comparison can be made
   // This fails drastically with the queryBundleRequest object which is a complex object of many fields that
   // change, we could use a custom comparitor but this also introduces risk
   useDeepCompareEffect(() => {
-    accessToken && getFilesInformation(queryBundleRequest, accessToken!)
-  }, [queryBundleRequest, accessToken])
+    accessToken && queryOrFolder.queryBundleRequest && getFilesInformation(accessToken)
+  }, [getFilesInformation, queryOrFolder, accessToken])
 
   const onCancel = fnClose
     ? () => fnClose()
@@ -196,22 +233,20 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
 
   const triggerAddToDownload = async () => {
     if (!accessToken) {
-      setState({ ...state, status: StatusEnum.SIGNED_OUT })
+      setStatus(StatusEnum.SIGNED_OUT)
     } else {
-      setState({ ...state, status: StatusEnum.PROCESSING })
-      const result = await addToDownload(queryBundleRequest.query, accessToken)
-      const status = result[0]
-
-      if (status === StatusEnum.SUCCESS) {
-        setState({ ...state, status })
-      } else {
-        setState({ ...state, errorMessage: result[1], status })
+      setStatus(StatusEnum.PROCESSING)
+      const result = await addToDownload(accessToken, queryOrFolder.queryBundleRequest, queryOrFolder.folderId)
+      const newStatus = result[0]
+      setStatus(newStatus)
+      if (newStatus !== StatusEnum.SUCCESS) {
+        setState({ ...state, errorMessage: result[1] })
       }
     }
   }
 
   const getContent = (
-    { status, fileCount, fileSize, errorMessage }: DownloadConfirmationState,
+    { fileCount, fileSize, errorMessage }: DownloadConfirmationState,
   ): JSX.Element => {
     switch (status) {
       case StatusEnum.LOADING_INFO:
@@ -284,7 +319,7 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
         variant={'info'}
         transition={false}
         className={`download-confirmation ${
-          StatusConstruct[state.status].className
+          StatusConstruct[status].className
         } ${showDownloadConfirmation ? '' : 'hidden'}
           ${
             showFacetFilter
@@ -295,13 +330,13 @@ export const DownloadConfirmation: React.FunctionComponent<DownloadConfirmationP
       >
         <div>{getContent(state)}</div>
         <div className="download-confirmation-action">
-          {state.status !== StatusEnum.PROCESSING && (
+          {status !== StatusEnum.PROCESSING && (
             <button className="btn btn-link" onClick={onCancel}>
-              {StatusConstruct[state.status].closeText}
+              {StatusConstruct[status].closeText}
             </button>
           )}
 
-          {state.status === StatusEnum.INFO && (
+          {status === StatusEnum.INFO && (
             <button
               type="button"
               className="btn btn-primary"
diff --git a/src/lib/utils/SynapseClient.ts b/src/lib/utils/SynapseClient.ts
index 0e71f3b7ad..1bfa418edf 100644
--- a/src/lib/utils/SynapseClient.ts
+++ b/src/lib/utils/SynapseClient.ts
@@ -68,7 +68,6 @@ import {
   EntityBundleRequest,
   EntityBundle,
   ACTSubmissionStatus,
-  Query,
 } from './synapseTypes/'
 import UniversalCookies from 'universal-cookie'
 import { dispatchDownloadListChangeEvent } from './functions/dispatchDownloadListChangeEvent'
@@ -1678,17 +1677,13 @@ export const addFileToDownloadListV2 = (
  * Start an asynchronous job to add files to a user's download list from either a view query or a folder. Use GET /download/list/add/async/get/{asyncToken} to get both the job status and job results.
  */
  export const addFilesToDownloadListV2 = async (
-  query: Query,
+  request: AddToDownloadListRequest,
   accessToken: string | undefined = undefined,
   updateParentState?: any,
 ): Promise<AddToDownloadListResponse> => {
-  const req:AddToDownloadListRequest = {
-    query,
-    concreteType: 'org.sagebionetworks.repo.model.download.AddToDownloadListRequest',
-  }
   return doPost<AsyncJobId>(
     '/repo/v1//download/list/add/async/start',
-    req,
+    request,
     accessToken,
     undefined,
     BackendDestinationEnum.REPO_ENDPOINT,
diff --git a/src/lib/utils/synapseTypes/AddFilesToDownloadListRequest.ts b/src/lib/utils/synapseTypes/AddFilesToDownloadListRequest.ts
index 0f0ad2c5eb..af40890b34 100644
--- a/src/lib/utils/synapseTypes/AddFilesToDownloadListRequest.ts
+++ b/src/lib/utils/synapseTypes/AddFilesToDownloadListRequest.ts
@@ -5,5 +5,5 @@ export type AddFilesToDownloadListRequest = {
   concreteType: 'org.sagebionetworks.repo.model.file.AddFileToDownloadListRequest'
   //from the docs: The ID of the folder containing the files to add to the user's download list. Note: Only the files in this folder will be added to the download list, files in sub-folders will not be added. Should be null if setting a 'query'.
   folderId?: string | null
-  query: Query
+  query?: Query
 }
diff --git a/src/lib/utils/synapseTypes/EntityChildren.ts b/src/lib/utils/synapseTypes/EntityChildren.ts
index c472319a99..46ea0672ee 100644
--- a/src/lib/utils/synapseTypes/EntityChildren.ts
+++ b/src/lib/utils/synapseTypes/EntityChildren.ts
@@ -16,7 +16,7 @@ export enum Direction {
 
 // https://rest-docs.synapse.org/rest/org/sagebionetworks/repo/model/EntityChildrenRequest.html
 export type EntityChildrenRequest = {
-  parentId: string
+  parentId?: string
   nextPageToken?: string | null
   includeTypes: Array<EntityType>
   sortBy?: SortBy

From 6059e69c80d3259fe871518a0304247ff52787e2 Mon Sep 17 00:00:00 2001
From: Jay Hodgson <jay.hodgson@sagebase.org>
Date: Fri, 25 Jun 2021 11:39:46 -0700
Subject: [PATCH 11/11] bump SRC to 2.0.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 820abe4347..77bce3f668 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "synapse-react-client",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "private": false,
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",