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

Release 1.34.0 #1267

Merged
merged 11 commits into from
Feb 14, 2025
Merged
29 changes: 12 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "temple-wallet",
"version": "1.33.0",
"version": "1.34.0",
"private": true,
"scripts": {
"start-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack --watch --stats errors-warnings",
Expand Down Expand Up @@ -60,21 +60,21 @@
"@reduxjs/toolkit": "^1.8.5",
"@rnw-community/shared": "^0.48.0",
"@svgr/webpack": "6.4.0",
"@taquito/ledger-signer": "20.1.0",
"@taquito/local-forging": "20.1.0",
"@taquito/michel-codec": "20.1.0",
"@taquito/michelson-encoder": "20.1.0",
"@taquito/rpc": "20.1.0",
"@taquito/signer": "20.1.0",
"@taquito/taquito": "20.1.0",
"@taquito/tzip12": "20.1.0",
"@taquito/tzip16": "20.1.0",
"@taquito/utils": "20.1.0",
"@taquito/ledger-signer": "21.0.2",
"@taquito/local-forging": "21.0.2",
"@taquito/michel-codec": "21.0.2",
"@taquito/michelson-encoder": "21.0.2",
"@taquito/rpc": "21.0.2",
"@taquito/signer": "21.0.2",
"@taquito/taquito": "21.0.2",
"@taquito/tzip12": "21.0.2",
"@taquito/tzip16": "21.0.2",
"@taquito/utils": "21.0.2",
"@temple-wallet/dapp": "5.0.2",
"@temple-wallet/jest-webextension-mock": "^4.1.0",
"@temple-wallet/save-remote-file-webpack-plugin": "^1.1.3",
"@temple-wallet/wallet-address-validator": "^0.4.3",
"@temple-wallet/youves-sdk": "^0.0.10",
"@temple-wallet/youves-sdk": "0.0.10-dev.1658.1",
"@tezos-domains/core": "1.26.0",
"@tezos-domains/taquito-client": "1.26.0",
"@types/async-retry": "1.4.3",
Expand Down Expand Up @@ -221,11 +221,6 @@
"tslib": "^2.4.0",
"@types/react": "18.0.15",
"@types/react-dev-utils/@types/webpack-dev-server": "^4",
"@taquito/taquito": "20.1.0",
"@taquito/utils": "20.1.0",
"@taquito/beacon-wallet": "20.1.0",
"@taquito/contracts-library": "20.1.0",
"@taquito/tzip16": "20.1.0",
"bignumber.js": "9.1.2",
"eslint-plugin-import": "^2.29.0",
"graphql-request": "^6.1.0",
Expand Down
Binary file removed public/misc/airdrop-btn.png
Binary file not shown.
Binary file removed public/misc/airdrop-popup-btn.png
Binary file not shown.
2 changes: 0 additions & 2 deletions src/app/PageRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import * as Woozie from 'lib/woozie';

import { RewardsPage } from './pages/Rewards';
import { StakingPage } from './pages/Staking';
import { TempleTapAirdropPage } from './pages/TempleTapAirdrop';
import { WithDataLoading } from './WithDataLoading';

interface RouteContext {
Expand Down Expand Up @@ -101,7 +100,6 @@ const ROUTE_MAP = Woozie.createMap<RouteContext>([
['/notifications', onlyReady(() => <Notifications />)],
['/notifications/:id', onlyReady(({ id }) => <NotificationsItem id={Number(id) ?? 0} />)],
['/rewards', onlyReady(() => <RewardsPage />)],
['/temple-tap-airdrop', onlyReady(onlyInFullPage(() => <TempleTapAirdropPage />))],
['*', () => <Woozie.Redirect to="/" />]
]);

Expand Down
6 changes: 0 additions & 6 deletions src/app/icons/social-tg.svg

This file was deleted.

6 changes: 0 additions & 6 deletions src/app/icons/social-x.svg

This file was deleted.

29 changes: 8 additions & 21 deletions src/app/layouts/PageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import ContentContainer from 'app/layouts/ContentContainer';
import { useOnboardingProgress } from 'app/pages/Onboarding/hooks/useOnboardingProgress.hook';
import { AdvertisingBanner } from 'app/templates/advertising/advertising-banner/advertising-banner';
import { AdvertisingOverlay } from 'app/templates/advertising/advertising-overlay/advertising-overlay';
import { AirdropButton } from 'app/templates/temple-tap/AirdropButton';
import { IS_MISES_BROWSER } from 'lib/env';
import { T } from 'lib/i18n';
import { NotificationsBell } from 'lib/notifications/components/bell';
Expand Down Expand Up @@ -112,32 +111,21 @@ export const SpinnerSection: FC = () => (
</div>
);

interface ToolbarProps {
type ToolbarProps = {
pageTitle?: ReactNode;
hasBackAction?: boolean;
step?: number;
setStep?: (step: number) => void;
skip?: boolean;
withBell?: boolean;
withAd?: boolean;
withAirdrop?: boolean;
}
attention?: boolean;
};

export let ToolbarElement: HTMLDivElement | null = null;

/** Defined for reference in code to highlight relation between multiple sticky elements & their sizes */
export const TOOLBAR_IS_STICKY = true;

const Toolbar: FC<ToolbarProps> = ({
pageTitle,
hasBackAction = true,
step,
setStep,
skip,
withBell,
withAd,
withAirdrop
}) => {
const Toolbar: FC<ToolbarProps> = ({ pageTitle, hasBackAction = true, step, setStep, skip, attention }) => {
const { historyPosition, pathname } = useLocation();
const { fullPage } = useAppEnv();
const { setOnboardingCompleted } = useOnboardingProgress();
Expand Down Expand Up @@ -235,11 +223,10 @@ const Toolbar: FC<ToolbarProps> = ({

<div className="flex-1" />

{(withAd || withAirdrop || withBell) && (
<div className="flex items-center gap-x-2 content-end">
{withAd && <AdvertisingBanner />}
{withAirdrop && <AirdropButton />}
{withBell && <NotificationsBell />}
{attention && (
<div className="flex items-center content-end absolute right-0">
<AdvertisingBanner />
<NotificationsBell />
</div>
)}

Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/Delegate/BakerForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ const BakerBannerComponent = React.memo<BakerBannerComponentProps>(({ balanceNum
<>
<BakerCard bakerPkh={baker.address} hideAddress showBakerTag className={clsx(BAKER_BANNER_CLASSNAME, 'mb-6')} />

{!tzError && baker.minDelegation > balanceNum && (
{!tzError && baker.delegation.minBalance > balanceNum && (
<Alert
type="warning"
title={t('minDelegationAmountTitle')}
Expand All @@ -150,7 +150,7 @@ const BakerBannerComponent = React.memo<BakerBannerComponentProps>(({ balanceNum
id="minDelegationAmountDescription"
substitutions={[
<span className="font-normal" key="minDelegationsAmount">
<Money>{baker.minDelegation}</Money> <span style={{ fontSize: '0.75em' }}>{symbol}</span>
<Money>{baker.delegation.minBalance}</Money> <span style={{ fontSize: '0.75em' }}>{symbol}</span>
</span>
]}
/>
Expand Down
14 changes: 8 additions & 6 deletions src/app/pages/Delegate/DelegatorsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,18 @@ export const KnownDelegatorsList: React.FC<{ setValue: any; triggerValidation: a
const toSort = Array.from(knownBakers);
switch (sortBakersBy.key) {
case 'fee':
return toSort.sort((a, b) => a.fee - b.fee);
return toSort.sort((a, b) => a.delegation.fee - b.delegation.fee);

case 'space':
return toSort.sort((a, b) => b.freeSpace - a.freeSpace);
return toSort.sort((a, b) => b.delegation.freeSpace - a.delegation.freeSpace);

case 'staking':
return toSort.sort((a, b) => b.stakingBalance - a.stakingBalance);
return toSort.sort(
(a, b) => b.delegation.capacity - b.delegation.freeSpace - (a.delegation.capacity - a.delegation.freeSpace)
);

case 'min-amount':
return toSort.sort((a, b) => a.minDelegation - b.minDelegation);
return toSort.sort((a, b) => a.delegation.minBalance - b.delegation.minBalance);

case 'rank':
default:
Expand Down Expand Up @@ -109,13 +111,13 @@ export const KnownDelegatorsList: React.FC<{ setValue: any; triggerValidation: a
id="recommendedBakersDescription"
substitutions={[
<a
href="https://baking-bad.org/"
href="https://tzkt.io/bakers"
key="link"
target="_blank"
rel="noopener noreferrer"
className="font-normal underline"
>
Baking Bad
TZKT
</a>
]}
/>
Expand Down
4 changes: 1 addition & 3 deletions src/app/pages/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ const Home = memo<Props>(({ assetSlug }) => {
</span>
) : null
}
withBell
withAd
withAirdrop={!assetSlug}
attention={true}
>
{fullPage && (
<div className="w-full max-w-sm mx-auto">
Expand Down
Binary file removed src/app/pages/TempleTapAirdrop/banner.png
Binary file not shown.
7 changes: 0 additions & 7 deletions src/app/pages/TempleTapAirdrop/confirmed.svg

This file was deleted.

Loading
Loading