From bbd03adefb3429098ef0d0d58f5bd5fcec873793 Mon Sep 17 00:00:00 2001 From: kyranjamie Date: Tue, 23 Apr 2024 09:36:23 +0200 Subject: [PATCH] fix: stacking card copy --- .github/workflows/debug-build.yml | 5 +++ .github/workflows/integration-tests.yml | 5 +++ .github/workflows/publish-version.yml | 5 +++ app/components/home/stacking-promo-card.tsx | 7 +++- app/pages/home/home.tsx | 44 ++++++++++----------- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/.github/workflows/debug-build.yml b/.github/workflows/debug-build.yml index 083a7ba62..62587bc44 100644 --- a/.github/workflows/debug-build.yml +++ b/.github/workflows/debug-build.yml @@ -58,6 +58,11 @@ jobs: uses: ./.github/actions/linux-deps if: matrix.os == 'ubuntu-20.04' + - uses: actions/setup-python@v5 + if: matrix.os == 'macos-11' + with: + python-version: '3.10' + - name: Import GPG key id: import_gpg_key uses: crazy-max/ghaction-import-gpg@v5 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index e9a3cfd2a..73ba9866b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -41,6 +41,11 @@ jobs: uses: ./.github/actions/linux-deps if: matrix.os == 'ubuntu-20.04' + - uses: actions/setup-python@v5 + if: matrix.os == 'macos-11' + with: + python-version: '3.10' + - name: Install packages uses: nick-invision/retry@v2 if: steps.cache-node-modules.outputs.cache-hit != 'true' diff --git a/.github/workflows/publish-version.yml b/.github/workflows/publish-version.yml index 1f56fb5af..13c00991d 100644 --- a/.github/workflows/publish-version.yml +++ b/.github/workflows/publish-version.yml @@ -46,6 +46,11 @@ jobs: path: '**/node_modules' key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}-${{ secrets.CACHE_BUSTER }} + - uses: actions/setup-python@v5 + if: matrix.os == 'macos-11' + with: + python-version: '3.10' + - name: Add required Linux dependencies uses: ./.github/actions/linux-deps if: matrix.os == 'ubuntu-20.04' diff --git a/app/components/home/stacking-promo-card.tsx b/app/components/home/stacking-promo-card.tsx index 5dbc4a7e3..edec65923 100644 --- a/app/components/home/stacking-promo-card.tsx +++ b/app/components/home/stacking-promo-card.tsx @@ -41,6 +41,11 @@ export const StackingPromoCard: FC = () => { Have a chance to earn BTC by locking your STX temporarily + + + Stacking already? Stacking info is now found on lockstacks.com + + diff --git a/app/pages/home/home.tsx b/app/pages/home/home.tsx index 8730e85e8..21727a1fa 100644 --- a/app/pages/home/home.tsx +++ b/app/pages/home/home.tsx @@ -6,17 +6,11 @@ import { TransactionListItem, BalanceCard, } from '@components/home'; -import { DelegationCard } from '@components/home/delegation-card'; -import { StackingBeginsSoonCard } from '@components/home/stacking-begins-soon-card'; -import { StackingCard } from '@components/home/stacking-card'; -import { StackingError } from '@components/home/stacking-error-card'; -import { StackingLoading } from '@components/home/stacking-loading'; import { TransactionListItemMempool } from '@components/home/transaction-list/transaction-list-item-mempool'; import routes from '@constants/routes.json'; import { useAnalytics } from '@hooks/use-analytics'; import { useApi } from '@hooks/use-api'; import { useBalance } from '@hooks/use-balance'; -import { useDelegationStatus } from '@hooks/use-delegation-status'; import { usePromptUserToSetDiagnosticPermissions } from '@hooks/use-diagnostic-permission-prompt'; import { useLatestNonce } from '@hooks/use-latest-nonce'; import { useTransactionList } from '@hooks/use-transaction-list'; @@ -30,7 +24,6 @@ import { selectTxModalOpen, selectReceiveModalOpen, selectHomeCardState, - HomeCardState, } from '@store/home'; import { selectRevokeDelegationModalOpen } from '@store/home/home.reducer'; import { RootState } from '@store/index'; @@ -39,7 +32,8 @@ import { selectLoadingStacking, selectNextCycleInfo, selectStackerInfo } from '@ import { selectActiveNodeApi } from '@store/stacks-node'; import { selectTransactionsLoading, selectTransactionListFetchError } from '@store/transaction'; import { openTxInExplorer } from '@utils/external-links'; -import React, { FC } from 'react'; +import React from 'react'; +import { FC } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { Route, Switch } from 'react-router-dom'; @@ -49,7 +43,6 @@ export const Home: FC = () => { useLatestNonce(); usePromptUserToSetDiagnosticPermissions(); - const { delegated: isDelegated } = useDelegationStatus(); const { availableBalance } = useBalance(); const { @@ -60,8 +53,6 @@ export const Home: FC = () => { receiveModalOpen, revokeDelegationModalOpen, activeNode, - stackerInfo, - stackingCardState, } = useSelector((state: RootState) => ({ address: selectAddress(state), txModalOpen: selectTxModalOpen(state), @@ -126,18 +117,23 @@ export const Home: FC = () => { /> ); - const stackingCardMap: Record = { - [HomeCardState.LoadingResources]: , - [HomeCardState.NotEnoughStx]: , - [HomeCardState.EligibleToParticipate]: , - [HomeCardState.StackingPendingContactCall]: , - [HomeCardState.StackingPreCycle]: ( - - ), - [HomeCardState.StackingActive]: , - [HomeCardState.StackingError]: , - [HomeCardState.PostStacking]: <>, - }; + // const stackingCardMap: Record = { + // [HomeCardState.LoadingResources]: ( + // <> + // + // + // + // ), + // [HomeCardState.NotEnoughStx]: , + // [HomeCardState.EligibleToParticipate]: , + // [HomeCardState.StackingPendingContactCall]: , + // [HomeCardState.StackingPreCycle]: ( + // + // ), + // [HomeCardState.StackingActive]: , + // [HomeCardState.StackingError]: , + // [HomeCardState.PostStacking]: <>, + // }; const stackingRewardCard = ( @@ -151,7 +147,7 @@ export const Home: FC = () => { : stackingCardMap[stackingCardState]} + stackingCard={} stackingRewardCard={stackingRewardCard} />