Merge pull request #4734 from leather-wallet/release/home-alone

Release/home alone
leather-io · Dec 19, 2023 · bb8f095 · bb8f095
2 parents 5390eed + a9d56bc
commit bb8f095
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 121 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -6,9 +6,11 @@ env:
 
 on:
   push:
-    branches: [dev]
+    branches:
+      - gh-readonly-queue/dev/**
   pull_request:
-    branches: [dev]
+    branches:
+      - dev
 
 jobs:
   test:

diff --git a/src/app/common/hooks/analytics/transactions-analytics.hooks.ts b/src/app/common/hooks/analytics/transactions-analytics.hooks.ts
diff --git a/src/app/components/request-password.tsx b/src/app/components/request-password.tsx
@@ -62,7 +62,7 @@ export function RequestPassword({ title, caption, onSuccess }: RequestPasswordPr
             >
               {title}
             </styled.h1>
-            <styled.p textStyle={['label.01', 'heading.05']} mb="space.06">
+            <styled.p textStyle={['label.01', 'heading.05']} mb="space.06" textAlign="left">
               {(isRunning && waitingMessage) || caption}
             </styled.p>
           </>
@@ -78,7 +78,7 @@ export function RequestPassword({ title, caption, onSuccess }: RequestPasswordPr
             >
               Your password
             </styled.h2>
-            <Stack gap="space.04" alignItems="center">
+            <Stack gap="space.04" alignItems="center" minHeight="100px">
               <styled.input
                 _focus={{ border: 'focus' }}
                 autoCapitalize="off"
@@ -102,7 +102,7 @@ export function RequestPassword({ title, caption, onSuccess }: RequestPasswordPr
                 value={password}
                 width="100%"
               />
-              {error && <ErrorLabel>{error}</ErrorLabel>}
+              {error && <ErrorLabel width="100%">{error}</ErrorLabel>}
             </Stack>
             <LeatherButton
               data-testid={SettingsSelectors.UnlockWalletBtn}

diff --git a/src/app/components/secret-key/two-column.layout.tsx b/src/app/components/secret-key/two-column.layout.tsx
@@ -26,7 +26,9 @@ export function TwoColumnLayout({
         gap="space.07"
         mx={['auto', 'space.03', 'space.03', 'space.03']}
       >
-        <styled.div maxWidth="440px">{leftColumn}</styled.div>
+        <styled.div width="390px" textAlign="left">
+          {leftColumn}
+        </styled.div>
       </Flex>
 
       <Flex

diff --git a/src/app/pages/home/home.tsx b/src/app/pages/home/home.tsx
@@ -2,7 +2,6 @@ import { Route, useNavigate } from 'react-router-dom';
 
 import { RouteUrls } from '@shared/route-urls';
 
-import { useTrackFirstDeposit } from '@app/common/hooks/analytics/transactions-analytics.hooks';
 import { useOnboardingState } from '@app/common/hooks/auth/use-onboarding-state';
 import { useOnMount } from '@app/common/hooks/use-on-mount';
 import { useRouteHeader } from '@app/common/hooks/use-route-header';
@@ -23,8 +22,6 @@ export function Home() {
 
   const navigate = useNavigate();
 
-  useTrackFirstDeposit();
-
   useRouteHeader(
     <>
       <InAppMessages />

diff --git a/src/app/pages/onboarding/set-password/components/password-field.tsx b/src/app/pages/onboarding/set-password/components/password-field.tsx
@@ -70,7 +70,7 @@ export function PasswordField({ strengthResult, isDisabled }: PasswordFieldProps
         strengthResult={strengthResult}
       />
       <Flex alignItems="center">
-        <Caption mx="space.04">Password strength:</Caption>
+        <Caption mr="space.02">Password strength:</Caption>
         <Caption>{field.value ? strengthText : '—'}</Caption>
       </Flex>
     </>

diff --git a/src/app/query/stacks/balance/stx-balance.hooks.ts b/src/app/query/stacks/balance/stx-balance.hooks.ts
@@ -10,10 +10,7 @@ import { Money, createMoney } from '@shared/models/money.model';
 import { useCurrentStacksAccount } from '@app/store/accounts/blockchain/stacks/stacks-account.hooks';
 import { accountBalanceStxKeys } from '@app/store/accounts/blockchain/stacks/stacks-account.models';
 
-import {
-  useAnchoredStacksAccountBalanceQuery,
-  useUnanchoredStacksAccountBalanceQuery,
-} from './stx-balance.query';
+import { useAnchoredStacksAccountBalanceQuery } from './stx-balance.query';
 
 export function parseBalanceResponse(balances: AddressBalanceResponse) {
   const stxMoney = Object.fromEntries(
@@ -33,17 +30,6 @@ export function parseBalanceResponse(balances: AddressBalanceResponse) {
   return { ...balances, stx };
 }
 
-function useUnanchoredStacksBalances(address: string) {
-  return useUnanchoredStacksAccountBalanceQuery(address, {
-    select: resp => parseBalanceResponse(resp),
-  });
-}
-
-export function useCurrentStacksAccountUnanchoredBalances() {
-  const account = useCurrentStacksAccount();
-  return useUnanchoredStacksBalances(account?.address ?? '');
-}
-
 export function useAnchoredStacksAccountBalances(address: string) {
   return useAnchoredStacksAccountBalanceQuery(address, {
     select: resp => parseBalanceResponse(resp),

diff --git a/src/app/store/analytics/analytics.actions.ts b/src/app/store/analytics/analytics.actions.ts
diff --git a/src/app/store/analytics/analytics.selectors.ts b/src/app/store/analytics/analytics.selectors.ts
diff --git a/src/app/store/analytics/analytics.slice.ts b/src/app/store/analytics/analytics.slice.ts
diff --git a/src/app/store/index.ts b/src/app/store/index.ts
@@ -17,7 +17,6 @@ import { PersistPartial } from 'redux-persist/es/persistReducer';
 
 import { persistConfig } from '@shared/storage/redux-pesist';
 
-import { analyticsSlice } from './analytics/analytics.slice';
 import { appPermissionsSlice } from './app-permissions/app-permissions.slice';
 import { stxChainSlice } from './chains/stx-chain.slice';
 import { inMemoryKeySlice } from './in-memory-key/in-memory-key.slice';
@@ -31,7 +30,6 @@ import { submittedTransactionsSlice } from './submitted-transactions/submitted-t
 import { broadcastActionTypeToOtherFramesMiddleware } from './utils/broadcast-action-types';
 
 export interface RootState {
-  analytics: ReturnType<typeof analyticsSlice.reducer>;
   appPermissions: ReturnType<typeof appPermissionsSlice.reducer>;
   chains: {
     stx: ReturnType<typeof stxChainSlice.reducer>;
@@ -49,7 +47,6 @@ export interface RootState {
 }
 
 const appReducer = combineReducers({
-  analytics: analyticsSlice.reducer,
   appPermissions: appPermissionsSlice.reducer,
   chains: combineReducers({
     stx: stxChainSlice.reducer,

diff --git a/tests/page-object-models/onboarding.page.ts b/tests/page-object-models/onboarding.page.ts
@@ -9,7 +9,6 @@ const TEST_ACCOUNT_SECRET_KEY = process.env.TEST_ACCOUNT_SECRET_KEY ?? '';
 
 // If default wallet state changes, we'll need to update this
 export const testSoftwareAccountDefaultWalletState = {
-  analytics: { hasStxDeposits: { '1': true, '2147483648': true } },
   chains: { stx: { default: { highestAccountIndex: 1, currentAccountIndex: 0 } } },
   softwareKeys: {
     ids: ['default'],
@@ -49,7 +48,6 @@ export const testSoftwareAccountDefaultWalletState = {
 
 const testLedgerAccountDefaultWalletState = {
   _persist: { rehydrated: true, version: 2 },
-  analytics: { hasStxDeposits: { '1': false, '2147483648': true } },
   chains: { stx: { default: { currentAccountIndex: 0, highestAccountIndex: 0 } } },
   softwareKeys: {
     entities: {},