Update to new stems modal (#16)

* Update modal * Update stems
AudiusProject · Dec 15, 2020 · 17ebdb1 · 17ebdb1
1 parent fcd4a41
commit 17ebdb1
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 97 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@audius/libs": "^1.1.1",
-    "@audius/stems": "^0.2.5",
+    "@audius/libs": "1.1.0",
+    "@audius/stems": "^0.3.1",
     "@reduxjs/toolkit": "^1.4.0",
     "chart.js": "^2.9.3",
     "clsx": "^1.1.1",

diff --git a/src/components/Button/Button.module.css b/src/components/Button/Button.module.css
@@ -92,6 +92,7 @@
 }
 
 .btnContainer .redText {
+  color: var(--static-white) !important;
 }
 
 /* GREEN */
@@ -131,6 +132,10 @@
   cursor: default;
 }
 
+.btnContainer .greenText {
+  color: var(--static-white) !important;
+}
+
 
 /* Disabled */
 .btnContainer .isDisabled {

diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
@@ -4,7 +4,6 @@ import clsx from 'clsx'
 import AppBar from 'components/AppBar'
 import Nav from 'components/Nav'
 import { useInit } from 'store/cache/protocol/hooks'
-import { useModalCount } from 'store/modal/hooks'
 import { useIsMobile } from 'utils/hooks'
 import { IconKebabHorizontal } from '@audius/stems'
 
@@ -21,7 +20,6 @@ interface HeaderProps {
 
 const Header: React.FC<HeaderProps> = ({ className }) => {
   useInit()
-  useModalCount()
   const isMobile = useIsMobile()
   const [showMobileNav, setShowMobileNav] = useState(false)
 

diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx
@@ -1,7 +1,6 @@
 import React, { ReactNode } from 'react'
 import clsx from 'clsx'
 import styles from './Modal.module.css'
-import { useModalScrollCount } from 'store/modal/hooks'
 
 import { IconRemove, Modal as StemsModal } from '@audius/stems'
 
@@ -29,17 +28,13 @@ const Modal: React.FC<ModalProps> = ({
   onClose,
   children
 }) => {
-  const { incrementScrollCount, decrementScrollCount } = useModalScrollCount()
-
   return (
     <StemsModal
       wrapperClassName={clsx(styles.container, {
         [wrapperClassName!]: !!wrapperClassName
       })}
       bodyClassName={clsx(styles.bodyClassName, { [className!]: !!className })}
       dismissOnClickOutside={dismissOnClickOutside}
-      incrementScrollCount={incrementScrollCount}
-      decrementScrollCount={decrementScrollCount}
       onClose={onClose}
       isOpen={isOpen}
     >

diff --git a/src/store/index.ts b/src/store/index.ts
@@ -20,7 +20,6 @@ import claims from 'store/cache/claims/slice'
 import analytics from 'store/cache/analytics/slice'
 import music from 'store/cache/music/slice'
 import account from 'store/account/slice'
-import modal from 'store/modal/slice'
 import pageHistory from 'store/pageHistory/slice'
 
 declare global {
@@ -38,7 +37,6 @@ const getReducer = (history: History) => {
     router: connectRouter(history),
     pageHistory,
     account,
-    modal,
     cache: combineReducers({
       discoveryProvider,
       contentNode,

diff --git a/src/store/modal/hooks.ts b/src/store/modal/hooks.ts
diff --git a/src/store/modal/slice.ts b/src/store/modal/slice.ts
diff --git a/src/store/types.ts b/src/store/types.ts
@@ -7,7 +7,6 @@ import { State as AccountState } from 'store/account/slice'
 import { State as ProposalsState } from 'store/cache/proposals/slice'
 import { State as VotesState } from 'store/cache/votes/slice'
 import { State as TimelineState } from 'store/cache/timeline/slice'
-import { State as ModalState } from 'store/modal/slice'
 import { State as PageHistoryState } from 'store/pageHistory/slice'
 import { State as ClaimsState } from 'store/cache/claims/slice'
 import { State as AnalyticsState } from 'store/cache/analytics/slice'
@@ -17,7 +16,6 @@ export type AppState = {
   router: RouterState
   pageHistory: PageHistoryState
   account: AccountState
-  modal: ModalState
   cache: {
     discoveryProvider: DiscoveryProviderState
     contentNode: ContentNodeState