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.

Sign up for GitHub

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

remove legacy/new banner #850

Merged
merged 2 commits into from
Mar 5, 2024
Merged

remove legacy/new banner #850

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb46f89
remove legacy/new banner
austensen Feb 20, 2024
dafda47
remove unused import
austensen Feb 20, 2024
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
43 changes: 1 addition & 42 deletions client/src/containers/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ import { wowMachine } from "state-machine";
import { NotFoundPage } from "./NotFoundPage";
import widont from "widont";
import { Dropdown } from "components/Dropdown";
import {
isLegacyPath,
ToggleLinkBetweenPortfolioMethods,
WowzaRedirectPage,
} from "components/WowzaToggle";
import { isLegacyPath, WowzaRedirectPage } from "components/WowzaToggle";
import { logAmplitudeEvent } from "../components/Amplitude";
import { SliderButton } from "@typeform/embed-react";
import { StickyModal } from "components/StickyModal";
Expand Down Expand Up @@ -337,44 +333,8 @@ const AppBody = () => {
);
};

const WowzaBanner = withI18n()((props: withI18nProps) => {
const [isBannerOpen, setBannerVisibility] = useState(true);
const { pathname } = useLocation();
const { i18n } = props;
const { about } = createWhoOwnsWhatRoutePaths();

return (
<div className={"App__banner " + (!isBannerOpen ? "d-hide" : "")}>
<div className="content">
{isLegacyPath(pathname) ? (
<Trans>
This is the old version of Who Owns What.{" "}
<ToggleLinkBetweenPortfolioMethods>
Check out the new version here.
</ToggleLinkBetweenPortfolioMethods>
</Trans>
) : (
<Trans>
This is the new version of Who Owns What. To view the old version{" "}
<LocaleNavLink to={about}>visit the About Page.</LocaleNavLink>
</Trans>
)}
</div>
<button
className="close-button"
onClick={() => setBannerVisibility(false)}
aria-label={i18n._(t`Close`)}
>
✕
</button>
</div>
);
});

const App = () => {
const version = process.env.REACT_APP_VERSION;
const allowChangingPortfolioMethod =
process.env.REACT_APP_ENABLE_NEW_WOWZA_PORTFOLIO_MAPPING === "1";
const surveyId = process.env.REACT_APP_WOAU_SURVEY_ID;
const deprecationModalEnabled = process.env.REACT_APP_DEPRECATION_MODAL_ENABLED;

Expand Down Expand Up @@ -414,7 +374,6 @@ const App = () => {
)}
<UserContextProvider>
<div className="App">
{allowChangingPortfolioMethod && <WowzaBanner />}
<Navbar />
{deprecationModalEnabled && <DeprecationModal />}
<AppBody />
Expand Down