diff --git a/jam-ui/src/components/jamtracks/JKJamTrackTrack.js b/jam-ui/src/components/jamtracks/JKJamTrackTrack.js
index 879a546b9..f3188c1e2 100644
--- a/jam-ui/src/components/jamtracks/JKJamTrackTrack.js
+++ b/jam-ui/src/components/jamtracks/JKJamTrackTrack.js
@@ -7,6 +7,7 @@ import { Spinner } from 'reactstrap';
import PropTypes from 'prop-types';
import playIcon from '../../assets/img/icons/play-icon.svg';
import pauseIcon from '../../assets/img/icons/pause-icon.svg';
+import { useJamTrack } from '../../hooks/useJamTrack';
const JKJamTrackTrack = ({ track }) => {
const [isPlaying, setIsPlaying] = useState(false);
@@ -16,6 +17,8 @@ const JKJamTrackTrack = ({ track }) => {
const [trackSound, setTrackSound] = useState(null);
const { currentPlayTrackId, setCurrentPlayTrackId } = useJamTrackPreview();
+ const { trackName } = useJamTrack();
+
useEffect(() => {
if (!track) {
return;
@@ -124,7 +127,7 @@ const JKJamTrackTrack = ({ track }) => {
- {trackInfo.instrumentDescription} {trackInfo.part}
+ {trackName(track)}
{isLoading && (
diff --git a/jam-ui/src/components/shopping-cart/checkout/CheckoutAside.js b/jam-ui/src/components/shopping-cart/checkout/CheckoutAside.js
index 4c0a8eaf1..934938f18 100644
--- a/jam-ui/src/components/shopping-cart/checkout/CheckoutAside.js
+++ b/jam-ui/src/components/shopping-cart/checkout/CheckoutAside.js
@@ -32,7 +32,7 @@ const CheckoutAside = () => {
return (
|
- { shoppingCartItem.product_info.sale_display }
+ { shoppingCartItem.product_info.sale_display.replace(/- FULL/, "") }
|
{currency}
diff --git a/jam-ui/src/hooks/useJamTrack.js b/jam-ui/src/hooks/useJamTrack.js
index d9cc9594c..26552ee4f 100644
--- a/jam-ui/src/hooks/useJamTrack.js
+++ b/jam-ui/src/hooks/useJamTrack.js
@@ -52,17 +52,17 @@ export const useJamTrack = () => {
};
const createMixdown = (options) => {
- console.log('*_DEBUG_ createNewMixdown', options);
+ //console.log('*_DEBUG_ createNewMixdown', options);
dispatch(createMyMixdown(options));
};
const enqueueMixdownForSigning = (options) => {
- console.log('*_DEBUG_ enqueueMixdownForSigning', options);
+ //console.log('*_DEBUG_ enqueueMixdownForSigning', options);
dispatch(enqueueMyMixdown(options));
};
const showEstimatedTime = () => {
- console.log('*_DEBUG_ showEstimatedTime enqueuedMixdown', enqueuedMixdown);
+ //console.log('*_DEBUG_ showEstimatedTime enqueuedMixdown', enqueuedMixdown);
if(!enqueuedMixdown || !enqueuedMixdown.packages || enqueuedMixdown.packages.length === 0) {
return;
}
@@ -229,9 +229,11 @@ export const useJamTrack = () => {
}
const trackName = track => {
- if (track.track_type === 'Track' || track.track_type === 'Click') {
+ if (track.track_type === 'Track' || track.track_type === 'Click' || track.track_type === 'Master') {
if (track.track_type === 'Click') {
return 'Clicktrack';
+ } else if (track.track_type === 'Master') {
+ return 'Master Mix';
} else if (track.instrument) {
const instrumentDescription = track.instrument.description;
const instrumentDescriptionParts = instrumentDescription.split(' ');
|