Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STUD-375: Reactor client config flags with launch darkly feature flags #798

Merged
merged 2 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed apps/marketplace/public/.gitkeep
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/marketplace/public/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions apps/marketplace/public/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#603cba</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added apps/marketplace/public/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/marketplace/public/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/marketplace/public/favicon-dark.ico
Binary file not shown.
Binary file added apps/marketplace/public/favicon-light.ico
Binary file not shown.
20 changes: 20 additions & 0 deletions apps/marketplace/public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"short_name": "Marketplace",
"name": "NEWM Marketplace",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#000000"
}
Binary file added apps/marketplace/public/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions apps/marketplace/public/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions apps/marketplace/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
StyledComponentsRegistry,
UnsupportedBrowserBanner,
} from "@newm-web/components";
import { Favicon } from "@newm-web/elements";
import { Footer, Header, PingEarningsInProgressWrapper } from "../components";
import store from "../store";
import Toast from "../components/Toast";
Expand All @@ -30,6 +31,7 @@ const RootLayout: FunctionComponent<RootLayoutProps> = ({ children }) => {
<head>
<title>NEWM Marketplace</title>
<meta content="noindex" name="robots" />
<Favicon />
<link href="https://fonts.googleapis.com" rel="preconnect" />
<link
crossOrigin="anonymous"
Expand Down
71 changes: 35 additions & 36 deletions apps/marketplace/src/components/Sale.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,47 +260,46 @@ const Sale: FunctionComponent<SaleProps> = ({

<Stack gap={ 2.5 } mb={ 4 } mt={ 0.5 }>
<Stack>
<Box alignSelf="flex-end" p={ 0.5 }>
<Tooltip
title={
<Typography>
The number of Stream Tokens correlates with the
percentage of streaming royalties you can acquire.
For example, 1 Stream Token equates to{ " " }
{ `${getPercentageOfTotalStreamTokens(1)}` }% of the
track&apos;s total streaming royalties. For
information on what constitutes a streaming royalty,
please refer to the{ " " }
<span style={ { color: theme.colors.music } }>
<Link
href={ sale.song.tokenAgreementUrl }
rel="noopener noreferrer"
sx={ {
width: "fit-content",
} }
target="_blank"
variant="h4"
>
stream token contract
</Link>
</span>
.
</Typography>
}
>
<IconButton sx={ { padding: 0 } }>
<HelpIcon sx={ { color: theme.colors.grey100 } } />
</IconButton>
</Tooltip>
</Box>

<Box
borderRadius={ 2 }
px={ 3 }
py={ 2.5 }
pb={ 2.5 }
pl={ 3 }
sx={ { backgroundColor: theme.colors.grey600 } }
>
<Stack>
<Box alignSelf="flex-end" p={ 0.5 }>
<Tooltip
title={
<Typography>
The number of Stream Tokens correlates with the
percentage of streaming royalties you can
acquire. For example, 1 Stream Token equates to{ " " }
{ `${getPercentageOfTotalStreamTokens(1)}` }% of
the track&apos;s total streaming royalties. For
information on what constitutes a streaming
royalty, please refer to the{ " " }
<span style={ { color: theme.colors.music } }>
<Link
href={ sale.song.tokenAgreementUrl }
rel="noopener noreferrer"
sx={ {
width: "fit-content",
} }
target="_blank"
variant="h4"
>
stream token contract
</Link>
</span>
.
</Typography>
}
>
<IconButton sx={ { padding: 0 } }>
<HelpIcon sx={ { color: theme.colors.grey100 } } />
</IconButton>
</Tooltip>
</Box>
<Typography
fontWeight={ theme.typography.fontWeightBold }
variant="subtitle2"
Expand Down
5 changes: 4 additions & 1 deletion apps/marketplace/src/modules/content/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// eslint-disable-next-line
/**
* @deprecated Use Launch Darkly feature flags instead.
*/
// eslint-disable-next-line @typescript-eslint/no-empty-interface
interface FeatureFlags {
// When a feature flag is added it will have the following format:
// readonly exampleFlag: boolean;
Expand Down
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions apps/mobile-wallet-connector/public/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#603cba</TileColor>
</tile>
</msapplication>
</browserconfig>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
20 changes: 20 additions & 0 deletions apps/mobile-wallet-connector/public/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"short_name": "Mobile Wallet Connector",
"name": "NEWM Mobile Wallet Connector",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#000000"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions apps/mobile-wallet-connector/public/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions apps/mobile-wallet-connector/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
UnsupportedBrowserBanner,
} from "@newm-web/components";
import "global.css";
import { Favicon } from "@newm-web/elements";
import store from "../store";
import { ConnectWallet, Toast } from "../components";

Expand All @@ -31,6 +32,7 @@ const RootLayout: FunctionComponent<RootLayoutProps> = ({ children }) => {
content="Connect your wallet to the NEWM mobile app."
name="description"
/>
<Favicon />
<link href="https://fonts.googleapis.com" rel="preconnect" />
<link
crossOrigin="anonymous"
Expand Down
3 changes: 3 additions & 0 deletions apps/studio/src/modules/content/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ export interface Country {
readonly state?: State[];
}

/**
* @deprecated Use Launch Darkly feature flags instead.
*/
interface FeatureFlags {
readonly claimWalletRoyaltiesEnabled: boolean;
readonly manageMarketplaceSalesEnabled: boolean;
Expand Down
Loading
Loading