diff --git a/.github/workflows/debug-build.yml b/.github/workflows/debug-build.yml
index 083a7ba62..fcffe2133 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
@@ -128,6 +133,7 @@ jobs:
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
+ APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
- name: Build releases
if: matrix.os != 'macos-11'
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..c372a0881 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'
@@ -96,6 +101,7 @@ jobs:
CSC_KEY_PASSWORD: ${{ secrets[matrix.CSC_KEY_PASSWORD_SECRET_NAME] }}
APPLE_ID: ${{ secrets.APPLE_ID }}
APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
+ APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
- name: Build releases
if: matrix.os != 'macos-11'
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}
/>
diff --git a/package.json b/package.json
index ade555e50..06db41a6d 100644
--- a/package.json
+++ b/package.json
@@ -176,7 +176,7 @@
"electron": "22.3.24",
"electron-builder": "22.10.5",
"electron-devtools-installer": "3.2.0",
- "electron-notarize": "1.0.0",
+ "electron-notarize": "1.2.2",
"electron-rebuild": "3.2.9",
"enzyme": "3.11.0",
"eslint-plugin-jsx-a11y": "6.7.1",
diff --git a/scripts/notarize.js b/scripts/notarize.js
index caa086522..52289ce19 100644
--- a/scripts/notarize.js
+++ b/scripts/notarize.js
@@ -1,5 +1,4 @@
const { notarize } = require('electron-notarize');
-const { appId } = require('../electron-builder.js');
exports.default = async function notarizing(context) {
const { electronPlatformName, appOutDir } = context;
@@ -10,9 +9,10 @@ exports.default = async function notarizing(context) {
const appName = context.packager.appInfo.productFilename;
return await notarize({
- appBundleId: `${String(appId)}`,
+ tool: 'notarytool',
appPath: `${String(appOutDir)}/${String(appName)}.app`,
appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_ID_PASS,
+ teamId: process.env.APPLE_TEAM_ID,
});
};
diff --git a/yarn.lock b/yarn.lock
index f60e5b7c1..13654d733 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8122,10 +8122,10 @@ electron-localshortcut@^3.1.0:
keyboardevent-from-electron-accelerator "^2.0.0"
keyboardevents-areequal "^0.2.1"
-electron-notarize@1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
- integrity sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==
+electron-notarize@1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.2.tgz#ebf2b258e8e08c1c9f8ff61dc53d5b16b439daf4"
+ integrity sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw==
dependencies:
debug "^4.1.1"
fs-extra "^9.0.1"