Merge pull request #1268 from leather-wallet/dev

Desktop release

Author: kyranjamie

.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'

.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'

.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'

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [4.15.0-dev.1](https://github.com/leather-wallet/desktop/compare/v4.14.3...v4.15.0-dev.1) (2024-05-13)
+
+
+### Features
+
+* stacking card copy + notarize tool fix ([688fd3a](https://github.com/leather-wallet/desktop/commit/688fd3a6047688208d47e210418bfe35ab9120fa))
+
 ## [4.14.3](https://github.com/leather-wallet/desktop/compare/v4.14.2...v4.14.3) (2023-10-31)
 
 

app/components/home/stacking-promo-card.tsx

@@ -41,14 +41,19 @@ export const StackingPromoCard: FC = () => {
         <Text textStyle="display.large" mt="tight">
           Have a chance to earn BTC by locking your STX temporarily
         </Text>
+
+        <Text textStyle="caption" color={color('text-caption')} lineHeight={1.6} mt="tight">
+          Stacking already? Stacking info is now found on lockstacks.com
+        </Text>
+
         <Button
           mt="base"
           alignSelf="flex-start"
           mode="tertiary"
           isDisabled={hasPendingDelegateStxCall}
           onClick={() => history.push(routes.CHOOSE_STACKING_METHOD)}
         >
-          {hasPendingDelegateStxCall ? 'Delegation pending' : 'Get started →'}
+          {'Get stacking on Lockstacks →'}
         </Button>
       </Flex>
     </Box>

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, JSX.Element> = {
-    [HomeCardState.LoadingResources]: <StackingLoading />,
-    [HomeCardState.NotEnoughStx]: <StackingPromoCard />,
-    [HomeCardState.EligibleToParticipate]: <StackingPromoCard />,
-    [HomeCardState.StackingPendingContactCall]: <StackingLoading />,
-    [HomeCardState.StackingPreCycle]: (
-      <StackingBeginsSoonCard blocksTillNextCycle={stackerInfo?.blocksUntilStackingCycleBegins} />
-    ),
-    [HomeCardState.StackingActive]: <StackingCard />,
-    [HomeCardState.StackingError]: <StackingError />,
-    [HomeCardState.PostStacking]: <></>,
-  };
+  // const stackingCardMap: Record<HomeCardState, JSX.Element> = {
+  //   [HomeCardState.LoadingResources]: (
+  //     <>
+  //       <StackingPromoCard />
+  //       <StackingLoading />
+  //     </>
+  //   ),
+  //   [HomeCardState.NotEnoughStx]: <StackingPromoCard />,
+  //   [HomeCardState.EligibleToParticipate]: <StackingPromoCard />,
+  //   [HomeCardState.StackingPendingContactCall]: <StackingLoading />,
+  //   [HomeCardState.StackingPreCycle]: (
+  //     <StackingBeginsSoonCard blocksTillNextCycle={stackerInfo?.blocksUntilStackingCycleBegins} />
+  //   ),
+  //   [HomeCardState.StackingActive]: <StackingCard />,
+  //   [HomeCardState.StackingError]: <StackingError />,
+  //   [HomeCardState.PostStacking]: <></>,
+  // };
 
   const stackingRewardCard = (
     <StackingRewardCard lifetime="0.0281 Bitcoin (sample)" lastCycle="0.000383 Bitcoin (sample)" />
@@ -151,7 +147,7 @@ export const Home: FC = () => {
       <HomeLayout
         transactionList={transactionList}
         balanceCard={balanceCard}
-        stackingCard={isDelegated ? <DelegationCard /> : stackingCardMap[stackingCardState]}
+        stackingCard={<StackingPromoCard />}
         stackingRewardCard={stackingRewardCard}
       />
       <Switch>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stacks-wallet",
-  "version": "4.14.3",
+  "version": "4.15.0-dev.1",
   "description": "Leather 2.0 — Stacking",
   "prettier": "@stacks/prettier-config",
   "homepage": "https://leather.io",
@@ -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",

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,
   });
 };

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"