commit_hash stringlengths 40 40 | input stringlengths 13 7.99k | output stringlengths 5 155 | full_message stringlengths 6 8.96k |
|---|---|---|---|
0af037437f106ab11576801e0f1c74f4da3727ec | --- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/roster-mini-app",
- "version": "1.0.3",
+ "version": "1.0.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/roster-mini-app",
- "version": "1.0.3",
+ "version": "1.0.4",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.20.0",
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "1.0.3",
+ "version": "1.0.4",
"private": false,
"main": "dist/index.js",
"files": [
| Update version | Update version
|
4e734fe3eb2d21b02d9b63a59fe4d57a671e89dc | --- __tests__/setup.ts
@@ -58,7 +58,12 @@ jest.mock('expo-modules-core', () => {
jest.mock('expo-image', () => jest.requireActual('expo-image'));
jest.mock('@walmart/allspark-foundation-hub/HubFeature', () => ({
- AllsparkHubContainer: {
- ...jest.doMock('@walmart/allspark-foundation-hub/HubFeature'),
- },
+ ...jest.doMock('@walmart/allspark-foundation-hub/HubFeature'),
+ AllsparkHubContainer: jest.fn().mockImplementationOnce(() => ({
+ create: jest.fn().mockImplementationOnce(() => ({
+ validate: jest.fn().mockImplementationOnce(() => ({
+ render: jest.fn().mockImplementationOnce(() => {}),
+ })),
+ })),
+ })),
}));
--- __tests__/source/__snapshots__/index.test.tsx.snap
@@ -26,3 +26,5 @@ exports[`myTeamMiniApp should render MyTeamMiniApp as expected 1`] = `
</Navigator>
</SafeAreaProvider>
`;
+
+exports[`myTeamMiniApp should render TeamHub as expected 1`] = `null`;
--- __tests__/source/index.test.tsx
@@ -4,6 +4,7 @@ import {finishPendingRequests} from '../harness/utils';
import {TextingMiniApp as MyTeamMiniApp, initialize} from '../../src';
import {cleanup} from '@testing-library/react-hooks';
import {firebase} from '@react-native-firebase/app-check';
+import {useSelector} from 'react-redux';
jest.mock('@walmart/allspark-foundation/Environment', () => ({
...jest.requireActual('@walmart/allspark-foundation/Environment'),
@@ -14,6 +15,11 @@ jest.mock('@walmart/wmconnect-mini-app', () => ({
PresenceProvider: jest.fn(),
}));
+jest.mock('react-redux', () => ({
+ ...jest.requireActual('react-redux'),
+ useSelector: jest.fn(),
+}));
+
jest.mock('@react-native-firebase/app-check', () => ({
firebase: {
appCheck: jest.fn().mockImplementation(() => ({
@@ -37,6 +43,13 @@ describe('myTeamMiniApp', () => {
await finishPendingRequests();
expect(component.toJSON()).toMatchSnapshot();
});
+
+ it('should render TeamHub as expected', async () => {
+ (useSelector as jest.Mock).mockReturnValue(true);
+ const component = renderWithProviders(<MyTeamMiniApp />);
+ await finishPendingRequests();
+ expect(component.toJSON()).toMatchSnapshot();
+ });
});
describe('initialize', () => {
| feat(ui): added test case for TeamHub | feat(ui): added test case for TeamHub
|
79aea4fc3a2d2cee1e7f95ad28077d6d6ef842a7 | --- .looper.multibranch.yml
@@ -485,6 +485,10 @@ flows:
- dir(android):
- (name setting environment) npm run env:${env}
- npm run jetifier
+ - ls -l /usr/local/var/run/watchman/jenkinspan-state
+ - rm /usr/local/var/run/watchman/jenkinspan-state/pid
+ - rm /usr/local/var/run/watchman/jenkinspan-state/state
+ - rm /usr/local/var/run/watchman/jenkinspan-state/log
- |
(name build and align apk)
#!/bin/sh -x
| trying to fix android looper build | trying to fix android looper build
|
02794de2ae50015b52750d999b9a7f6d1dd97b29 | --- packages/me-at-walmart-container/src/services/site/querySiteInfo.ts
@@ -9,6 +9,7 @@ import {MeAtWalmartLoggerService} from '../logger';
import {Site} from '@walmart/allspark-foundation';
import {safeJsonParse} from '@walmart/allspark-utils';
import {getParsedStoreMetaData} from './getParsedStoreMetaData';
+import {cloneDeep} from 'lodash';
const STORAGE_KEY = 'storage-storeConfig';
@@ -42,7 +43,7 @@ export const querySiteInfo = async (
fetchPolicy: forceRefresh ? 'no-cache' : 'cache-first',
});
- const storeData = response?.data?.businessUnitByCountryAndNumber;
+ const storeData = cloneDeep(response?.data?.businessUnitByCountryAndNumber);
if (!storeData) {
throw new Error('No store data found');
| fixing the parser by making a clone | fixing the parser by making a clone
|
b62e4dc8fa07ee4cdfa921e6d86ac4d3195a9fd6 | --- package-lock.json
@@ -135,7 +135,7 @@
"react-native-pdf": "^6.6.2",
"react-native-permissions": "3.6.1",
"react-native-popup-menu": "^0.16.0",
- "react-native-ptt-module": "1.8.3",
+ "react-native-ptt-module": "1.8.6",
"react-native-qrcode-svg": "^6.1.2",
"react-native-reanimated": "2.12.0",
"react-native-render-html": "^6.3.4",
@@ -17642,9 +17642,9 @@
"license": "ISC"
},
"node_modules/react-native-ptt-module": {
- "version": "1.8.3",
- "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.8.3.tgz",
- "integrity": "sha512-dTZwn0Iu+Mxth7tMGKJk3zSSnleENGthzq1X4m4K9WXymX31CTX3EHtieq03hoVTo7y0EdvvW1FhjUJrhlYZlw==",
+ "version": "1.8.6",
+ "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.8.6.tgz",
+ "integrity": "sha512-t9S9vUtTMuaAgpGmxJ8EXmydhbMChYZfAI4YEVN4KG5F4PqKCL2u41XvpjHdQx1rA0KBv6ehxUmYgVYHmreCrA==",
"license": "MIT"
},
"node_modules/react-native-qrcode-svg": {
@@ -32588,9 +32588,9 @@
"version": "0.16.1"
},
"react-native-ptt-module": {
- "version": "1.8.3",
- "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.8.3.tgz",
- "integrity": "sha512-dTZwn0Iu+Mxth7tMGKJk3zSSnleENGthzq1X4m4K9WXymX31CTX3EHtieq03hoVTo7y0EdvvW1FhjUJrhlYZlw=="
+ "version": "1.8.6",
+ "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.8.6.tgz",
+ "integrity": "sha512-t9S9vUtTMuaAgpGmxJ8EXmydhbMChYZfAI4YEVN4KG5F4PqKCL2u41XvpjHdQx1rA0KBv6ehxUmYgVYHmreCrA=="
},
"react-native-qrcode-svg": {
"version": "6.1.2",
| npm i | npm i
|
47a825d840691081c763c85b09b94ce8c6b7f27c | --- .github/pull_request_template.md
@@ -11,15 +11,20 @@ _Put an `x` in the boxes that apply_
- [ ] Documentation Update (if none of the other choices apply)
-# Checklist
+## Checklist
- [ ] Have you written unit tests for this?
- [ ] Does it cover analytics events? If yes, please list them.
- [ ] Does it cover Splunk Logger events? If yes, please list them.
-- [ ] This feature can be toggled off by Firebase - Remote Config flag
-- [ ] Does your mini app bundle cover all peer Dependencies for core app to install?
-- [ ] Has it been demoed already to Kislaya's Monday meeting?
- [ ] Are there any changes to shared Redux?
+#### For Mini-Apps
+If this PR is integrating a new mini-app ***or*** updating an existing one (via version bump), fill out the following:
+
+- [ ] Are all peer dependencies for your mini app included in allspark-core package.json?
+- [ ] Please provide a link below to the Hygieia dashboard for the mini app node module.
+
+
+
### Please describe the problem this PR is addressing:
| adding new question to template | adding new question to template
|
e4b9ba9df877e5b999dcb1ce66a4add929c92f9b | --- package-lock.json
@@ -5336,9 +5336,9 @@
"integrity": "sha512-ikrdCnaBxNIBgZPhzgd9+UjqdCynQXOOA9TxqiG9zWWXoJbifyaM5ifbQca1dWG/5Q5XPUcOrQJg3qY8IWR//g=="
},
"@walmart/manager-approvals-miniapp": {
- "version": "0.1.0",
- "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.1.0.tgz",
- "integrity": "sha512-DZAN5IZXt3Cz8amBJa6wn4tz4ZWN27cG0eQYPkjp+s+hHvW8kIh4HJAP2vpkH4RI3q6NyeGF1mACdUp4nCiSDg=="
+ "version": "0.1.1",
+ "resolved": "https://npme.walmart.com/@walmart/manager-approvals-miniapp/-/manager-approvals-miniapp-0.1.1.tgz",
+ "integrity": "sha512-7d62eBeJoUnnl5KOoDe+aOxU7C6VpkCM7Bl5iRgg1TMMqmUDM8iI2YDPRppU7hBr134Zbl5aVEGyR/IBQrPRxA=="
},
"@walmart/me-field-mini-app": {
"version": "1.1.24",
--- package.json
@@ -97,7 +97,7 @@
"@walmart/ims-print-services-ui": "1.1.3",
"@walmart/inbox-mini-app": "0.57.0",
"@walmart/iteminfo-mini-app": "5.1.3",
- "@walmart/manager-approvals-miniapp": "0.1.0",
+ "@walmart/manager-approvals-miniapp": "0.1.1",
"@walmart/me-field-mini-app": "1.1.24",
"@walmart/metrics-mini-app": "0.9.17",
"@walmart/mod-flex-mini-app": "1.2.2",
| Bump Manager Approvals Mini App | Bump Manager Approvals Mini App
|
18dd16d2a01f4c75d1739e5bf6595c8f7193d871 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.0",
+ "version": "2.0.1",
"private": false,
"main": "bundle/dist/index.js",
"files": [
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/texting-mini-app",
- "version": "2.0.0",
+ "version": "2.0.1",
"private": false,
"main": "bundle/dist/index.js",
"files": [
| bumping patch version to publish | bumping patch version to publish
|
e501350c5bdcb210ffc6db460067c1f9dfc878e2 | --- __tests__/navConfig/NavConfigSagasTest.ts
@@ -74,6 +74,7 @@ const mockScope = {
country: 'US',
employeeType: 'S',
domain: 'store/club',
+ isDcUser: false,
};
describe('nav config sagas', () => {
@@ -147,6 +148,7 @@ describe('nav config sagas', () => {
select(DeviceInfoSelectors.getDeviceType),
select(UserSelectors.getUserEmployeeType),
select(UserSelectors.getUserDomain),
+ select(SiteSelectors.isSiteDistributionCenter),
]),
);
const {value, done} = iterator.next([
@@ -161,6 +163,7 @@ describe('nav config sagas', () => {
'COPIUM',
'S',
'store/club',
+ false,
]);
expect(value).toEqual(mockScope);
--- src/navConfig/NavConfigSagas.ts
@@ -80,6 +80,7 @@ export function* getNavConfigScope(): any {
deviceType,
employeeType,
domain,
+ isDcUser,
] = yield all([
select(UserSelectors.getUserId),
select(SiteSelectors.getUserWorkingSite),
@@ -92,6 +93,7 @@ export function* getNavConfigScope(): any {
select(DeviceInfoSelectors.getDeviceType),
select(UserSelectors.getUserEmployeeType),
select(UserSelectors.getUserDomain),
+ select(SiteSelectors.isSiteDistributionCenter),
]);
return {
@@ -107,6 +109,7 @@ export function* getNavConfigScope(): any {
env: env.deployment,
employeeType: `${employeeType}`,
domain,
+ isDcUser,
};
}
| meganav isDcUser | meganav isDcUser
|
fa34c02d6ee8dfaeb1ec509c714c3ddcec5d859d | --- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx
@@ -18,6 +18,7 @@ import { AllsparkSharedComponents } from '../Components/SharedComponents';
import {
AllsparkModuleConfig,
AllsparkModuleResources,
+ BuildNavigatorConfig,
BuildScreenConfig,
ConnectCapabilities,
DisconnectCapabilities,
@@ -309,6 +310,25 @@ export class AllsparkFeatureModule<
return null;
};
+ /**
+ * Build navigator with given build configuration.
+ * @param config - The build configuration.
+ * @param config.Navigator - The navigator to use.
+ * @param config.config - The navigator configuration.
+ * @returns The built navigator.
+ * @example
+ * const navigator = featureModule.buildNavigator({ Navigator: StackNavigator, config: { screenOptions: { headerShown: false } } });
+ */
+ public buildNavigator = (config: BuildNavigatorConfig) => {
+ const { Navigator, config: navConfig } = config;
+
+ return () => (
+ <Navigator.Navigator {...navConfig}>
+ {this.buildAllScreens({ Navigator })}
+ </Navigator.Navigator>
+ );
+ };
+
// --- Feature Events --- //
/**
--- packages/allspark-foundation/src/Feature/types.ts
@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import { ComponentProps, FC } from 'react';
import { Reducer } from 'redux';
import { Saga } from 'redux-saga';
@@ -7,7 +7,7 @@ import { FeatureTranslationResources } from '../Translation/types';
import {
AllsparkModalConfig,
AllsparkScreenConfig,
- AnyNavigator,
+ StackNavigator,
} from '../Navigation/types';
import {
ContainerEventListeners,
@@ -221,8 +221,13 @@ export type TargetFeatureConfig = {
};
export type BuildScreenConfig = {
- Navigator: AnyNavigator;
- routeConfig?: any;
+ Navigator: StackNavigator;
+ routeConfig?: ComponentProps<StackNavigator['Screen']>;
+};
+
+export type BuildNavigatorConfig = {
+ Navigator: StackNavigator;
+ config?: ComponentProps<StackNavigator['Navigator']>;
};
export type FeatureEventListeners = {
--- packages/allspark-foundation/src/FeatureRunner/navigation.tsx
@@ -22,7 +22,6 @@ import {
useAllsparkDrawer,
} from '../Navigation';
import { UserActionCreators, UserSelectors } from '../User';
-import { AnyNavigator } from '../Navigation/types';
import { ActiveAllsparkContainer } from '../Container/ActiveContainerManager';
import { ComponentContainer } from '../Components';
@@ -62,12 +61,12 @@ export const createFeatureRunnerNavigation = <F extends AllsparkFeatureModule>(
const Stack = createStackNavigator<FeatureRunnerScreenParams>();
const Drawer = createDrawerNavigator();
const FeatureScreens = feature.buildAllScreens({
- Navigator: Stack as AnyNavigator,
+ Navigator: Stack,
});
const DependencyScreens = dependencies.map((dep) =>
dep.buildAllScreens({
- Navigator: Stack as AnyNavigator,
+ Navigator: Stack,
})
);
| feat: add build navigator method to feature module. change build screen typing to use stack navigator | feat: add build navigator method to feature module. change build screen typing to use stack navigator
|
969d696f8b306d4cf12746c66b9ca4e20bbaf79c | --- packages/allspark-foundation-hub/__tests__/HubFeature/TeamOnboarding/ErrorScreen.test.tsx
@@ -6,8 +6,10 @@ describe('ErrorScreen Component Tests', () => {
const defaultProps = {
errorTitle: 'Something went wrong',
errorMessage: 'Refresh this page to try again.',
- buttonText: 'Refresh page',
- handleButtonPress: () => {},
+ primaryButtonText: 'Refresh page',
+ secondaryButtonText: 'Cancel',
+ handlePrimaryButtonPress: () => {},
+ handleSecondaryButtonPress: () => {},
};
test.skip('renders error screen component', () => {
const { getByText, getByRole } = render(<ErrorScreen {...defaultProps} />);
@@ -37,8 +39,8 @@ describe('ErrorScreen Component Tests', () => {
<ErrorScreen
errorTitle={'Something went wrong'}
errorMessage={'Refresh this page to try again.'}
- buttonText={'Refresh page'}
- handleButtonPress={handlerMock}
+ primaryButtonText={'Refresh page'}
+ handlePrimaryButtonPress={handlerMock}
/>
);
const actionBtn = getByRole('button');
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/ErrorScreen.tsx
@@ -1,4 +1,4 @@
-import { Button, ErrorMessage } from '@walmart/gtp-shared-components';
+import { Button, ErrorMessage, Link } from '@walmart/gtp-shared-components';
import React from 'react';
import { errorScreenStyles as styles } from '../styles';
import { View } from 'react-native';
@@ -9,15 +9,19 @@ import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry';
export interface ErrorScreenProps {
errorTitle: string;
errorMessage: string;
- buttonText: string;
- handleButtonPress: () => void;
+ primaryButtonText: string;
+ secondaryButtonText?: string;
+ handlePrimaryButtonPress: () => void;
+ handleSecondaryButtonPress?: () => void;
}
export const ErrorScreen = ({
errorTitle,
errorMessage,
- buttonText,
- handleButtonPress,
+ primaryButtonText,
+ secondaryButtonText,
+ handlePrimaryButtonPress = () => {},
+ handleSecondaryButtonPress = () => {},
}: ErrorScreenProps) => {
const TeamImage = useAllsparkImage();
const logger = LoggerService.getContainerInstance();
@@ -29,9 +33,18 @@ export const ErrorScreen = ({
accessibilityRole='alert'
accessibilityLabel={errorTitle}
actions={
- <Button size='medium' variant='primary' onPress={handleButtonPress}>
- {buttonText}
- </Button>
+ <View style={styles.buttonContainer}>
+ <Button
+ size='medium'
+ variant='primary'
+ onPress={handlePrimaryButtonPress}
+ >
+ {primaryButtonText}
+ </Button>
+ <Link onPress={handleSecondaryButtonPress}>
+ {secondaryButtonText}
+ </Link>
+ </View>
}
media={
<TeamImage
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Screens/TeamSelection.tsx
@@ -16,8 +16,12 @@ import { Team } from '@walmart/me-at-walmart-athena-queries/src/schema.types';
import { LoggerService } from '@walmart/allspark-foundation/Logger';
import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry';
import { useTeamsByStore } from '../Hooks/useTeamsByStore';
+import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigation';
+import { FEATURE_ID } from '../../constant';
+import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation';
export const TeamSelection = () => {
+ const { t } = useAllsparkTranslation(FEATURE_ID);
const useGetViewersPrimaryTeamName = () => {
const viewerTeam: Team[] | undefined = useSelector(UserSelectors.getTeams);
const title = useSelector(UserSelectors.getTitle) as string;
@@ -83,14 +87,16 @@ export const TeamSelection = () => {
if (error) {
return (
<ErrorScreen
- errorTitle={'Something went wrong'}
- errorMessage={'Refresh this page to try again.'}
- buttonText={'Refresh page'}
- handleButtonPress={() => {
+ errorTitle={t('errorScreen.title')}
+ errorMessage={t('errorScreen.message')}
+ primaryButtonText={t('errorScreen.primaryButtonText')}
+ secondaryButtonText={t('errorScreen.secondaryButtonText')}
+ handlePrimaryButtonPress={() => {
if (!data.length) {
refetch();
}
}}
+ handleSecondaryButtonPress={() => AllsparkNavigationClient.goBack()}
/>
);
}
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/styles.ts
@@ -150,4 +150,7 @@ export const errorScreenStyles = StyleSheet.create({
width: '100%',
height: '100%',
},
+ buttonContainer: {
+ gap: 8,
+ },
});
--- packages/allspark-foundation-hub/src/HubFeature/translation.ts
@@ -70,6 +70,12 @@ export const enUS = {
content: 'You must be clocked in to access the content on this page.',
title: 'Clock in required',
},
+ errorScreen: {
+ title: 'Something went wrong',
+ message: 'Refresh this page to try again.',
+ primaryButtonText: 'Refresh page',
+ secondaryButtonText: 'Cancel',
+ },
};
export const esMX = {
@@ -146,4 +152,10 @@ export const esMX = {
'Es necesario estar fichado para acceder al contenido de esta página.',
title: 'Entrada requerida',
},
+ errorScreen: {
+ title: 'Algo salió mal',
+ message: 'Actualice esta página para volver a intentarlo.',
+ primaryButtonText: 'Actualizar página',
+ secondaryButtonText: 'Cancelar',
+ },
};
| Add cancel button for error screen | Add cancel button for error screen
|
893a4ca73c211c8fa0ffab68c0583159b45ca984 | --- package-lock.json
@@ -3652,9 +3652,9 @@
}
},
"@walmart/welcomeme-mini-app": {
- "version": "0.30.1",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.30.1.tgz",
- "integrity": "sha512-N2x3XniFP9PgiS9ibpeUJ8JtHJlrWG+kTXaGLj7DHqvPS0Wz7c3mcjidruiGCGafQR5QskowDd85CHFiWutW5Q=="
+ "version": "0.30.2",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.30.2.tgz",
+ "integrity": "sha512-OWs7Hiq9vYh8V3GeoMjrerp7QT1T4gYH4Gd5PDHVSoOr0oW1P47+ZLHCetRt1SYLHPa05vB9kMBxk/O9ga+3Mw=="
},
"@walmart/wfm-ui": {
"version": "0.1.50",
--- package.json
@@ -99,7 +99,7 @@
"@walmart/shelfavailability-mini-app": "0.3.89",
"@walmart/time-clock-mini-app": "0.4.10",
"@walmart/ui-components": "1.1.56",
- "@walmart/welcomeme-mini-app": "0.30.1",
+ "@walmart/welcomeme-mini-app": "0.30.2",
"@walmart/wfm-ui": "^0.1.50",
"axios-cache-adapter": "2.7.3",
"crypto-js": "^3.3.0",
| version bump | version bump
|
0197715d89a6acf0c9db6f5c8b29ca29e2cac2a9 | --- package-lock.json
@@ -42,8 +42,8 @@
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.18.5",
"@walmart/attendance-mini-app": "3.10.0",
- "@walmart/avp-feature-app": "0.0.32",
- "@walmart/avp-shared-library": "0.0.53",
+ "@walmart/avp-feature-app": "0.1.3",
+ "@walmart/avp-shared-library": "0.1.3",
"@walmart/calling-mini-app": "0.1.8",
"@walmart/compass-sdk-rn": "5.18.15",
"@walmart/config-components": "4.2.16",
@@ -57,10 +57,10 @@
"@walmart/exception-mini-app": "1.7.3",
"@walmart/facilities-management-miniapp": "0.7.3",
"@walmart/feedback-all-spark-miniapp": "0.9.52",
- "@walmart/financial-wellbeing-feature-app": "1.19.2",
+ "@walmart/financial-wellbeing-feature-app": "1.20.1",
"@walmart/functional-components": "~4.0.3",
"@walmart/gta-react-native-calendars": "0.1.0",
- "@walmart/gtp-shared-components": "2.1.3",
+ "@walmart/gtp-shared-components": "2.1.10",
"@walmart/impersonation-mini-app": "1.20.7",
"@walmart/ims-print-services-ui": "2.8.0",
"@walmart/inbox-mini-app": "0.90.0",
@@ -8555,9 +8555,9 @@
}
},
"node_modules/@walmart/avp-feature-app": {
- "version": "0.0.32",
- "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.32.tgz",
- "integrity": "sha512-tzufBPdEMOANy2H/P3kgQN20mz1kw6U6yQMnSS+LQenPhRF8N60uMF0nnI8ij/HIYGjgEBDqTTaIiMut6YTp5Q==",
+ "version": "0.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.1.3.tgz",
+ "integrity": "sha512-qNseetfFjaoovKkBT8oslKgwXqpdmzERwaA5EX43QCexvEw7HT/bOnJRSfvnMKZPsz9GncNhA07Prrg1IM16fA==",
"hasInstallScript": true,
"engines": {
"node": ">=16"
@@ -8573,9 +8573,9 @@
}
},
"node_modules/@walmart/avp-shared-library": {
- "version": "0.0.53",
- "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.0.53.tgz",
- "integrity": "sha512-l65IsvS5OTHL/FO33gZsgHUl/lb/UoE7nZv07dMqTOWdODTw1S1Ym4L79ojt8/SeVKT2GIGUZXRlOGbfVonzRA==",
+ "version": "0.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.1.3.tgz",
+ "integrity": "sha512-kBqinn8ffJ+n8M9YjF55WKqQVPGGvR2z1MTf3I81JyzRc995PVVXhL8RdycKsGOt5LskaHZM4iB6Kf1CRbrGnw==",
"license": "ISC",
"peerDependencies": {
"axios": "^1.3.4",
@@ -9017,9 +9017,9 @@
}
},
"node_modules/@walmart/financial-wellbeing-feature-app": {
- "version": "1.19.2",
- "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.19.2.tgz",
- "integrity": "sha512-LyY9BlSzI0qtFbCGTkbJ0TiBs/cvWrawvcpCoJ9tMfrtFZBR0XHo+z6cQnyXt+5rXM0ww6bUx57TRT6OkYkp4w==",
+ "version": "1.20.1",
+ "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.20.1.tgz",
+ "integrity": "sha512-OyLGcO2FVP6OrGt7FLCZDczl8/JqBdcUu3iI1g2FYnt5XFR6vVGlRefJ6qme7zdolphD/CG6Nl4ovQ0R/rE1RA==",
"hasInstallScript": true,
"engines": {
"node": ">=16"
@@ -9065,9 +9065,9 @@
}
},
"node_modules/@walmart/gtp-shared-components": {
- "version": "2.1.3",
- "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.3.tgz",
- "integrity": "sha512-/wB0vaVPXi8WWkpg8dx8avEuPURd2ynZblQ7VrJFx4UlkH46SMEgasCMBZRoWs/UWpjVE4mjuQ9Sz9p/oF87UA==",
+ "version": "2.1.10",
+ "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.10.tgz",
+ "integrity": "sha512-Yy3R29eLNjWW4i2YdVtPdNEkvbuYzq5Hnecgg/7JXq7jVqF8eTAGXBdUXJKe/MIJPS/O6FjyQuKLptHm/O/SFQ==",
"license": "Apache-2.0",
"dependencies": {
"@livingdesign/tokens": "0.63.0",
@@ -33248,14 +33248,14 @@
}
},
"@walmart/avp-feature-app": {
- "version": "0.0.32",
- "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.32.tgz",
- "integrity": "sha512-tzufBPdEMOANy2H/P3kgQN20mz1kw6U6yQMnSS+LQenPhRF8N60uMF0nnI8ij/HIYGjgEBDqTTaIiMut6YTp5Q=="
+ "version": "0.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.1.3.tgz",
+ "integrity": "sha512-qNseetfFjaoovKkBT8oslKgwXqpdmzERwaA5EX43QCexvEw7HT/bOnJRSfvnMKZPsz9GncNhA07Prrg1IM16fA=="
},
"@walmart/avp-shared-library": {
- "version": "0.0.53",
- "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.0.53.tgz",
- "integrity": "sha512-l65IsvS5OTHL/FO33gZsgHUl/lb/UoE7nZv07dMqTOWdODTw1S1Ym4L79ojt8/SeVKT2GIGUZXRlOGbfVonzRA=="
+ "version": "0.1.3",
+ "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.1.3.tgz",
+ "integrity": "sha512-kBqinn8ffJ+n8M9YjF55WKqQVPGGvR2z1MTf3I81JyzRc995PVVXhL8RdycKsGOt5LskaHZM4iB6Kf1CRbrGnw=="
},
"@walmart/calling-mini-app": {
"version": "0.1.8",
@@ -33390,9 +33390,9 @@
"integrity": "sha512-5fGRa3rbOps48Y8nCRl9iFbRQaLU35zpmWN4x/2c7Ip8D7Pd+8QHUQNlaLL+Bdx4OTBACCQ2G+pNIPPqhZRUTw=="
},
"@walmart/financial-wellbeing-feature-app": {
- "version": "1.19.2",
- "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.19.2.tgz",
- "integrity": "sha512-LyY9BlSzI0qtFbCGTkbJ0TiBs/cvWrawvcpCoJ9tMfrtFZBR0XHo+z6cQnyXt+5rXM0ww6bUx57TRT6OkYkp4w=="
+ "version": "1.20.1",
+ "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.20.1.tgz",
+ "integrity": "sha512-OyLGcO2FVP6OrGt7FLCZDczl8/JqBdcUu3iI1g2FYnt5XFR6vVGlRefJ6qme7zdolphD/CG6Nl4ovQ0R/rE1RA=="
},
"@walmart/functional-components": {
"version": "4.0.3",
@@ -33417,9 +33417,9 @@
}
},
"@walmart/gtp-shared-components": {
- "version": "2.1.3",
- "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.3.tgz",
- "integrity": "sha512-/wB0vaVPXi8WWkpg8dx8avEuPURd2ynZblQ7VrJFx4UlkH46SMEgasCMBZRoWs/UWpjVE4mjuQ9Sz9p/oF87UA==",
+ "version": "2.1.10",
+ "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-2.1.10.tgz",
+ "integrity": "sha512-Yy3R29eLNjWW4i2YdVtPdNEkvbuYzq5Hnecgg/7JXq7jVqF8eTAGXBdUXJKe/MIJPS/O6FjyQuKLptHm/O/SFQ==",
"requires": {
"@livingdesign/tokens": "0.63.0",
"@walmart/gtp-shared-icons": "1.0.7",
--- package.json
@@ -83,8 +83,8 @@
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.18.5",
"@walmart/attendance-mini-app": "3.10.0",
- "@walmart/avp-feature-app": "0.0.32",
- "@walmart/avp-shared-library": "0.0.53",
+ "@walmart/avp-feature-app": "0.1.3",
+ "@walmart/avp-shared-library": "0.1.3",
"@walmart/calling-mini-app": "0.1.8",
"@walmart/compass-sdk-rn": "5.18.15",
"@walmart/config-components": "4.2.16",
@@ -98,10 +98,10 @@
"@walmart/exception-mini-app": "1.7.3",
"@walmart/facilities-management-miniapp": "0.7.3",
"@walmart/feedback-all-spark-miniapp": "0.9.52",
- "@walmart/financial-wellbeing-feature-app": "1.19.2",
+ "@walmart/financial-wellbeing-feature-app": "1.20.1",
"@walmart/functional-components": "~4.0.3",
"@walmart/gta-react-native-calendars": "0.1.0",
- "@walmart/gtp-shared-components": "2.1.3",
+ "@walmart/gtp-shared-components": "2.1.10",
"@walmart/impersonation-mini-app": "1.20.7",
"@walmart/ims-print-services-ui": "2.8.0",
"@walmart/inbox-mini-app": "0.90.0",
| bumped the avp and fwb version | bumped the avp and fwb version
|
bf81739ca6a32a424e8a501654ae913bf3902d9f | --- packages/me-at-walmart-container/__mocks__/@walmart/config-components.js
@@ -3,6 +3,7 @@ module.exports = {
initialize: jest.fn(() => Promise.resolve()),
fetchAppConfig: jest.fn(),
addAppConfigListener: jest.fn(),
+ removeAppConfigListener: jest.fn(),
},
StoreConfig: {
initialize: jest.fn(),
--- packages/me-at-walmart-container/__tests__/services/config.test.ts
@@ -1,17 +1,3 @@
-
-jest.mock('@walmart/config-components', () => {
- const originalModule = jest.requireActual('@walmart/config-components');
- return {
- ...originalModule,
- AppConfig: {
- initialize: jest.fn(),
- fetchAppConfig: jest.fn(),
- removeAppConfigListener: jest.fn(),
- addAppConfigListener: jest.fn(),
- },
- };
-});
-
import {
ConfigLogger,
LISTENER_KEY,
@@ -21,10 +7,10 @@ import {
ChangeEventManager , actualListener,
initialize, fetch
} from '../../src/services/config';
-
import {
AppConfig,
} from '@walmart/config-components';
+jest.mock('@walmart/config-components');
describe('actualListener', () => {
afterEach(() => {
@@ -76,7 +62,7 @@ describe('fetch', () => {
afterEach(() => {
jest.clearAllMocks();
});
-
+
it('should call fetchAppConfig with correct arguments and manage listeners', async () => {
const mockConfig = { key: 'value', forceRefresh: true }; // Replace with actual AppConfigFetchParams
const mockData = { some: 'data' }; // Mocked return data
@@ -138,6 +124,4 @@ describe('ConfigLogger Module', () => {
const mockParams: MeAtWalmartConfigFetchParams = {} as any;
expect(mockParams).toBeDefined();
});
-});
-
-
+});
\ No newline at end of file
| replaced mocked data | replaced mocked data
|
df8a6d5063ec7a0ffe402c9fd96f16600f777d8a | --- package-lock.json
@@ -74,7 +74,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.5.1",
- "@walmart/receipt-check-miniapp": "1.14.2",
+ "@walmart/receipt-check-miniapp": "1.14.3",
"@walmart/redux-store": "3.3.1",
"@walmart/returns-mini-app": "1.5.0",
"@walmart/schedule-mini-app": "0.37.0",
@@ -5818,9 +5818,9 @@
}
},
"node_modules/@walmart/receipt-check-miniapp": {
- "version": "1.14.2",
- "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.14.2.tgz",
- "integrity": "sha512-ab6mAvocwcRoFzTSFlxfdgQAAj9tfmirbcJUM0hvg8oKWMxzoWWsPfGI7OI38/oGuwhuvsRCn++fZzOB0b+CrA==",
+ "version": "1.14.3",
+ "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.14.3.tgz",
+ "integrity": "sha512-i/8ImBVHIDpz9TEzdnjxYxZsillDk8jTeV5aJjGhAuyNj4oB0VarJQBZqUzgB4lWzSJe0ej12NJUfJWnJ9NRGA==",
"dependencies": {
"@walmart/tcnumber": "^2.3.3",
"@xstate/react": "^3.0.1",
@@ -25336,9 +25336,9 @@
"version": "2.5.1"
},
"@walmart/receipt-check-miniapp": {
- "version": "1.14.2",
- "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.14.2.tgz",
- "integrity": "sha512-ab6mAvocwcRoFzTSFlxfdgQAAj9tfmirbcJUM0hvg8oKWMxzoWWsPfGI7OI38/oGuwhuvsRCn++fZzOB0b+CrA==",
+ "version": "1.14.3",
+ "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.14.3.tgz",
+ "integrity": "sha512-i/8ImBVHIDpz9TEzdnjxYxZsillDk8jTeV5aJjGhAuyNj4oB0VarJQBZqUzgB4lWzSJe0ej12NJUfJWnJ9NRGA==",
"requires": {
"@walmart/tcnumber": "^2.3.3",
"@xstate/react": "^3.0.1",
--- package.json
@@ -116,7 +116,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.5.1",
- "@walmart/receipt-check-miniapp": "1.14.2",
+ "@walmart/receipt-check-miniapp": "1.14.3",
"@walmart/redux-store": "3.3.1",
"@walmart/returns-mini-app": "1.5.0",
"@walmart/schedule-mini-app": "0.37.0",
| update version | update version
|
616c6fb52089e48f823b5c617a361fc86814f989 | --- src/screens/RosterScreen.tsx
@@ -79,7 +79,7 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => {
associateA?.firstName?.localeCompare(associateB.firstName || '') || NO_SORT;
const sortedAssociateList = (associatesList: Associate[]) =>
- associatesList.sort(
+ [...associatesList].sort(
(associateA: Associate, associateB: Associate) =>
checkUserIsTeamLead(associateB) - checkUserIsTeamLead(associateA) ||
checkUserClockedIn(associateB) - checkUserClockedIn(associateA) ||
--- src/screens/RosterScreen.tsx
@@ -79,7 +79,7 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => {
associateA?.firstName?.localeCompare(associateB.firstName || '') || NO_SORT;
const sortedAssociateList = (associatesList: Associate[]) =>
- associatesList.sort(
+ [...associatesList].sort(
(associateA: Associate, associateB: Associate) =>
checkUserIsTeamLead(associateB) - checkUserIsTeamLead(associateA) ||
checkUserClockedIn(associateB) - checkUserClockedIn(associateA) ||
| update sorting logic | update sorting logic
|
44d00d9f219a7302dacc804694d6cde5c5944ddc | --- src/containers/UserHeader.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import {useSelector} from 'react-redux';
-import {StyleSheet} from 'react-native';
+import {StyleSheet, Text} from 'react-native';
import {UserSelectors, SiteSelectors} from '@walmart/redux-store';
import {Body, colors, ListItem, Switch} from '@walmart/gtp-shared-components';
@@ -18,6 +18,10 @@ const styles = StyleSheet.create({
avatar: {
marginRight: 6,
},
+ switchText: {
+ fontFamily: 'Bogle-Regular',
+ margin: 5,
+ },
});
export const UserHeader = () => {
@@ -39,10 +43,15 @@ export const UserHeader = () => {
title={name}
leading={<Avatar userId={userId} style={styles.avatar} viewer={true} />}
trailing={
- <Switch isOn={presence === 'online'} onValueChange={onStatusChange} />
+ <>
+ <Switch isOn={presence === 'online'} onValueChange={onStatusChange} />
+ <Text style={styles.switchText}>
+ {presence === 'online' ? 'Online' : 'Do not disturb'}
+ </Text>
+ </>
}>
<Body weight='400' size='small'>
- {presence === 'online' ? 'Online' : 'Offline'}
+ {'Clocked in/out'}
</Body>
</ListItem>
);
--- src/navigation/index.tsx
@@ -1,23 +1,21 @@
/* eslint-disable react-hooks/exhaustive-deps */
-import React, {useEffect, useMemo} from 'react';
-import {useSelector} from 'react-redux';
+import React, {useMemo} from 'react';
+// import {useSelector} from 'react-redux';
import {createStackNavigator} from '@react-navigation/stack';
import {DrawerButton, Header} from '@walmart/ui-components';
import {useSafeAreaInsets} from 'react-native-safe-area-context';
-import {SiteSelectors} from '@walmart/redux-store';
-import {useAppStateEffect} from '@walmart/allspark-utils';
+// import {SiteSelectors} from '@walmart/redux-store';
import {MessagesScreen} from '../screens/MessagesScreen';
import {TabsScreen} from '../screens/TabsScreen';
import {NewMessageScreen} from '../screens/NewMessageScreen';
-import {goOfflineForUser, goOnlineForUser} from '../presence/service';
import {ViewTeamScreen} from '../screens/ViewTeamScreen';
import {
SearchHeader,
SearchHeaderRight,
SearchScreen,
} from '../screens/SearchScreen';
-import {getEncryptedUserId} from '../redux/selectors';
+// import {getEncryptedUserId} from '../redux/selectors';
import {buildMessageScreenOptions} from './utils';
import {TextingNavParamsMap} from './types';
import {MESSAGES_SCREEN_NAME} from '../constants';
@@ -30,26 +28,13 @@ export * from './components';
export const TextingNavigation = () => {
const {top} = useSafeAreaInsets();
- const userId: string = useSelector(getEncryptedUserId);
- const storeId: string = useSelector(SiteSelectors.getUserWorkingSite);
+ // const userId: string = useSelector(getEncryptedUserId);
+ // const storeId: string = useSelector(SiteSelectors.getUserWorkingSite);
const messageScreenOptions = useMemo(() => buildMessageScreenOptions(top), [
top,
]);
- useAppStateEffect((state) => {
- if (state === 'active') {
- goOnlineForUser(storeId, userId);
- } else {
- goOfflineForUser(storeId, userId);
- }
- });
-
- useEffect(() => {
- goOnlineForUser(storeId, userId);
- return () => goOfflineForUser(storeId, userId);
- }, []);
-
return (
<TextingStack.Navigator
screenOptions={{
--- src/containers/UserHeader.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import {useSelector} from 'react-redux';
-import {StyleSheet} from 'react-native';
+import {StyleSheet, Text} from 'react-native';
import {UserSelectors, SiteSelectors} from '@walmart/redux-store';
import {Body, colors, ListItem, Switch} from '@walmart/gtp-shared-components';
@@ -18,6 +18,10 @@ const styles = StyleSheet.create({
avatar: {
marginRight: 6,
},
+ switchText: {
+ fontFamily: 'Bogle-Regular',
+ margin: 5,
+ },
});
export const UserHeader = () => {
@@ -39,10 +43,15 @@ export const UserHeader = () => {
title={name}
leading={<Avatar userId={userId} style={styles.avatar} viewer={true} />}
trailing={
- <Switch isOn={presence === 'online'} onValueChange={onStatusChange} />
+ <>
+ <Switch isOn={presence === 'online'} onValueChange={onStatusChange} />
+ <Text style={styles.switchText}>
+ {presence === 'online' ? 'Online' : 'Do not disturb'}
+ </Text>
+ </>
}>
<Body weight='400' size='small'>
- {presence === 'online' ? 'Online' : 'Offline'}
+ {'Clocked in/out'}
</Body>
</ListItem>
);
--- src/navigation/index.tsx
@@ -1,23 +1,21 @@
/* eslint-disable react-hooks/exhaustive-deps */
-import React, {useEffect, useMemo} from 'react';
-import {useSelector} from 'react-redux';
+import React, {useMemo} from 'react';
+// import {useSelector} from 'react-redux';
import {createStackNavigator} from '@react-navigation/stack';
import {DrawerButton, Header} from '@walmart/ui-components';
import {useSafeAreaInsets} from 'react-native-safe-area-context';
-import {SiteSelectors} from '@walmart/redux-store';
-import {useAppStateEffect} from '@walmart/allspark-utils';
+// import {SiteSelectors} from '@walmart/redux-store';
import {MessagesScreen} from '../screens/MessagesScreen';
import {TabsScreen} from '../screens/TabsScreen';
import {NewMessageScreen} from '../screens/NewMessageScreen';
-import {goOfflineForUser, goOnlineForUser} from '../presence/service';
import {ViewTeamScreen} from '../screens/ViewTeamScreen';
import {
SearchHeader,
SearchHeaderRight,
SearchScreen,
} from '../screens/SearchScreen';
-import {getEncryptedUserId} from '../redux/selectors';
+// import {getEncryptedUserId} from '../redux/selectors';
import {buildMessageScreenOptions} from './utils';
import {TextingNavParamsMap} from './types';
import {MESSAGES_SCREEN_NAME} from '../constants';
@@ -30,26 +28,13 @@ export * from './components';
export const TextingNavigation = () => {
const {top} = useSafeAreaInsets();
- const userId: string = useSelector(getEncryptedUserId);
- const storeId: string = useSelector(SiteSelectors.getUserWorkingSite);
+ // const userId: string = useSelector(getEncryptedUserId);
+ // const storeId: string = useSelector(SiteSelectors.getUserWorkingSite);
const messageScreenOptions = useMemo(() => buildMessageScreenOptions(top), [
top,
]);
- useAppStateEffect((state) => {
- if (state === 'active') {
- goOnlineForUser(storeId, userId);
- } else {
- goOfflineForUser(storeId, userId);
- }
- });
-
- useEffect(() => {
- goOnlineForUser(storeId, userId);
- return () => goOfflineForUser(storeId, userId);
- }, []);
-
return (
<TextingStack.Navigator
screenOptions={{
| changing offline status translations to dnd | changing offline status translations to dnd
|
77cbcc8e166e9754c2be72e9a64535969f543999 | --- packages/core-services-allspark/src/httpClient/interceptors/addCorrelationId.ts
@@ -20,4 +20,4 @@ export async function addCorrelationInterceptor(
}
return request;
-}
\ No newline at end of file
+}
--- packages/core-services-allspark/src/httpClient/interceptors/addImpersonation.ts
@@ -21,4 +21,4 @@ export async function addImpersonationInterceptor(
}
return request;
-}
\ No newline at end of file
+}
--- packages/core-services-allspark/src/httpClient/interceptors/addToken.ts
@@ -1,10 +1,7 @@
-import Axios, {
- InternalAxiosRequestConfig,
-} from 'axios';
+import Axios, { InternalAxiosRequestConfig } from 'axios';
import { AuthData } from '@walmart/redux-store';
import { IAllsparkLogger } from '../../types';
-
// Base interceptor applies the mandatory headers to http client. Applying
// token is main reason client is used so it must be present. We'll also
// merge given headers at time.
@@ -34,4 +31,4 @@ export async function addTokenInterceptor(
}
return request;
-}
\ No newline at end of file
+}
--- packages/core-services-allspark/src/httpClient/interceptors/errorLogger.ts
@@ -1,5 +1,9 @@
import axios, { InternalAxiosRequestConfig } from 'axios';
-import { RequestInterceptor, ResponseInterceptor, HttpClientError } from '@walmart/allspark-http-client';
+import {
+ RequestInterceptor,
+ ResponseInterceptor,
+ HttpClientError,
+} from '@walmart/allspark-http-client';
export interface NetInfo {
fetch: () => Promise<{
--- packages/core-services-allspark/src/httpClient/interceptors/headerSize.ts
@@ -1,6 +1,4 @@
-import Axios, {
- InternalAxiosRequestConfig,
-} from 'axios';
+import Axios, { InternalAxiosRequestConfig } from 'axios';
import { IAllsparkLogger } from '../../types';
import { getHeaderSizeBreakdown, reduceHeadersToSize } from '../utils';
--- packages/core-services-allspark/src/httpClient/interceptors/performance.ts
@@ -1,5 +1,8 @@
import { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
-import { RequestInterceptor, ResponseInterceptor } from '@walmart/allspark-http-client';
+import {
+ RequestInterceptor,
+ ResponseInterceptor,
+} from '@walmart/allspark-http-client';
export interface HttpMetric {
start: () => Promise<void>;
@@ -10,7 +13,6 @@ export interface HttpMetric {
export type CreateHttpMetric = (url?: string, method?: string) => HttpMetric;
-
export const setHttpMetric = (
httpMetric: HttpMetric,
response: AxiosResponse
--- packages/core-services-allspark/src/httpClient/interceptors/queueRequest.ts
@@ -1,7 +1,4 @@
-import {
- InternalAxiosRequestConfig,
- AxiosRequestConfig,
-} from 'axios';
+import { InternalAxiosRequestConfig, AxiosRequestConfig } from 'axios';
import { IAllsparkLogger } from '../../types';
import { HttpClientQueue } from '../queue';
@@ -26,4 +23,4 @@ export async function queueRequestInterceptor(
}
return request;
-}
\ No newline at end of file
+}
--- packages/core-services-allspark/src/httpClient/interceptors/successResponse.ts
@@ -25,4 +25,4 @@ export async function successResponseInterceptor(
}
return response;
-}
\ No newline at end of file
+}
| chore: lint fixes | chore: lint fixes
|
3a5b61e9f7475b35199d6e43563aa2c82da07e77 | --- src/channels/components/ChannelRow.tsx
@@ -124,7 +124,7 @@ export const ChannelRow = (props: ChannelRowProps) => {
const updatedLastMessage = shouldDisplayLastMessage
? lastMessage?.message
- : 'No messages found';
+ : t('channelsScreen.noMessagesFound');
const onChannelPress = () => {
navigation.navigate(ROOT_CONTAINER_SCREEN_NAME, {
--- src/channels/provider.tsx
@@ -37,6 +37,7 @@ import {
useTotalSiteOrTotalStore,
} from '../hooks';
import {analytics} from '../logger/Analytics';
+import {isNil} from 'lodash';
/**
* @description Maintains list of channels current user is participant in for the
@@ -99,7 +100,10 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => {
}
} else {
const lastMessageTimeInFirestore = doc.data()?.lastMessageTime;
- if (lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP) {
+ if (
+ !isNil(lastMessageTimeInFirestore) &&
+ lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP
+ ) {
teamChannelDoc.update({
participants: firestore.FieldValue.arrayUnion(viewerId),
lastMessageTime: firestore.FieldValue.serverTimestamp(),
@@ -138,7 +142,10 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => {
}
} else {
const lastMessageTimeInFirestore = doc.data()?.lastMessageTime;
- if (lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP) {
+ if (
+ !isNil(lastMessageTimeInFirestore) &&
+ lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP
+ ) {
storeChannelDoc.update({
participants: firestore.FieldValue.arrayUnion(viewerId),
lastMessageTime: firestore.FieldValue.serverTimestamp(),
--- src/screens/MessagesScreen.tsx
@@ -51,6 +51,8 @@ import {FirebaseMessage, LocalMessage, MessageRequest} from '../types';
import {createMessageList, decryptUserId} from '../utils';
import {AudioPlayerContext} from '../audio';
import {currentChannelIDRef} from '../notification';
+import {TEXTING_I18N_NAMESPACE} from '../translations';
+import {useTranslation} from 'react-i18next';
const styles = StyleSheet.create({
container: {
@@ -80,11 +82,14 @@ const DEFAULT_DETAILS = {
const PAGE_SIZE = 100;
-const ListEmptyComponent = () => (
- <View style={styles.emptyListPlaceHolder}>
- <Body>No messages found</Body>
- </View>
-);
+const ListEmptyComponent = () => {
+ const {t} = useTranslation([TEXTING_I18N_NAMESPACE]);
+ return (
+ <View style={styles.emptyListPlaceHolder}>
+ <Body>{t('channelsScreen.noMessagesFound')}</Body>
+ </View>
+ );
+};
export type MessagesScreenProps = {
navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.messages'>;
--- src/translations/en-US.ts
@@ -81,8 +81,9 @@ export const enUS = {
textingUnavailableDescription:
'Use your company-issued device to \ntext your team',
textingUnavailableForImpersonationOnBeta:
- 'You cannot text other associates since you are in impersonation mode', //Todo:This needs to be updated with the appropriate message
+ 'You cannot text other associates since you are in impersonation mode',
},
+ noMessagesFound: 'No messages found',
},
timestamp: {
monday: 'Monday',
--- src/translations/es-MX.ts
@@ -83,6 +83,7 @@ export const esMX = {
textingUnavailableForImpersonationOnBeta:
'No puedes enviar mensajes de texto a otros asociados porque estás en modo de suplantación', //Todo: This needs to updated with the proper translation
},
+ noMessagesFound: 'No messages found', //Todo: This needs to updated with the proper translation
},
timestamp: {
monday: 'Lunes',
--- src/channels/components/ChannelRow.tsx
@@ -124,7 +124,7 @@ export const ChannelRow = (props: ChannelRowProps) => {
const updatedLastMessage = shouldDisplayLastMessage
? lastMessage?.message
- : 'No messages found';
+ : t('channelsScreen.noMessagesFound');
const onChannelPress = () => {
navigation.navigate(ROOT_CONTAINER_SCREEN_NAME, {
--- src/channels/provider.tsx
@@ -37,6 +37,7 @@ import {
useTotalSiteOrTotalStore,
} from '../hooks';
import {analytics} from '../logger/Analytics';
+import {isNil} from 'lodash';
/**
* @description Maintains list of channels current user is participant in for the
@@ -99,7 +100,10 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => {
}
} else {
const lastMessageTimeInFirestore = doc.data()?.lastMessageTime;
- if (lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP) {
+ if (
+ !isNil(lastMessageTimeInFirestore) &&
+ lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP
+ ) {
teamChannelDoc.update({
participants: firestore.FieldValue.arrayUnion(viewerId),
lastMessageTime: firestore.FieldValue.serverTimestamp(),
@@ -138,7 +142,10 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => {
}
} else {
const lastMessageTimeInFirestore = doc.data()?.lastMessageTime;
- if (lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP) {
+ if (
+ !isNil(lastMessageTimeInFirestore) &&
+ lastMessageTimeInFirestore > SEVEN_DAYS_AGO_TIMESTAMP
+ ) {
storeChannelDoc.update({
participants: firestore.FieldValue.arrayUnion(viewerId),
lastMessageTime: firestore.FieldValue.serverTimestamp(),
--- src/screens/MessagesScreen.tsx
@@ -51,6 +51,8 @@ import {FirebaseMessage, LocalMessage, MessageRequest} from '../types';
import {createMessageList, decryptUserId} from '../utils';
import {AudioPlayerContext} from '../audio';
import {currentChannelIDRef} from '../notification';
+import {TEXTING_I18N_NAMESPACE} from '../translations';
+import {useTranslation} from 'react-i18next';
const styles = StyleSheet.create({
container: {
@@ -80,11 +82,14 @@ const DEFAULT_DETAILS = {
const PAGE_SIZE = 100;
-const ListEmptyComponent = () => (
- <View style={styles.emptyListPlaceHolder}>
- <Body>No messages found</Body>
- </View>
-);
+const ListEmptyComponent = () => {
+ const {t} = useTranslation([TEXTING_I18N_NAMESPACE]);
+ return (
+ <View style={styles.emptyListPlaceHolder}>
+ <Body>{t('channelsScreen.noMessagesFound')}</Body>
+ </View>
+ );
+};
export type MessagesScreenProps = {
navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.messages'>;
--- src/translations/en-US.ts
@@ -81,8 +81,9 @@ export const enUS = {
textingUnavailableDescription:
'Use your company-issued device to \ntext your team',
textingUnavailableForImpersonationOnBeta:
- 'You cannot text other associates since you are in impersonation mode', //Todo:This needs to be updated with the appropriate message
+ 'You cannot text other associates since you are in impersonation mode',
},
+ noMessagesFound: 'No messages found',
},
timestamp: {
monday: 'Monday',
--- src/translations/es-MX.ts
@@ -83,6 +83,7 @@ export const esMX = {
textingUnavailableForImpersonationOnBeta:
'No puedes enviar mensajes de texto a otros asociados porque estás en modo de suplantación', //Todo: This needs to updated with the proper translation
},
+ noMessagesFound: 'No messages found', //Todo: This needs to updated with the proper translation
},
timestamp: {
monday: 'Lunes',
| address review comments | address review comments
|
8071853d06ac462fbbac9efaa91f9c4fc4d0c78d | --- android/app/build.gradle
@@ -134,7 +134,7 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 39
+ versionCode 40
versionName "1.0.2"
}
splits {
--- ios/AllSpark/Info.plist
@@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>39</string>
+ <string>40</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>invmgmt</string>
--- ios/AllSparkTests/Info.plist
@@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>39</string>
+ <string>40</string>
</dict>
</plist>
| Incrementing build number | Incrementing build number
|
2b8d43151503b16b753931f24f32bf4f10147ec2 | --- packages/allspark-foundation-hub/src/SupplyChain/Components/TeamShiftSwitcher/TeamShiftSwitcher.tsx
@@ -116,7 +116,7 @@ export const TeamShiftSwitcher = ({
const fullTeamAndShiftText = generateTeamShiftText(
teamName,
- selectedShifts,
+ currentSelectedShifts,
DEFAULT_SHIFTS_COUNT,
showShifts,
showTeamName,
@@ -133,7 +133,9 @@ export const TeamShiftSwitcher = ({
allTeamData && showSubtext ? allTeamData.join(', ') : '';
const shiftText =
generateShiftText(
- selectedShifts.length ? currentSelectedShifts : shiftPreferenceData,
+ currentSelectedShifts.length
+ ? currentSelectedShifts
+ : shiftPreferenceData,
DEFAULT_SHIFTS_COUNT,
t
) ?? t('teamShiftSwitcher.defaultTeam');
@@ -144,7 +146,10 @@ export const TeamShiftSwitcher = ({
}`;
useEffect(() => {
- onTeamChange(currentSelectedTeamIds, allTeamData, currentSelectedShifts);
+ if (currentSelectedTeamIds.length) {
+ // Debug this for skipped onboarding user
+ onTeamChange(currentSelectedTeamIds, allTeamData, currentSelectedShifts);
+ }
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [currentSelectedTeamIds, currentSelectedShifts]);
--- packages/allspark-foundation-hub/src/SupplyChain/Screens/OnboardingScreen/OnboardingContext.tsx
@@ -49,6 +49,7 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => {
if (userPreferences === null) {
showOnboardingFlow();
+ return;
}
const myTeamsPreferences = (await (teamPreferenceData ||
shiftPreferenceData)) as string[];
@@ -56,6 +57,7 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => {
if (Array.isArray(myTeamsPreferences) && !myTeamsPreferences.length) {
// already onboarded
hideOnboardingFlow();
+ return;
}
return myTeamsPreferences;
} catch (error: any) {
@@ -66,7 +68,7 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => {
throw error;
}
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [onCompleted]);
+ }, [onCompleted, data]);
useEffect(() => {
if (eligibleForOnboarding) {
| feat(ui): edge case handling | feat(ui): edge case handling
|
129ec384cbda83ee48deecf6bffbb475862786e1 | --- docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.25.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.25.0...v1.25.1) (2025-04-04)
+
+
+### Bug Fixes
+
+* **ui:** update modal for roster and womconnect screens ([110e48f](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/110e48f955c09885e5fce6e09fcd186993e1d7e0))
+
# [1.25.0](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.24.0...v1.25.0) (2025-04-04)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/myteam-mini-app",
- "version": "1.25.0",
+ "version": "1.25.1",
"main": "dist/index.js",
"files": [
"dist"
| chore(release): 1.25.1 [skip ci] | chore(release): 1.25.1 [skip ci]
## [1.25.1](https://gecgithub01.walmart.com/smdv/myteam-miniapp/compare/v1.25.0...v1.25.1) (2025-04-04)
### Bug Fixes
* **ui:** update modal for roster and womconnect screens ([110e48f](https://gecgithub01.walmart.com/smdv/myteam-miniapp/commit/110e48f955c09885e5fce6e09fcd186993e1d7e0))
|
fe472a1a7c02697984b25aa9d7d01f4cf67095ea | --- packages/allspark-foundation/src/Site/redux.ts
@@ -4,6 +4,8 @@ import { InferActionTypes } from '../Redux/types';
import { AllsparkSiteService, Site } from './types';
export type SiteState = {
+ // @backwards-compatibility - some features directly referring to data which is now workingSite
+ data: Site | null;
workingSite: {
loading: boolean;
loaded: boolean;
@@ -19,6 +21,8 @@ export type SiteState = {
};
const INITIAL_STATE: SiteState = {
+ // @backwards-compatibility - some features directly referring to data which is now workingSite
+ data: null,
workingSite: {
loading: false,
loaded: false,
@@ -50,6 +54,7 @@ export const siteSlice = createSlice({
state.workingSite.loading = false;
state.workingSite.loaded = true;
state.workingSite.data = action.payload;
+ state.data = action.payload;
},
WORKING_SITE_ERROR: (state, action: PayloadAction<string>) => {
state.workingSite.loading = false;
| fix: add legacy data field in site slice for backwards compatability | fix: add legacy data field in site slice for backwards compatability
|
3c319143fa77f7b4e35e37612ee9ebe866fe0e17 | --- package.json
@@ -124,7 +124,7 @@
"@walmart/myteam-mini-app": "1.34.1",
"@walmart/native-rfid-scanner": "4.0.22",
"@walmart/onewalmart-miniapp": "1.0.27",
- "@walmart/pay-stub-miniapp": "0.21.4",
+ "@walmart/pay-stub-miniapp": "0.23.3",
"@walmart/payrollsolution_miniapp": "0.147.26",
"@walmart/price-changes-mini-app": "1.12.7",
"@walmart/profile-feature-app": "1.138.8",
--- yarn.lock
@@ -8600,7 +8600,7 @@ __metadata:
"@walmart/myteam-mini-app": "npm:1.34.1"
"@walmart/native-rfid-scanner": "npm:4.0.22"
"@walmart/onewalmart-miniapp": "npm:1.0.27"
- "@walmart/pay-stub-miniapp": "npm:0.21.4"
+ "@walmart/pay-stub-miniapp": "npm:0.23.3"
"@walmart/payrollsolution_miniapp": "npm:0.147.26"
"@walmart/price-changes-mini-app": "npm:1.12.7"
"@walmart/profile-feature-app": "npm:1.138.8"
@@ -8966,12 +8966,14 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/pay-stub-miniapp@npm:0.21.4":
- version: 0.21.4
- resolution: "@walmart/pay-stub-miniapp@npm:0.21.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fpay-stub-miniapp%2F-%2F%40walmart%2Fpay-stub-miniapp-0.21.4.tgz"
+"@walmart/pay-stub-miniapp@npm:0.23.3":
+ version: 0.23.3
+ resolution: "@walmart/pay-stub-miniapp@npm:0.23.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fpay-stub-miniapp%2F-%2F%40walmart%2Fpay-stub-miniapp-0.23.3.tgz"
peerDependencies:
"@walmart/allspark-foundation": "*"
- checksum: 10c0/7473e5640d5799a9d1a5c053a9596dfdb60148852a9ac2e284614bc355c2acca20663adbfb99baff6507f0179a54b1810117294e7fa16b2a0305ab8e38e844ca
+ expo: 51.0.0
+ expo-sharing: 12.0.1
+ checksum: 10c0/9f1c69c0ed7906c0d74553e1ed5ac8d9a4ee91d2097c85ac8b29cbdaf2d45ff81ff1b14dbc3178b93f18995023dc9d3e677e395d8433813718977dc22dfb8100
languageName: node
linkType: hard
| bump version (#4300) | bump version (#4300)
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com> |
7242f9717630b7eebdb4cc6c73381176d07b062a | --- package-lock.json
@@ -3025,12 +3025,13 @@
}
},
"@walmart/allspark-health-survey-mini-app": {
- "version": "0.0.38",
- "resolved": "https://npme.walmart.com/@walmart/allspark-health-survey-mini-app/-/allspark-health-survey-mini-app-0.0.38.tgz",
- "integrity": "sha512-6HkUeZT9FyDHzry06Ky+bksXtz/Ik3aUkFF51eGXHB19M7MyouvgdeTqhbtAdg1EW4V9kmmoMExDxd2VtOOpaA==",
+ "version": "0.0.41",
+ "resolved": "https://npme.walmart.com/@walmart/allspark-health-survey-mini-app/-/allspark-health-survey-mini-app-0.0.41.tgz",
+ "integrity": "sha512-+7wG5WGTPcL1wriTu0ZI/ftBnEG2CINdT9PD/NA/o6fiphqo9UCQz70bkfA7Yzsmd/rEGtbZqFXuYuvpo10Vgg==",
"requires": {
- "@walmart/patient-portal-mobile": "^2.1.13",
+ "@walmart/patient-portal-mobile": "2.1.14",
"crypto-js": "^3.3.0",
+ "mockdate": "^3.0.5",
"moment": "^2.29.1",
"react-native-qrcode-svg": "^6.0.6",
"react-native-svg": "^12.1.0",
@@ -3156,9 +3157,9 @@
"integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w=="
},
"@walmart/patient-portal-mobile": {
- "version": "2.1.13",
- "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.13.tgz",
- "integrity": "sha512-4nqT8D5dHRzrDTN7281Ck39GiUITofmnBtplWwKWQnHukrDfGy1M5NwzF2db9kgtoA1L5D7+XjQk4/Uo6zEhDw==",
+ "version": "2.1.14",
+ "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.14.tgz",
+ "integrity": "sha512-LhqS1Ogr1vi5Nj2/gIRPQnn/ogReKbIhXvXsLdDzltCibI5YGoKxHpReIQKp3YJ01xBUJyUBzrc3G/JCe7KYSg==",
"requires": {
"@react-native-community/datetimepicker": "^3.0.3",
"@walmart/react-native-collapsible": "1.5.3",
@@ -11220,6 +11221,11 @@
"minimist": "^1.2.5"
}
},
+ "mockdate": {
+ "version": "3.0.5",
+ "resolved": "https://npme.walmart.com/mockdate/-/mockdate-3.0.5.tgz",
+ "integrity": "sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ=="
+ },
"moment": {
"version": "2.29.1",
"resolved": "https://npme.walmart.com/moment/-/moment-2.29.1.tgz",
--- package.json
@@ -63,7 +63,7 @@
"@redux-saga/testing-utils": "^1.1.3",
"@sharcoux/slider": "^5.2.1",
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
- "@walmart/allspark-health-survey-mini-app": "0.0.38",
+ "@walmart/allspark-health-survey-mini-app": "0.0.41",
"@walmart/allspark-home-mini-app": "0.4.0",
"@walmart/allspark-me-mini-app": "0.1.0",
"@walmart/ask-sam-mini-app": "0.29.10",
| font change for health card | font change for health card
|
a70ca55f58ef2b7dbfd690a10e6fb5ec34043502 | --- container/package.json
@@ -43,7 +43,7 @@
"@shopify/flash-list": "1.7.3",
"@walmart/allspark-authentication": "6.4.1",
"@walmart/allspark-foundation": "^6.32.0",
- "@walmart/allspark-foundation-hub": "1.10.0-beta.4786+24314b58",
+ "@walmart/allspark-foundation-hub": "1.12.0-beta.4979+2eb5821e",
"@walmart/allspark-step-up-auth": "0.0.7-rc.5",
"@walmart/allspark-utils": "6.5.1",
"@walmart/associate-exp-hub-mini-app": "workspace:^",
--- packages/associate-exp-hub-mini-app/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/associate-exp-hub-mini-app",
- "version": "1.4.0-alpha.4",
+ "version": "1.4.0-alpha.5",
"packageManager": "yarn@4.6.0",
"engines": {
"node": ">=18"
@@ -34,7 +34,7 @@
"@types/react": "^18.2.45",
"@types/react-test-renderer": "^18.0.7",
"@walmart/allspark-foundation": "^6.32.0",
- "@walmart/allspark-foundation-hub": "1.10.0-beta.4786+24314b58",
+ "@walmart/allspark-foundation-hub": "1.12.0-beta.4979+2eb5821e",
"@walmart/gtp-shared-components": "2.2.4",
"@walmart/me-at-walmart-common": "6.29.0-alpha.0",
"eslint": "^8.19.0",
@@ -57,7 +57,7 @@
},
"peerDependencies": {
"@walmart/allspark-foundation": ">=6.32.0",
- "@walmart/allspark-foundation-hub": "1.10.0-beta.4786+24314b58",
+ "@walmart/allspark-foundation-hub": "1.12.0-beta.4979+2eb5821e",
"expo": "52.x",
"expo-image": "*",
"react": "*",
--- yarn.lock
@@ -6561,9 +6561,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/allspark-foundation-hub@npm:1.10.0-beta.4786+24314b58":
- version: 1.10.0-beta.4786
- resolution: "@walmart/allspark-foundation-hub@npm:1.10.0-beta.4786::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.10.0-beta.4786.tgz"
+"@walmart/allspark-foundation-hub@npm:1.12.0-beta.4979+2eb5821e":
+ version: 1.12.0-beta.4979
+ resolution: "@walmart/allspark-foundation-hub@npm:1.12.0-beta.4979::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-foundation-hub%2F-%2F%40walmart%2Fallspark-foundation-hub-1.12.0-beta.4979.tgz"
peerDependencies:
"@react-navigation/native": 6.x
"@walmart/allspark-foundation": ">=6.27"
@@ -6573,7 +6573,7 @@ __metadata:
react: "*"
react-native: "*"
react-native-safe-area-context: 4.x
- checksum: 10c0/08d7eb22978217c37746bde51e0d7003e5235d014d2203dde43721572e42a12d10243580825e9b8eb01b5c886bd95a3599c922da0db460145f47fe9e2711e372
+ checksum: 10c0/5285297b4f9ec1257cf736f1999959501ff330c428151929225076cc3fb84e992fa3e5878e983f2428542d959999792e7575fe58ce51e3f4b4ec3d7c3b876a5b
languageName: node
linkType: hard
@@ -6729,7 +6729,7 @@ __metadata:
"@types/react-test-renderer": "npm:^18.0.7"
"@walmart/allspark-authentication": "npm:6.4.1"
"@walmart/allspark-foundation": "npm:^6.32.0"
- "@walmart/allspark-foundation-hub": "npm:1.10.0-beta.4786+24314b58"
+ "@walmart/allspark-foundation-hub": "npm:1.12.0-beta.4979+2eb5821e"
"@walmart/allspark-step-up-auth": "npm:0.0.7-rc.5"
"@walmart/allspark-utils": "npm:6.5.1"
"@walmart/associate-exp-hub-mini-app": "workspace:^"
@@ -6845,7 +6845,7 @@ __metadata:
"@types/react": "npm:^18.2.45"
"@types/react-test-renderer": "npm:^18.0.7"
"@walmart/allspark-foundation": "npm:^6.32.0"
- "@walmart/allspark-foundation-hub": "npm:1.10.0-beta.4786+24314b58"
+ "@walmart/allspark-foundation-hub": "npm:1.12.0-beta.4979+2eb5821e"
"@walmart/gtp-shared-components": "npm:2.2.4"
"@walmart/me-at-walmart-common": "npm:6.29.0-alpha.0"
eslint: "npm:^8.19.0"
@@ -6867,7 +6867,7 @@ __metadata:
typescript: "npm:~5.3.3"
peerDependencies:
"@walmart/allspark-foundation": ">=6.32.0"
- "@walmart/allspark-foundation-hub": 1.10.0-beta.4786+24314b58
+ "@walmart/allspark-foundation-hub": 1.12.0-beta.4979+2eb5821e
expo: 52.x
expo-image: "*"
react: "*"
| feat(ui): update associate exp hub version | feat(ui): update associate exp hub version
|
906cd47d22b31e3c8a300169f035b48dee779a1b | --- core/src/features/timeclock.tsx
@@ -27,7 +27,6 @@ const OldTimeClockFeature = new AllsparkFeature('timeclock_v1');
// All functionality added here should be part of that module along with other screens, redux, etc.
const TimeClockLocalStorage = OldTimeClockFeature.createLocalStorage({});
-// console.log('New time-->', NewTimeClockFeature);
const GEO_VALIDATION_KEY = 'impersonation_geo_validation';
@@ -127,7 +126,6 @@ const OldTimeClock = OldTimeClockFeature.createModule({
listeners: {
feature: {
onConnect: () => {
- console.log('Old Time clock connected!');
// --- Need a init function from timeclock here! --- //
const {
@@ -153,7 +151,6 @@ const OldTimeClock = OldTimeClockFeature.createModule({
);
},
onDisconnect: () => {
- console.log('Old Time clock disconnected!');
// --- Need a cleanup function from timeclock here! --- //
HomeDashboardContainer.remove('TimeClockCard');
AllsparkComponentContainers.remove('Home.Temporary', 'TimeClock.Toast');
| Removed rouge console logs | Removed rouge console logs
|
3ff929a920d9bf25ceba8370409b92b56e94a4d8 | --- package.json
@@ -89,7 +89,7 @@
"@walmart/counts-component-miniapp": "0.0.42",
"@walmart/emergency-mini-app": "1.15.0",
"@walmart/exception-mini-app": "1.0.14",
- "@walmart/facilities-management-miniapp": "0.4.2-beta45-rc1",
+ "@walmart/facilities-management-miniapp": "0.4.2-beta47",
"@walmart/feedback-all-spark-miniapp": "0.9.9",
"@walmart/financial-wellbeing-feature-app": "1.0.64",
"@walmart/functional-components": "2.0.6",
| Update package.json | Update package.json |
10ff114fc2eda9d28722b720b51bc71d1f9d5557 | --- package.json
@@ -98,7 +98,7 @@
"@walmart/attendance-mini-app": "patch:@walmart/attendance-mini-app@npm:3.176.0#~/.yarn/patches/@walmart-attendance-mini-app-npm-3.176.0-b8336306f0.patch",
"@walmart/avp-feature-app": "0.28.47",
"@walmart/avp-shared-library": "0.27.26",
- "@walmart/ax-components": "@walmart/ax-components@1.4.0-beta.5491+0c19f2ff1",
+ "@walmart/ax-components": "1.4.0-beta.5491+0c19f2ff1",
"@walmart/backroom-mini-app": "1.17.11",
"@walmart/beneficiary-online-mini-app": "0.1.26",
"@walmart/beneficiary-online-shared-library": "1.2.7",
--- src/app/tabs/_layout.tsx
@@ -1,11 +1,11 @@
import React, {useCallback, useEffect} from 'react';
-import {StyleSheet, TouchableOpacity, View,} from 'react-native';
+import {Platform, StyleSheet, TouchableOpacity, View,} from 'react-native';
import {useNavigation} from '@react-navigation/native';
import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
import {HeaderButtonProps} from '@react-navigation/elements';
import {ClockSelectors, ComponentsModule, useAllsparkSelector, useAllsparkTranslation, UserSelectors, HeaderTitle} from '@walmart/allspark-foundation';
-import {useMyWalmartTabConfig, TabBarBaseHeight} from '@/components/BottomNav';
+import {useMyWalmartTabConfig, TabBarBaseHeight, TabBarBottomPadding} from '@/components/BottomNav';
import {useShouldShowFab} from '@/hooks/useShouldShowFab';
import ForYou from './for-you';
import TodaysPlan from './todays-plan';
@@ -56,7 +56,12 @@ export default function TabsNavigation() {
// Show FAB only when myWalmartV2 is enabled - additional internal feature flag provides safety
useSidekickAssistantFABFocusEffect({
visible: shouldShowFab,
- insets: {bottom: TabBarBaseHeight + SIDEKICK_ASSISTANT_FAB_INSETS}
+ insets: {
+ bottom: Platform.select({
+ android: TabBarBottomPadding + TabBarBaseHeight + SIDEKICK_ASSISTANT_FAB_INSETS,
+ ios: TabBarBaseHeight + SIDEKICK_ASSISTANT_FAB_INSETS
+ })
+ }
});
// Memoize the headerLeft component to prevent flickering during tab transitions.
--- yarn.lock
@@ -7981,9 +7981,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/ax-components@npm:1.3.3":
- version: 1.3.3
- resolution: "@walmart/ax-components@npm:1.3.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fax-components%2F-%2F%40walmart%2Fax-components-1.3.3.tgz"
+"@walmart/ax-components@npm:1.4.0-beta.5491+0c19f2ff1":
+ version: 1.4.0-beta.5491
+ resolution: "@walmart/ax-components@npm:1.4.0-beta.5491::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fax-components%2F-%2F%40walmart%2Fax-components-1.4.0-beta.5491.tgz"
peerDependencies:
"@expo/vector-icons": ~14.1.0
"@walmart/gtp-shared-components-3": "*"
@@ -7991,7 +7991,7 @@ __metadata:
react: 19.x
react-dom: 19.x
react-native: 0.79.x
- checksum: 10c0/316da34cad2535bb1ff53801017707eb870c9357c9de11dd8c7aa588758c56b56c3402f5fdf97e34c0a4b1297f270dd05cbd0fa2f829b2951a4a7c10d17fbf59
+ checksum: 10c0/347eb282ef9847dac6f3c6975dd2ecc40e72b2536f00516888249ce2efda7cb9e13174d9cbe394996b897e84495a2235bdcd9d77aab3f092cdc43350f15548d5
languageName: node
linkType: hard
@@ -8867,7 +8867,7 @@ __metadata:
"@walmart/attendance-mini-app": "patch:@walmart/attendance-mini-app@npm:3.176.0#~/.yarn/patches/@walmart-attendance-mini-app-npm-3.176.0-b8336306f0.patch"
"@walmart/avp-feature-app": "npm:0.28.47"
"@walmart/avp-shared-library": "npm:0.27.26"
- "@walmart/ax-components": "npm:1.3.3"
+ "@walmart/ax-components": "npm:1.4.0-beta.5491+0c19f2ff1"
"@walmart/backroom-mini-app": "npm:1.17.11"
"@walmart/beneficiary-online-mini-app": "npm:0.1.26"
"@walmart/beneficiary-online-shared-library": "npm:1.2.7"
| fix(ui): updated package version and FAB padding | fix(ui): updated package version and FAB padding
|
2b4edce91c02fab16f1cc37fdef39fd06bbaf9bc | --- CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [6.35.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.0-alpha.0...v6.35.0) (2025-08-28)
+
+**Note:** Version bump only for package @walmart/me-at-walmart
+
+
+
+
+
# [6.35.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v1.31.2...v6.35.0-alpha.0) (2025-08-28)
--- lerna.json
@@ -1,5 +1,5 @@
{
- "version": "6.35.0-alpha.0",
+ "version": "6.35.0",
"npmClient": "yarn",
"changelogPreset": "angular",
"command": {
--- packages/core-services-allspark/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [6.35.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.0-alpha.0...v6.35.0) (2025-08-28)
+
+**Note:** Version bump only for package @walmart/core-services-allspark
+
+
+
+
+
# [6.35.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v1.31.2...v6.35.0-alpha.0) (2025-08-28)
--- packages/core-services-allspark/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/core-services-allspark",
- "version": "6.35.0-alpha.0",
+ "version": "6.35.0",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/core-widget-registry/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [6.35.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.0-alpha.0...v6.35.0) (2025-08-28)
+
+**Note:** Version bump only for package @walmart/core-widget-registry
+
+
+
+
+
# [6.35.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v1.31.2...v6.35.0-alpha.0) (2025-08-28)
--- packages/core-widget-registry/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/core-widget-registry",
- "version": "6.35.0-alpha.0",
+ "version": "6.35.0",
"description": "Repo for Me@Walmart related widget registries",
"author": "rlane1 <russell.lane@walmart.com>",
"license": "ISC",
--- packages/me-at-walmart-common/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [6.35.0](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.35.0-alpha.0...v6.35.0) (2025-08-28)
+
+**Note:** Version bump only for package @walmart/me-at-walmart-common
+
+
+
+
+
# [6.35.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark/compare/v1.31.2...v6.35.0-alpha.0) (2025-08-28)
--- packages/me-at-walmart-common/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-common",
- "version": "6.35.0-alpha.0",
+ "version": "6.35.0",
"description": "Common utilities and components for Me@Walmat mini apps",
"main": "lib/index.js",
"types": "lib/index.d.ts",
--- packages/me-at-walmart-container/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [6.35.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.0-alpha.0...v6.35.0) (2025-08-28)
+
+**Note:** Version bump only for package @walmart/me-at-walmart-container
+
+
+
+
+
# [6.35.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v1.31.2...v6.35.0-alpha.0) (2025-08-28)
--- packages/me-at-walmart-container/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-container",
- "version": "6.35.0-alpha.0",
+ "version": "6.35.0",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
| chore(version): updating package version | chore(version): updating package version
|
301bb3194e6c1a75356d5f348da1c0364e24399e | --- android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,9 @@
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
+
+ <uses-feature android:name="android.hardware.microphone" android:required="true" />
+
<queries>
<package android:name="com.walmart.sso.app" />
</queries>
| adding system window and network state configs for all-spark core manifest | adding system window and network state configs for all-spark core manifest
|
4017008759962f344aabaca5ab5bdec524a29630 | --- package-lock.json
@@ -1870,9 +1870,9 @@
}
},
"@walmart/ask-sam-mini-app": {
- "version": "0.6.16",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.16.tgz",
- "integrity": "sha512-GM7zCXxrLrbpSWnBsslG5P4zK55RbbO/wa1ChjLaps6YUk5OF+Av+f1ScLuOfIEJeqOtRHQBHSxwoUF4GbynzQ==",
+ "version": "0.6.17",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.6.17.tgz",
+ "integrity": "sha512-/r3rojdZ8fH7ZsTgDWKX4iyp/mcd0oU7elgsfUQ+JVjUBtalO/ijDsEpt6azkeHb/gZgLijPhYnC7qICayXSKg==",
"requires": {
"apisauce": "^1.1.2",
"lodash": "^4.17.19",
--- package.json
@@ -42,7 +42,7 @@
"@types/lodash": "^4.14.159",
"@walmart/allspark-home-mini-app": "0.1.1",
"@walmart/allspark-me-mini-app": "0.0.5",
- "@walmart/ask-sam-mini-app": "^0.6.16",
+ "@walmart/ask-sam-mini-app": "^0.6.17",
"@walmart/config-components": "^1.0.4",
"@walmart/functional-components": "^1.0.22",
"@walmart/gtp-shared-components": "^0.2.2",
| ask sam version bump (#130) | ask sam version bump (#130)
|
ad1004037fc772d5dba198c1d3f8db95512cd219 | --- packages/me-at-walmart-container/__tests__/services/logger.test.ts
@@ -1,4 +1,4 @@
-import {LoggerClient, LoggerClientManager, LoggerLevel, OVERRIDES } from '../../src/services/logger';
+import {LoggerClient, LoggerClientManager, OVERRIDES } from '../../src/services/logger';
import {DefaultLogger} from '@walmart/react-native-logger';
import { SESSION_ID } from '../../src/session';
| cleanup | cleanup
|
a129234e3c5da04ad64a5b93566a5753b69ae954 | --- src/index.tsx
@@ -75,6 +75,7 @@ initNotificationListeners();
export const MeganavTextingScreen = MeganavScreen;
+
export const TextingMiniApp = () => {
const persistenceEnabledValue: boolean = useSelector(
setFirestorePersistenceEnabled,
--- src/presence/sagas.ts
@@ -1,10 +1,14 @@
-import {select, call, delay} from 'redux-saga/effects';
+import {select, call, delay, takeLatest} from 'redux-saga/effects';
import {
DNDAutoSwitchThreshold,
DNDOfflineTimeLimit,
getEncryptedUserId,
} from '../redux/selectors';
-import {SiteSelectors} from '@walmart/redux-store';
+import {
+ SiteSelectors,
+ ClockStatusTypes,
+ ClockCheckSuccess,
+} from '@walmart/redux-store';
import {getLastOfflineTime, goOnlineForUser} from './service';
import {isNil} from 'lodash';
@@ -47,3 +51,23 @@ export function* DoNotDisturbAutoResetSaga() {
}
}
}
+
+export function* GoOnlineOnClockOut(action: ClockCheckSuccess) {
+ const clockStatus = action?.payload?.clockStatus;
+ console.log(
+ 'DoNotDisturbAutoResetSaga: GoOnlineOnClockOut clockStatus ' + clockStatus,
+ );
+ if (clockStatus === '2') {
+ const userId: string = yield select(getEncryptedUserId);
+ const storeId: string = yield select(SiteSelectors.getUserWorkingSite);
+ console.log(
+ 'DoNotDisturbAutoResetSaga: GoOnlineOnClockOut going online for ' +
+ userId,
+ );
+ yield call(goOnlineForUser, storeId, userId);
+ }
+}
+
+export function* DoNotDisturbGoOnlineOnClockOutSaga() {
+ yield takeLatest(ClockStatusTypes.CLOCK_CHECK_SUCCESS, GoOnlineOnClockOut);
+}
--- src/presence/service.ts
@@ -15,6 +15,7 @@ export const goOnlineForUser = (storeId: string, userId: string) => {
.doc(userDocument)
.set(FIRESTORE_ONLINE_DATA, {merge: true})
.then(() => {
+ //TODO: Add analytics event for the online set
clearLastOfflineTime().catch((e: Error) => {
logger.error('unable to clear last offline time in async storage', {
message: e.message,
@@ -34,6 +35,7 @@ export const goOfflineForUser = (storeId: string, userId: string) => {
.doc(userDocument)
.set(FIRESTORE_OFFLINE_DATA, {merge: true})
.then(() => {
+ //TODO: Add analytics event for the offline set
setLastOfflineTimeForAsyncStorage().catch((e: any) => {
logger.error('Could not set user offline status in async storage', {
message: e.toString(),
--- src/index.tsx
@@ -75,6 +75,7 @@ initNotificationListeners();
export const MeganavTextingScreen = MeganavScreen;
+
export const TextingMiniApp = () => {
const persistenceEnabledValue: boolean = useSelector(
setFirestorePersistenceEnabled,
--- src/presence/sagas.ts
@@ -1,10 +1,14 @@
-import {select, call, delay} from 'redux-saga/effects';
+import {select, call, delay, takeLatest} from 'redux-saga/effects';
import {
DNDAutoSwitchThreshold,
DNDOfflineTimeLimit,
getEncryptedUserId,
} from '../redux/selectors';
-import {SiteSelectors} from '@walmart/redux-store';
+import {
+ SiteSelectors,
+ ClockStatusTypes,
+ ClockCheckSuccess,
+} from '@walmart/redux-store';
import {getLastOfflineTime, goOnlineForUser} from './service';
import {isNil} from 'lodash';
@@ -47,3 +51,23 @@ export function* DoNotDisturbAutoResetSaga() {
}
}
}
+
+export function* GoOnlineOnClockOut(action: ClockCheckSuccess) {
+ const clockStatus = action?.payload?.clockStatus;
+ console.log(
+ 'DoNotDisturbAutoResetSaga: GoOnlineOnClockOut clockStatus ' + clockStatus,
+ );
+ if (clockStatus === '2') {
+ const userId: string = yield select(getEncryptedUserId);
+ const storeId: string = yield select(SiteSelectors.getUserWorkingSite);
+ console.log(
+ 'DoNotDisturbAutoResetSaga: GoOnlineOnClockOut going online for ' +
+ userId,
+ );
+ yield call(goOnlineForUser, storeId, userId);
+ }
+}
+
+export function* DoNotDisturbGoOnlineOnClockOutSaga() {
+ yield takeLatest(ClockStatusTypes.CLOCK_CHECK_SUCCESS, GoOnlineOnClockOut);
+}
--- src/presence/service.ts
@@ -15,6 +15,7 @@ export const goOnlineForUser = (storeId: string, userId: string) => {
.doc(userDocument)
.set(FIRESTORE_ONLINE_DATA, {merge: true})
.then(() => {
+ //TODO: Add analytics event for the online set
clearLastOfflineTime().catch((e: Error) => {
logger.error('unable to clear last offline time in async storage', {
message: e.message,
@@ -34,6 +35,7 @@ export const goOfflineForUser = (storeId: string, userId: string) => {
.doc(userDocument)
.set(FIRESTORE_OFFLINE_DATA, {merge: true})
.then(() => {
+ //TODO: Add analytics event for the offline set
setLastOfflineTimeForAsyncStorage().catch((e: any) => {
logger.error('Could not set user offline status in async storage', {
message: e.toString(),
| adding new saga | adding new saga
|
c9f36c073812718f3c1fb7fc3833c507ba5ef010 | --- packages/allspark-foundation/__tests__/User/connect.test.ts
@@ -0,0 +1,85 @@
+import { AllsparkReduxStore } from '../../src/Redux';
+import { connectUserService, fetch, impersonate } from '../../src/User/connect';
+import { AllsparkUserService, User } from '../../src/User/types';
+
+import { UserSelectors } from '../../src/User/selectors';
+
+describe('User/connect.ts', () => {
+ let userService: AllsparkUserService;
+ const mockData = {
+ userId: 'userId',
+ countryCode: 'US',
+ } as User;
+
+ beforeEach(() => {
+ userService = {
+ fetch: jest.fn(),
+ impersonate: jest.fn(),
+ };
+ });
+
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
+
+ describe('fetch', () => {
+ test('should fetch user data successfully', async () => {
+ (userService.fetch as jest.Mock).mockResolvedValue(mockData);
+
+ await fetch.call(userService);
+
+ expect(userService.fetch).toHaveBeenCalled();
+
+ expect(AllsparkReduxStore.select(UserSelectors.getUserId)).toEqual(
+ mockData.userId
+ );
+
+ expect(AllsparkReduxStore.select(UserSelectors.getLoaded)).toEqual(true);
+ });
+
+ test('should not fetch user', async () => {
+ const error = new Error('Test error');
+
+ (userService.fetch as jest.Mock).mockRejectedValue(error);
+
+ await expect(fetch.call(userService)).rejects.toThrow(error);
+
+ expect(AllsparkReduxStore.select(UserSelectors.getError)).toEqual(
+ error?.message
+ );
+ });
+ });
+
+ describe('impersonate', () => {
+ test('should impersonate user data successfully', async () => {
+ (userService.impersonate as jest.Mock).mockResolvedValue({
+ ...mockData,
+ token: 'token',
+ });
+
+ await impersonate.call(userService);
+
+ expect(userService.impersonate).toHaveBeenCalled();
+
+ expect(AllsparkReduxStore.select(UserSelectors.getImpersonated)).toEqual(
+ true
+ );
+
+ expect(
+ AllsparkReduxStore.select(UserSelectors.getImpersonateeToken)
+ ).toEqual('token');
+ });
+ });
+
+ describe('connectUserService', () => {
+ let extendedUser: AllsparkUserService;
+
+ beforeEach(() => {
+ extendedUser = connectUserService(userService);
+ });
+
+ test('should return an object with extended methods', () => {
+ expect(extendedUser).toEqual(expect.objectContaining(userService));
+ });
+ });
+});
| test for user/connect | test for user/connect
|
5958e1ab9ce8c7e54043bb0b8549d5551a52fbdb | --- src/screens/ViewTeamScreen.tsx
@@ -72,7 +72,7 @@ export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => {
});
} else {
navigation.setOptions({
- title: t('storeChatCard.title'),
+ title: t('rosterScreen.storeChatCard.title'),
});
}
}, [teamData, navigation, t]);
--- src/screens/ViewTeamScreen.tsx
@@ -72,7 +72,7 @@ export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => {
});
} else {
navigation.setOptions({
- title: t('storeChatCard.title'),
+ title: t('rosterScreen.storeChatCard.title'),
});
}
}, [teamData, navigation, t]);
| translation on whole store | translation on whole store
|
513b3ba146d25ea1949fcd779ecf092fb8dcfe61 | --- package-lock.json
@@ -4331,9 +4331,9 @@
}
},
"@walmart/push-to-talk-mini-app": {
- "version": "0.5.63",
- "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.63.tgz",
- "integrity": "sha512-w3tR+udicd4yFM0XBFhyExs9pCvDkTGn0KGzkHvMmoIAbJyvAPmtqhFyeBoHqHfwYpaC6owpP0xNMuPTkFylHQ=="
+ "version": "0.5.64",
+ "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.64.tgz",
+ "integrity": "sha512-rq3+jtBa+uJCkLJdEUxFhGyZxtxWU43Lk96RbRVINwE+zAqcnd3cqSIcLFLHHxoc97BhWxrxPEoxOrzjnBmrJw=="
},
"@walmart/react-native-collapsible": {
"version": "1.5.3",
--- package.json
@@ -88,7 +88,7 @@
"@walmart/manager-approvals-miniapp": "0.0.58",
"@walmart/metrics-mini-app": "0.4.14",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/push-to-talk-mini-app": "0.5.63",
+ "@walmart/push-to-talk-mini-app": "0.5.64",
"@walmart/react-native-env": "^0.2.0",
"@walmart/react-native-logger": "^1.28.0",
"@walmart/react-native-shared-navigation": "^0.4.0",
@@ -133,6 +133,7 @@
"react-native-hyperlink": "0.0.19",
"react-native-image-picker": "^4.0.6",
"react-native-linear-gradient": "^2.5.6",
+ "react-native-loudness": "^2.0.0",
"react-native-maps": "^0.30.1",
"react-native-modal": "^11.5.6",
"react-native-pager-view": "^5.4.9",
@@ -140,8 +141,6 @@
"react-native-permissions": "3.0.0",
"react-native-popup-menu": "^0.15.9",
"react-native-ptt-module": "1.5.39",
- "realm": "10.8.0",
- "react-native-loudness": "^2.0.0",
"react-native-qrcode-svg": "^6.0.6",
"react-native-reanimated": "^1.10.2",
"react-native-safe-area-context": "^3.3.0",
@@ -170,6 +169,7 @@
"react-native-wm-telemetry": "^0.3.0",
"react-native-wm-voice-text": "^0.5.0",
"react-redux": "^7.2.1",
+ "realm": "10.8.0",
"redux": "^4.0.5",
"redux-devtools-extension": "^2.13.8",
"redux-saga": "^1.1.3",
| bumping ptt version | bumping ptt version
|
bfdd49180bca133832421dfb15513feee50904bb | --- packages/allspark-foundation/src/Navigation/provider.tsx
@@ -29,6 +29,7 @@ export const AllsparkNavigationProvider = (
return (
<RenderGuard preRender={preRender}>
<NavigationContainer
+ navigationInChildEnabled={true}
{...AllsparkNavigationClient.NavigationContainerProps}
>
<ModalfyProvider {...AllsparkNavigationClient.ModalProviderProps}>
| fix: enable deprecated nested child navigation | fix: enable deprecated nested child navigation
|
f4560d1d18e26ba455be541e10de1f18bb5a0963 | --- package-lock.json
@@ -64,7 +64,7 @@
"@walmart/onewalmart-miniapp": "1.0.14",
"@walmart/pay-stub-miniapp": "0.9.35",
"@walmart/payrollsolution_miniapp": "0.130.46",
- "@walmart/price-changes-mini-app": "1.9.6",
+ "@walmart/price-changes-mini-app": "1.9.7",
"@walmart/profile-feature-app": "0.252.0",
"@walmart/push-to-talk-mini-app": "1.12.1",
"@walmart/react-native-encrypted-storage": "1.1.3",
@@ -5641,9 +5641,9 @@
}
},
"node_modules/@walmart/price-changes-mini-app": {
- "version": "1.9.6",
- "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.9.6.tgz",
- "integrity": "sha512-z6sdqRpXM/fr2qU84ccBzToDqtQNMQnq6pY9pneXMTi4wpzZ5IVthuUAimaBigeu+KEYcXio0T7FRMVCHgTRww==",
+ "version": "1.9.7",
+ "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.9.7.tgz",
+ "integrity": "sha512-WvfjtqJwKwIWu/wy0wZumXMrpa6zFcA031SPX7qX8LZ076y5UtJrDurUNDlt1MM8Rh7bp4pteQbnh93zxjS8hw==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -25303,9 +25303,9 @@
}
},
"@walmart/price-changes-mini-app": {
- "version": "1.9.6",
- "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.9.6.tgz",
- "integrity": "sha512-z6sdqRpXM/fr2qU84ccBzToDqtQNMQnq6pY9pneXMTi4wpzZ5IVthuUAimaBigeu+KEYcXio0T7FRMVCHgTRww=="
+ "version": "1.9.7",
+ "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.9.7.tgz",
+ "integrity": "sha512-WvfjtqJwKwIWu/wy0wZumXMrpa6zFcA031SPX7qX8LZ076y5UtJrDurUNDlt1MM8Rh7bp4pteQbnh93zxjS8hw=="
},
"@walmart/profile-feature-app": {
"version": "0.252.0"
--- package.json
@@ -106,7 +106,7 @@
"@walmart/onewalmart-miniapp": "1.0.14",
"@walmart/pay-stub-miniapp": "0.9.35",
"@walmart/payrollsolution_miniapp": "0.130.46",
- "@walmart/price-changes-mini-app": "1.9.6",
+ "@walmart/price-changes-mini-app": "1.9.7",
"@walmart/profile-feature-app": "0.252.0",
"@walmart/push-to-talk-mini-app": "1.12.1",
"@walmart/react-native-encrypted-storage": "1.1.3",
| Bump price changes v1.9.7 | Bump price changes v1.9.7
|
d003be37286ef7e40deeacb88cdf0a5d8d65dcf6 | --- .looper.multibranch.yml
@@ -91,6 +91,8 @@ envs:
GIT_COMMIT_ID: 'unset'
GIT_COMMIT_URL: 'unset'
+ START_TIME: 'unset'
+ END_TIME: 'unset'
APP_TITLE: "AllSpark-Core"
SLACK_WEBHOOK: "https://hooks.slack.com/services/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"
@@ -382,7 +384,10 @@ flows:
- call: build-release(prod)
# this is for producing builds that will get uploaded to proximity as snapshot
+
build-snapshot:
+ - var(START_TIME):
+ date +%s
- (name Install Dependencies) npm install
- declare(buildOutput)
- declare(buildAabOutput)
@@ -591,6 +596,9 @@ flows:
# @param buildOutput - output file from build
# @param release_url - App Center install url for this build
# @param BUILD_NUMBER - the build number / version code of the build
+
+ TIME_ELAPSED: ($(timestamp "START_TIME") - $(timestamp "END_TIME"))
+
slack-success:
- exposeVars(./fastlane/fastlane-session.json)
- echo "INSTALL_LINK ${fastlane-session.release_url}"
@@ -598,6 +606,14 @@ flows:
echo "${slackIcon} ${osIcon} ${releaseType} ${version}"
- var(FILE_SIZE):
ls -l ${buildOutput} | cut -d " " -f 8 | awk '{print $1/1000000}'
+ - var(END_TIME):
+ date +%s
+ - var(TIME_ELAPSED):
+ $((START_TIME - END_TIME))
+ - var(MINUTES):
+ $(((TIME_ELAPSED % 3600) / 60))
+ - var(SECONDS):
+ $((((TIME_ELAPSED%3600) / 60) % 60))
- slack.postMessage:
message: $MESSAGE_TITLE
channelId: ${slackChannel}
@@ -637,7 +653,7 @@ flows:
- type: mrkdwn
text: "*Looper job* ${env} #:<${BUILD_URL}|${BUILD_NUMBER}>"
- type: mrkdwn
- text: "*Github Repo:* <${GITHUB_BRANCH_URL}|URL> - FS: ${FILE_SIZE}"
+ text: "*Github Repo:* <${GITHUB_BRANCH_URL}|URL> - FS: ${FILE_SIZE} - BT: ${MINUTES} ${SECONDS}"
- type: divider
# send failure message to slack
| Update .looper.multibranch.yml | Update .looper.multibranch.yml
|
dbe0cbfb8a36da2dd8e076c3cca6f285a185b217 | --- __tests__/redux/CreateRestarableSagasTest.ts
@@ -47,10 +47,12 @@ describe('createRestartableSagas', () => {
TestActionSpawnIterator.next();
// Fail it first
- expect(
- TestActionSpawnIterator.throw(new Error(localFailureMessage)).value,
- ).toEqual(
- call(logger.error, SAGA_ERROR_STRING, {message: localFailureMessage}),
+ const error = new Error(localFailureMessage);
+ expect(TestActionSpawnIterator.throw(error).value).toEqual(
+ call(logger.error, SAGA_ERROR_STRING, {
+ message: localFailureMessage,
+ stack: error.stack,
+ }),
);
// Restart the saga
--- __tests__/sumo/SumoSagasTest.ts
@@ -37,6 +37,8 @@ import {
} from '../../src/redux';
import {
getSumoCharged,
+ getSumoChargeError,
+ getSumoCharging,
getSumoOptIn,
getSumoProfile,
SumoActionCreators,
@@ -167,16 +169,37 @@ describe('waitForSumoCharge', () => {
it('handles when already charged', () => {
const iterator = waitForSumoCharge();
expect(iterator.next().value).toEqual(select(getSumoCharged));
+ expect(iterator.next(true).value).toEqual(select(getSumoCharging));
+ expect(iterator.next(false).value).toEqual(select(getSumoChargeError));
+ expect(iterator.next(false).done).toEqual(true);
+ });
+
+ it('handles when not charged but has charge error', () => {
+ const iterator = waitForSumoCharge();
+ expect(iterator.next().value).toEqual(select(getSumoCharged));
+ expect(iterator.next(false).value).toEqual(select(getSumoCharging));
+ expect(iterator.next(false).value).toEqual(select(getSumoChargeError));
expect(iterator.next(true).done).toEqual(true);
});
- it('handles when not charged', () => {
+ it('handles when not charged and not charging', () => {
const iterator = waitForSumoCharge();
expect(iterator.next().value).toEqual(select(getSumoCharged));
+ expect(iterator.next(false).value).toEqual(select(getSumoCharging));
+ expect(iterator.next(false).value).toEqual(select(getSumoChargeError));
expect(iterator.next(false).value).toEqual(fork(chargeSumo));
expect(iterator.next().value).toEqual(take(SumoTypes.CHARGE_SUCCESS));
expect(iterator.next().done).toEqual(true);
});
+
+ it('handles when not charged and charging', () => {
+ const iterator = waitForSumoCharge();
+ expect(iterator.next().value).toEqual(select(getSumoCharged));
+ expect(iterator.next(false).value).toEqual(select(getSumoCharging));
+ expect(iterator.next(true).value).toEqual(select(getSumoChargeError));
+ expect(iterator.next(false).value).toEqual(take(SumoTypes.CHARGE_SUCCESS));
+ expect(iterator.next().done).toEqual(true);
+ });
});
describe('getPreHireProfile', () => {
@@ -462,7 +485,8 @@ describe('onTokenChanged', () => {
const token = '12355';
const iterator = onTokenChanged();
expect(iterator.next().value).toEqual(select(getAuthToken));
- expect(iterator.next(token).value).toEqual(
+ expect(iterator.next(token).value).toEqual(call(waitForSumoCharge));
+ expect(iterator.next().value).toEqual(
call(WmNotification.setAuthToken, token),
);
expect(iterator.next().done).toBe(true);
--- src/redux/CreateRestartableSagas.ts
@@ -11,9 +11,10 @@ export const createRestartableSaga = (saga: Effect) => {
yield saga;
});
break;
- } catch (e) {
+ } catch (e: any) {
yield call(logger.error, SAGA_ERROR_STRING, {
message: e.message,
+ stack: e.stack,
});
}
}
--- src/sumo/SumoRedux.ts
@@ -70,6 +70,14 @@ export const getSumoCharged = createSelector(
[getSumoState],
(state) => state.charged,
);
+export const getSumoCharging = createSelector(
+ [getSumoState],
+ (state) => state.charging,
+);
+export const getSumoChargeError = createSelector(
+ [getSumoState],
+ (state) => state.chargeError,
+);
export const getSumoOptIn = createSelector(
[getSumoState],
(state) => state.optIn,
--- src/sumo/SumoSagas.ts
@@ -49,6 +49,8 @@ import {
getSumoCharged,
getSumoOptIn,
getSumoProfile,
+ getSumoCharging,
+ getSumoChargeError,
} from './SumoRedux';
import {NotificationRef} from './SumoEvents';
import AsyncStorage from '@react-native-community/async-storage';
@@ -105,9 +107,14 @@ export function* chargeSumo(): any {
// If not charged, will pause execution until charge success or failure
export function* waitForSumoCharge(): any {
- const sumoCharged: boolean = yield select(getSumoCharged);
- if (!sumoCharged) {
- yield fork(chargeSumo);
+ const charged: boolean = yield select(getSumoCharged);
+ const charging: boolean = yield select(getSumoCharging);
+ const chargeError: string | null = yield select(getSumoChargeError);
+
+ if (!charged && !chargeError) {
+ if (!charging) {
+ yield fork(chargeSumo);
+ }
yield take(SumoTypes.CHARGE_SUCCESS);
}
}
@@ -251,6 +258,7 @@ export function* onUserChange() {
export function* onTokenChanged() {
const token: string = yield select(getAuthToken);
+ yield call(waitForSumoCharge);
yield call(WmNotification.setAuthToken, token);
}
| Waiting for sumo charge before setting auth token. | Waiting for sumo charge before setting auth token.
|
94b4454630461d3a79cb08ffae3de1a753f1d704 | --- package-lock.json
@@ -2958,9 +2958,9 @@
}
},
"@walmart/allspark-health-survey-mini-app": {
- "version": "0.0.19",
- "resolved": "https://npme.walmart.com/@walmart/allspark-health-survey-mini-app/-/allspark-health-survey-mini-app-0.0.19.tgz",
- "integrity": "sha512-aSnEUZb7GBHTjelnYvNBu4R6iWJo6c61bjLas66YTXlSX8Jh1/BLaO8cctMCMi3mCwrnNkwCK1bbKShXXqL/QQ==",
+ "version": "0.0.20",
+ "resolved": "https://npme.walmart.com/@walmart/allspark-health-survey-mini-app/-/allspark-health-survey-mini-app-0.0.20.tgz",
+ "integrity": "sha512-WhQjWqCUM6gwG53rykoWpfbbQqyvHHxlqHQ6gIr5pUt19ld0G2+oCmBPeO6xKc5y0QXyIX984pmoRNiBqOQi2g==",
"requires": {
"@walmart/patient-portal-mobile": "^2.0.4",
"moment": "^2.29.1",
@@ -2988,9 +2988,9 @@
}
},
"@walmart/allspark-me-mini-app": {
- "version": "0.0.15",
- "resolved": "https://npme.walmart.com/@walmart/allspark-me-mini-app/-/allspark-me-mini-app-0.0.15.tgz",
- "integrity": "sha512-xCWZZRR64hFKmbMZMWDLz7k3FrOBknQiHkm4pMoiDPQaleyVy2v1gUUPUwqishmivHabvdJlBQoBv9RNI/ZwLg==",
+ "version": "0.0.16",
+ "resolved": "https://npme.walmart.com/@walmart/allspark-me-mini-app/-/allspark-me-mini-app-0.0.16.tgz",
+ "integrity": "sha512-UN2HLMZw39I0mD1H17o/6fCLFO7wTC3vakKLbPySuL4xL+8T5XxZBo00RaJ+glomnhLe1eNJbua03oUrZ1fjfw==",
"requires": {
"reselect": "^4.0.0"
}
@@ -3061,9 +3061,9 @@
"integrity": "sha512-iTkDEL7GeYYS8laso4ECQ7DyHgBxnJh/uP5PJNQMHZyKb8niIwIwb19HFLuGBVRa9vZIjTz7mChSydbIn4KV0w=="
},
"@walmart/patient-portal-mobile": {
- "version": "2.0.4",
- "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.0.4.tgz",
- "integrity": "sha512-7iDdxujty897q77fo/6g3+VnGsM/gRD1MHWs5vpOjD0+GF6DcQXYmw2YO3MGJDpREnsYPLx3KIO1uwKuNF9KKg==",
+ "version": "2.1.0",
+ "resolved": "https://npme.walmart.com/@walmart/patient-portal-mobile/-/patient-portal-mobile-2.1.0.tgz",
+ "integrity": "sha512-awo3UG0eKWq4D/XvVFt31POMFkF2KnpfrkIby4ff11IpNsHRqvaj4AsrTUtp9vOMcebKSHO7Xp/cRyT5t4X29A==",
"requires": {
"@react-native-community/datetimepicker": "^3.0.3",
"@walmart/react-native-collapsible": "1.5.3",
@@ -3121,15 +3121,32 @@
"integrity": "sha512-/2QStrLatWqZuSGvGhosemz4kt3dg95Zo5TAvE2AV+GOod1Qyuqzbz70/5CAifuAOPTtK/ihXMCj5xwlMA5SVw=="
},
"@walmart/schedule-mini-app": {
- "version": "0.2.38",
- "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.2.38.tgz",
- "integrity": "sha512-oIskeDydw05dBmsds8by07/CQ+vzBnsSq2ifepvtr4qCBDrkUdRwxlmKbd1YE1eAry2L8QgQVEmImYlWi+OQXQ==",
+ "version": "0.2.42",
+ "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.2.42.tgz",
+ "integrity": "sha512-cl/RTHGzJyRSe12sBda3uuEIJG4rryBpiI9q2U5aPI+4cDQ2qLkq84Cz6bwc6us/KKPstHcKCkg1h8W/Bb3r5Q==",
"requires": {
"@walmart/moment-walmart": "^1.0.4",
"@walmart/wfm-ui": "^0.1.29",
"react-native-tab-view": "^2.15.2",
"reselect": "^4.0.0",
- "wfm-allspark-data-library": "0.0.11"
+ "wfm-allspark-data-library": "0.0.13"
+ },
+ "dependencies": {
+ "moment": {
+ "version": "2.24.0",
+ "resolved": "https://npme.walmart.com/moment/-/moment-2.24.0.tgz",
+ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+ },
+ "wfm-allspark-data-library": {
+ "version": "0.0.13",
+ "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.0.13.tgz",
+ "integrity": "sha512-v5AejVnCJyCP6+AgJuSMMqseH/eNanbVuY1zEPZ0apheOmWjOBD7Lp/U36lqm8QhfQf44bLRKWMUA/oDfpsc1g==",
+ "requires": {
+ "azure-storage": "2.10.3",
+ "moment": "2.24.0",
+ "url": "^0.11.0"
+ }
+ }
}
},
"@walmart/settings-mini-app": {
@@ -3172,9 +3189,9 @@
"integrity": "sha512-lYh4gj+ie2/KP1LzWUWW5hyS6DTUZez1Q4MIx9YUJaXCKU6knb9u746g9D3Q8yj/6u8+XiEL32kDJh/kKcCxBA=="
},
"@walmart/wfm-ui": {
- "version": "0.1.33",
- "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.1.33.tgz",
- "integrity": "sha512-i77QGnSz7E5rcoFQlIYFhYkMAvMiu1GZSg/mTxxIjOdS7zDPLMvEElw1IMtxVj61R/TU0D37YnhCWuiHBl+9GQ==",
+ "version": "0.1.34",
+ "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.1.34.tgz",
+ "integrity": "sha512-/ys9R1s3hCv81D2Vvz6Ej+kaAGMTHmXGi6NeSgis21ASzpx2JEt3rmhgQUBTWVj+E8RUpXZe7UO1aVpHozBG+Q==",
"requires": {
"@walmart/gtp-shared-components": "^0.2.2",
"@walmart/moment-walmart": "1.0.3",
--- package.json
@@ -45,9 +45,9 @@
"@react-navigation/stack": "^5.9.0",
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@types/lodash": "^4.14.159",
- "@walmart/allspark-health-survey-mini-app": "0.0.19",
+ "@walmart/allspark-health-survey-mini-app": "0.0.20",
"@walmart/allspark-home-mini-app": "^0.1.8",
- "@walmart/allspark-me-mini-app": "0.0.15",
+ "@walmart/allspark-me-mini-app": "0.0.16",
"@walmart/ask-sam-mini-app": "0.7.9",
"@walmart/config-components": "1.0.8",
"@walmart/feedback-all-spark-miniapp": "0.0.31",
@@ -61,11 +61,11 @@
"@walmart/react-native-logger": "^1.17.0",
"@walmart/react-native-shared-navigation": "^0.2.0",
"@walmart/redux-store": "^1.0.11",
- "@walmart/schedule-mini-app": "0.2.38",
+ "@walmart/schedule-mini-app": "0.2.42",
"@walmart/settings-mini-app": "1.1.8",
"@walmart/time-clock-mini-app": "0.1.14",
- "@walmart/welcomeme-mini-app": "0.5.18",
"@walmart/ui-components": "1.0.89",
+ "@walmart/welcomeme-mini-app": "0.5.18",
"i18next": "^19.7.0",
"intl": "^1.2.5",
"javascript-time-ago": "2.3.3",
| Bumping schedule, me & health-survey (#262) | Bumping schedule, me & health-survey (#262)
* Bumping schedule, me & health-survey
* Bumping schedule mini app
0.2.41
* Bumping schedule-mini-app
* Removing caret from schedule-mini-app |
cc806799429cddf62943f3e2002b3254d513eeb3 | --- packages/allspark-graphql-client/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [0.0.4](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@0.0.3...@walmart/allspark-graphql-client@0.0.4) (2023-01-11)
+
+**Note:** Version bump only for package @walmart/allspark-graphql-client
+
+
+
+
+
## [0.0.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-graphql-client@0.0.2...@walmart/allspark-graphql-client@0.0.3) (2023-01-11)
**Note:** Version bump only for package @walmart/allspark-graphql-client
--- packages/allspark-graphql-client/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-graphql-client",
- "version": "0.0.3",
+ "version": "0.0.4",
"description": "> TODO: description",
"license": "ISC",
"main": "lib/index.js",
--- packages/allspark-redux-store/CHANGELOG.md
@@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+## [1.0.3](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-redux-store@1.0.2...@walmart/allspark-redux-store@1.0.3) (2023-01-11)
+
+**Note:** Version bump only for package @walmart/allspark-redux-store
+
+
+
+
+
## [1.0.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-redux-store@1.0.1...@walmart/allspark-redux-store@1.0.2) (2023-01-11)
**Note:** Version bump only for package @walmart/allspark-redux-store
--- packages/allspark-redux-store/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-redux-store",
- "version": "1.0.2",
+ "version": "1.0.3",
"description": "Common redux store for allspark platform",
"author": "rlane1 <russell.lane@walmart.com>",
"homepage": "",
| chore(version): updating package version | chore(version): updating package version
- @walmart/allspark-graphql-client@0.0.4
- @walmart/allspark-redux-store@1.0.3
|
4c167097f6b3786c2204349f4c52e966158fd6c9 | --- core/src/oneClick/DataSelector.tsx
@@ -1,5 +1,7 @@
import {createSelector} from 'reselect';
import {IAllsparkReduxState} from '@walmart/allspark-foundation/Redux';
+import { ConfigSelectors } from '@walmart/allspark-foundation/Config';
+
export const getAppConfig = (state: IAllsparkReduxState): any =>
state?.appConfig;
--- core/src/oneClick/OneClickSagas.tsx
@@ -1,4 +1,5 @@
import {takeLatest, select, put} from 'redux-saga/effects';
+import {useSelector} from 'react-redux';
import {createRestartableSaga} from '@walmart/allspark-utils';
import {Logger} from '../core/Logger';
@@ -9,13 +10,13 @@ import {
NavConfigSelectors,
} from '@walmart/allspark-foundation/Navigation';
import {updateMegaNavCCM} from './utility/updateMegaNavCCM';
-import {AppConfigSelector} from './DataSelector';
+import { ConfigSelectors } from '@walmart/allspark-foundation/Config';
import {ConfigActionTypes} from '@walmart/allspark-foundation/Config';
export function* onOneClickRequest(): any {
try {
// App config data
- const appConfigData = yield select(AppConfigSelector);
+ const appConfigData = useSelector(ConfigSelectors.getData);
// If no meganav data, stop here
const meganavData: NavConfigData = yield select(NavConfigSelectors.getData);
| ALLSPARK-3962: Updated to use foundation | ALLSPARK-3962: Updated to use foundation
|
ebefb50940d5e193a2694287803e2e0f9cbe6b89 | --- src/services/PushNotificationApi.ts
@@ -22,8 +22,8 @@ interface IPushNotificationApi {
imageUrl?: string,
audioUrl?: string,
) => Promise<any>;
- goToMessageScreenForChannel: any; //TODO: Create type
- playAudioMessageOrCatch: any; //TODO: Create type
+ goToMessageScreenForChannel: (storeNumber: string, channelId: string) => void;
+ playAudioMessageOrCatch: (remoteURI: string) => void;
}
const BasePushNotificationApi = CommonHttpClient.clone(
--- src/services/PushNotificationApi.ts
@@ -22,8 +22,8 @@ interface IPushNotificationApi {
imageUrl?: string,
audioUrl?: string,
) => Promise<any>;
- goToMessageScreenForChannel: any; //TODO: Create type
- playAudioMessageOrCatch: any; //TODO: Create type
+ goToMessageScreenForChannel: (storeNumber: string, channelId: string) => void;
+ playAudioMessageOrCatch: (remoteURI: string) => void;
}
const BasePushNotificationApi = CommonHttpClient.clone(
| fix types for api | fix types for api
|
3ce806c725e5b4ca6daa175c38094bfd1ed45491 | --- android/app/build.gradle
@@ -436,3 +436,4 @@ android {
configurations.implementation.exclude(group: 'com.google.firebase', module: 'protolite-well-known-types')
configurations.implementation.exclude(group: 'com.google.protobuf', module: 'protobuf-javalite')
configurations.implementation.exclude(group: 'com.google.protobuf', module: 'protobuf-lite')
+configurations.implementation.exclude(group: 'com.squareup.okhttp3', module: 'okhttp')
--- android/build.gradle
@@ -40,7 +40,7 @@ buildscript {
classpath("de.undercouch:gradle-download-task:5.0.1")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
- classpath 'com.google.gms:google-services:4.3.3'
+ classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.0'
classpath 'com.google.firebase:perf-plugin:1.4.1'
classpath 'com.walmart.ssmp:android-signing:1.0.9'
| Added okhttp in exclude to avoid duplicate class found in modules | Added okhttp in exclude to avoid duplicate class found in modules
|
ff35f411495a494650dff82008cff0db352cb3cf | --- package-lock.json
@@ -4525,9 +4525,9 @@
}
},
"@walmart/welcomeme-mini-app": {
- "version": "0.41.0",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.41.0.tgz",
- "integrity": "sha512-G4Y5T8QrBBsD9cmNQU20KAQ8MifTmSC4RMx4Kzc/eJHyOxxGTDtBiZSaXFQlqQ2zVr0RPs16+K3mmMndQvIvXg=="
+ "version": "0.42.0",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.42.0.tgz",
+ "integrity": "sha512-NKk1wAZ4ffg6AkwLdLCXPIXyOku4k07PTwhdWjHG6pqUmhcKfcGScywVsYi7mtIiM0ym1IzrOOM88B5+36mgyA=="
},
"@walmart/wfm-ui": {
"version": "0.2.8",
--- package.json
@@ -104,7 +104,7 @@
"@walmart/shelfavailability-mini-app": "0.7.0",
"@walmart/time-clock-mini-app": "0.4.24",
"@walmart/ui-components": "v1.3.0-rc.6",
- "@walmart/welcomeme-mini-app": "0.41.0",
+ "@walmart/welcomeme-mini-app": "0.42.0",
"@walmart/wfm-ui": "0.2.8",
"axios-cache-adapter": "2.7.3",
"crypto-js": "^3.3.0",
| chore(welcomeMe): WelcomeME Version Bump | chore(welcomeMe): WelcomeME Version Bump
|
29003b19489643139975004627cfcce813fd58e0 | --- .gitignore
@@ -67,6 +67,9 @@ dist/
container/env.js
container/env.ts
+test-report.xml
+
+
#amplify-do-not-edit-begin
amplify/\#current-cloud-backend
amplify/.config/local-*
--- test-report.xml
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testExecutions version="1">
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/screens/RootScreen/ClockedOutScreenGuardTest.tsx">
- <testCase name="ClockedOutScreenGuard all application screens disabled when user clocked out" duration="28"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/screens/TabsScreen/TabsScreenTest.tsx">
- <testCase name="TabScreenTest should render tabs screen with expected elements" duration="0"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/logger/LoggerTest.tsx">
- <testCase name="myTeamLogger should set config" duration="13"/>
- <testCase name="myTeamLogger should log debug messages" duration="1"/>
- <testCase name="myTeamLogger should log error messages with additional checks" duration="2"/>
- <testCase name="myTeamLogger should not log error messages if there is no params" duration="1"/>
- <testCase name="myTeamLogger should set session info messages with user object" duration="1"/>
- <testCase name="myTeamLogger should clone config with fields" duration="1"/>
- <testCase name="myTeamLogger should set logLevel" duration="0"/>
- <testCase name="myTeamLogger should log info messages" duration="1"/>
- <testCase name="myTeamLogger should log warn messages" duration="0"/>
- <testCase name="myTeamLogger should set user info" duration="0"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/logger/analytics-test.tsx">
- <testCase name="Texting analytics shall log with sampling rate 100" duration="11"/>
- <testCase name="Texting analytics shall default sampling rate to 100 if its not passed in" duration="2"/>
- <testCase name="Texting analytics shall not log with sampling rate 0" duration="2"/>
- <testCase name="Texting analytics shall log with sampling rate 1 when random number generates less than 1" duration="2"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/utils/UserTest.tsx">
- <testCase name="associateDisplayName should return preferred full name when available" duration="14"/>
- <testCase name="associateDisplayName should return legal full name when preferred full name is not available" duration="1"/>
- <testCase name="associateDisplayName should return associate user ID when both preferred and legal full names are not available" duration="1"/>
- <testCase name="associateDisplayName should return an empty string when associate is undefined" duration="1"/>
- <testCase name="associateDisplayName should return an empty string when associate is null" duration="1"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/hooks/userTest.tsx">
- <testCase name="useUserIsInRoster hook test useUserIsInRoster hook - return true if working site and home site are the same" duration="62"/>
- <testCase name="useUserIsInRoster hook test useUserIsInRoster hook - return false if working site and home site are different" duration="19"/>
- <testCase name="useUserIsInRoster hook test useUserIsInRoster hook - return false if working site is null" duration="20"/>
- <testCase name="useUserIsInRoster hook test useUserIsInRoster hook - return false if home site is null" duration="18"/>
- <testCase name="useIsHourly hook test useIsHourly hook - return true if associate pay is hourly" duration="11"/>
- <testCase name="useIsHourly hook test useIsHourly hook - return false if associate pay is not hourly" duration="10"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/screens/MeganavScreen/MeganavScreenTest.tsx">
- <testCase name="MeganavScreenTest should render meganav screen" duration="6871"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/screens/ChannelsScreen/ChannelsScreenTest.tsx">
- <testCase name="ChannelsScreenTest should render channels screen" duration="6870"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/screens/RosterScreen/RosterScreenTest.tsx">
- <testCase name="RosterScreenTest should render roster screen" duration="6873"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/screens/SearchScreen/SearchScreenTest.tsx">
- <testCase name="SearchScreenTest should render search screen" duration="6871"/>
- <testCase name="SearchScreenTest should render tabs screen with expected elements2" duration="19"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/components/ErrorComponentTest.tsx">
- <testCase name="ErrorComponent tests ErrorComponent snapshot test" duration="795"/>
- <testCase name="ErrorComponent tests should render ErrorComponent" duration="24"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/containers/WarningBannerTest.tsx">
- <testCase name="WarningBanner component should render when dismissBanner is false" duration="760"/>
- <testCase name="WarningBanner component should not render when dismissBanner is true" duration="11"/>
- </file>
- <file path="/Users/p0d02sx/AllSpark/directedVoice/myteam-miniapp/__tests__/navigation/ComponentTest.tsx">
- <testCase name="LivingDesignTabBar renders livingDesignTabBar correctly" duration="1367"/>
- <testCase name="LivingDesignTabBar renders correct number of tabs" duration="12"/>
- <testCase name="LivingDesignTabBar calls navigation.navigate on tab press" duration="13"/>
- <testCase name="LivingDesignTabBar doesnt call navigation.navigate on tab press" duration="16"/>
- <testCase name="LivingDesignTabBar renders tab label correctly" duration="4"/>
- <testCase name="LivingDesignTabBar renders tab label correctly if route doesnt have name value" duration="4"/>
- </file>
-</testExecutions>
\ No newline at end of file
| Update test | Update test
|
cad80cc0aedfc83898f9f222472fc492b8264bbe | --- packages/allspark-foundation-hub/src/HubFeature/Hooks/useGetAllTeamsOfStore.ts
@@ -3,7 +3,7 @@ import { useGetTeamsByStoreQuery } from '@walmart/me-at-walmart-athena-queries';
import { useState } from 'react';
import moment from 'moment-timezone';
import { TeamSwitcherTypes } from '../Hub/TeamSwitcher';
-import { ADMIN_SUPPORT_TEAMLABEL } from '../constant';
+import { ADMIN_SUPPORT_TEAMLABEL, PLATFORM_NAME } from '../constant';
import { UserSelectors } from '@walmart/allspark-foundation/User';
import { SiteSelectors } from '@walmart/allspark-foundation/Site';
import { Images } from '../Images/images';
@@ -40,7 +40,7 @@ export const useGetAllTeamsOfStore = () => {
context: {
headers: {
'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId,
- 'x-o-platform': 'manager-experience',
+ 'x-o-platform': PLATFORM_NAME,
'x-o-platform-version': getVersion(),
},
},
--- packages/allspark-foundation-hub/src/HubFeature/Hooks/useUserPreferences.ts
@@ -7,6 +7,7 @@ import { getVersion } from 'react-native-device-info';
import { Images } from '../Images/images';
import { TeamSwitcherTypes } from '../Hub/TeamSwitcher/types';
import { LoggerService } from '@walmart/allspark-foundation/Logger';
+import { PLATFORM_NAME } from '../constant';
export const sorter = (data: TeamSwitcherTypes[]): TeamSwitcherTypes[] => {
const TOTAL_STORE = 'Total store';
@@ -49,7 +50,7 @@ export const useUserPreferences = () => {
context: {
headers: {
'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId,
- 'x-o-platform': 'manager-experience',
+ 'x-o-platform': PLATFORM_NAME,
'x-o-platform-version': getVersion(),
},
},
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/TeamSelectionList.tsx
@@ -17,7 +17,7 @@ import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigatio
import { LoggerService } from '@walmart/allspark-foundation/Logger';
import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry';
import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation';
-import { FEATURE_ID } from '../../constant';
+import { FEATURE_ID, PLATFORM_NAME } from '../../constant';
import {
ManagerExperienceCreators,
ManagerExperienceSelectors,
@@ -71,7 +71,7 @@ export const TeamSelectionList = ({
context: {
headers: {
'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId,
- 'x-o-platform': 'manager-experience',
+ 'x-o-platform': PLATFORM_NAME,
'x-o-platform-version': getVersion(),
},
},
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Hooks/useTeamsByStore.ts
@@ -6,6 +6,7 @@ import moment from 'moment';
import { getVersion } from 'react-native-device-info';
import { useSelector } from 'react-redux';
import { Team } from '../types';
+import { PLATFORM_NAME } from '../../constant';
export const useTeamsByStore = () => {
const logger = LoggerService.getContainerInstance();
@@ -36,7 +37,7 @@ export const useTeamsByStore = () => {
context: {
headers: {
'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId,
- 'x-o-platform': 'manager-experience',
+ 'x-o-platform': PLATFORM_NAME,
'x-o-platform-version': getVersion(),
},
},
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Screens/TeamSelection.tsx
@@ -17,7 +17,7 @@ import { LoggerService } from '@walmart/allspark-foundation/Logger';
import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry';
import { useTeamsByStore } from '../Hooks/useTeamsByStore';
import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigation';
-import { FEATURE_ID } from '../../constant';
+import { FEATURE_ID, PLATFORM_NAME } from '../../constant';
import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation';
import { AllsparkEnvironment } from '@walmart/allspark-foundation/Environment';
import { getVersion } from 'react-native-device-info';
@@ -50,7 +50,7 @@ export const TeamSelection = () => {
context: {
headers: {
'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId,
- 'x-o-platform': 'manager-experience',
+ 'x-o-platform': PLATFORM_NAME,
'x-o-platform-version': getVersion(),
},
},
--- packages/allspark-foundation-hub/src/HubFeature/constant.ts
@@ -10,3 +10,4 @@ export const TOTAL_STORE_TEAMID = 'total';
export const TOTAL_STORE_TEAMLABEL = 'Total store';
export const MYTEAMS_TEAMID = 'myTeams';
export const MYTEAMS_TEAMLABEL = 'My teams';
+export const PLATFORM_NAME = 'manager-experience';
| feat(ui): added a constant for platform name | feat(ui): added a constant for platform name
|
2411719e23bc7cfeeb49a3fa533c3357a529eb14 | --- patches/@walmart+wfm-ui+0.2.24.patch
@@ -1,24 +0,0 @@
-diff --git a/node_modules/@walmart/wfm-ui/dist/schedule/scheduled-weeks/index.js b/node_modules/@walmart/wfm-ui/dist/schedule/scheduled-weeks/index.js
-index ea736d5..6d98721 100644
---- a/node_modules/@walmart/wfm-ui/dist/schedule/scheduled-weeks/index.js
-+++ b/node_modules/@walmart/wfm-ui/dist/schedule/scheduled-weeks/index.js
-@@ -1,5 +1,6 @@
- import React, { Component } from 'react';
--import { Text, View, ViewPropTypes } from 'react-native';
-+import { Text, View } from 'react-native';
-+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
- import PropTypes from 'prop-types';
- import XDate from 'xdate';
- import dateutils from '../../dateutils';
-diff --git a/node_modules/@walmart/wfm-ui/src/schedule/scheduled-weeks/index.js b/node_modules/@walmart/wfm-ui/src/schedule/scheduled-weeks/index.js
-index eae609f..a4bb578 100644
---- a/node_modules/@walmart/wfm-ui/src/schedule/scheduled-weeks/index.js
-+++ b/node_modules/@walmart/wfm-ui/src/schedule/scheduled-weeks/index.js
-@@ -1,5 +1,6 @@
- import React, { Component } from 'react';
--import { Text, View, ViewPropTypes } from 'react-native';
-+import { Text, View } from 'react-native';
-+import { ViewPropTypes } from 'deprecated-react-native-prop-types';
- import PropTypes from 'prop-types';
-
- import XDate from 'xdate';
| Delete patch for package wfm-ui | Delete patch for package wfm-ui
|
c547996294437fa2d79917d7c096a8cedb22a4a5 | --- package-lock.json
@@ -87,7 +87,7 @@
"@walmart/receipt-check-miniapp": "1.18.7",
"@walmart/redux-store": "3.7.0",
"@walmart/returns-mini-app": "3.13.0",
- "@walmart/schedule-mini-app": "0.88.0",
+ "@walmart/schedule-mini-app": "0.89.0",
"@walmart/shelfavailability-mini-app": "1.5.19",
"@walmart/store-feature-orders": "1.25.0",
"@walmart/taskit-mini-app": "2.53.3",
@@ -9752,9 +9752,9 @@
}
},
"node_modules/@walmart/schedule-mini-app": {
- "version": "0.88.0",
- "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.88.0.tgz",
- "integrity": "sha512-jHCc4j9rC0Vl39BQmw1FAWu8tHzK0fcpnFH1lmkQuFNpmwB7bD6qg7b4/ROyrVfYrf4wn/z6DGsaHxcvOHLb4w==",
+ "version": "0.89.0",
+ "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.89.0.tgz",
+ "integrity": "sha512-phFODb42rl9K25duuWbYjB3WaaYwYwDsMEZzKfNXZR/sz3F0dSODXkOpLqDuirtgjLsrI/msXOANmxZf31MWzw==",
"dependencies": {
"@walmart/moment-walmart": "^1.0.4",
"@walmart/wfm-ui": "0.8.2",
@@ -33630,9 +33630,9 @@
}
},
"@walmart/schedule-mini-app": {
- "version": "0.88.0",
- "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.88.0.tgz",
- "integrity": "sha512-jHCc4j9rC0Vl39BQmw1FAWu8tHzK0fcpnFH1lmkQuFNpmwB7bD6qg7b4/ROyrVfYrf4wn/z6DGsaHxcvOHLb4w==",
+ "version": "0.89.0",
+ "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.89.0.tgz",
+ "integrity": "sha512-phFODb42rl9K25duuWbYjB3WaaYwYwDsMEZzKfNXZR/sz3F0dSODXkOpLqDuirtgjLsrI/msXOANmxZf31MWzw==",
"requires": {
"@walmart/moment-walmart": "1.0.4",
"@walmart/wfm-ui": "0.8.2",
--- package.json
@@ -128,7 +128,7 @@
"@walmart/receipt-check-miniapp": "1.18.7",
"@walmart/redux-store": "3.7.0",
"@walmart/returns-mini-app": "3.13.0",
- "@walmart/schedule-mini-app": "0.88.0",
+ "@walmart/schedule-mini-app": "0.89.0",
"@walmart/shelfavailability-mini-app": "1.5.19",
"@walmart/store-feature-orders": "1.25.0",
"@walmart/taskit-mini-app": "2.53.3",
| Bump schedule-mini-app. RosterScreen bugfix | Bump schedule-mini-app. RosterScreen bugfix
|
a821ab548b9a8ff7739e93c61a9ea0bf9e5a8791 | --- __tests__/__mocks__/react-native-wm-notification.js
@@ -4,6 +4,13 @@ const SumoPushEventTypes = {
ON_CONTENT_AVAILABLE_NOTIFICATION: 'onContentAvailableNotification',
};
+const Domain = {
+ HOMEOFFICE: 'HOMEOFFICE',
+ STOREORCLUB: 'STOREORCLUB',
+ DC: 'DC',
+ CANDIDATE: 'CANDIDATE',
+};
+
module.exports = {
__esModule: true,
default: {
@@ -17,4 +24,5 @@ module.exports = {
SumoPushEventTypes,
},
SumoPushEventTypes,
+ Domain,
};
--- __tests__/core/notificationInitTest.ts
@@ -1,6 +1,9 @@
import {AppState} from 'react-native';
import {all, takeLatest, select, call, take, put} from 'redux-saga/effects';
-import WmNotification, {SumoPushEventTypes} from 'react-native-wm-notification';
+import WmNotification, {
+ SumoPushEventTypes,
+ Domain,
+} from 'react-native-wm-notification';
import {addSagas, GlobalState, reducerManager} from '@walmart/redux-store';
import {
@@ -22,8 +25,8 @@ import {
} from '../../src/core/notificationInit';
import {
getIsPreHire,
- getOriginalSite,
getUser,
+ getUserSite,
USER_CHANGED_ACTIONS,
} from '../../src/redux';
import {SumoActionCreators, sumoInitReducer} from '../../src/redux/SumoRedux';
@@ -88,6 +91,7 @@ describe('onUserChanged', () => {
siteNbr: 1234,
domain: 'store',
countryCode: 'US',
+ profileId: '6789',
};
const iterator = onUserChanged();
expect(iterator.next().value).toEqual(call(getProfileForUser));
@@ -97,9 +101,11 @@ describe('onUserChanged', () => {
expect(iterator.next().value).toEqual(
call(WmNotification.register, profile),
);
- const profileId = '6789';
- expect(iterator.next(profileId).value).toEqual(
- put(SumoActionCreators.profileSuccess(profileId)),
+ expect(iterator.next(profile).value).toEqual(
+ put(SumoActionCreators.profileSuccess(profile)),
+ );
+ expect(iterator.next().value).toEqual(
+ put(SumoActionCreators.setProfileId(profile.profileId)),
);
expect(iterator.next().done).toBe(true);
});
@@ -111,6 +117,7 @@ describe('onUserChanged', () => {
siteId: 1234,
domain: 'homeoffice',
countryCode: 'US',
+ profileId: '6789',
};
const iterator = onUserChanged();
expect(iterator.next().value).toEqual(call(getProfileForUser));
@@ -120,9 +127,11 @@ describe('onUserChanged', () => {
expect(iterator.next().value).toEqual(
call(WmNotification.register, profile),
);
- const profileId = '6789';
- expect(iterator.next(profileId).value).toEqual(
- put(SumoActionCreators.profileSuccess(profileId)),
+ expect(iterator.next(profile).value).toEqual(
+ put(SumoActionCreators.profileSuccess(profile)),
+ );
+ expect(iterator.next().value).toEqual(
+ put(SumoActionCreators.setProfileId(profile.profileId)),
);
expect(iterator.next().done).toBe(true);
});
@@ -335,9 +344,10 @@ describe('getAssociateProfile', () => {
const iterator = getAssociateProfile();
const user = {
siteId: 'NOT_FOUND',
+ domain: 'homeoffice',
};
expect(iterator.next().value).toEqual(select(getUser));
- expect(iterator.next(user).value).toEqual(select(getOriginalSite));
+ expect(iterator.next(user).value).toEqual(select(getUserSite));
const next = iterator.next(user.siteId);
expect(next.value).toEqual(null);
expect(next.done).toEqual(true);
@@ -352,18 +362,38 @@ describe('getAssociateProfile', () => {
countryCode: 'US',
};
expect(iterator.next().value).toEqual(select(getUser));
- expect(iterator.next(user).value).toEqual(select(getOriginalSite));
+ expect(iterator.next(user).value).toEqual(select(getUserSite));
const next = iterator.next(user.siteId);
expect(next.value).toEqual({
- siteNbr: Number(user.siteId),
- domain: user.domain,
+ siteId: user.siteId,
+ domain: Domain.HOMEOFFICE,
userId: user.userId,
countryCode: user.countryCode,
});
expect(next.done).toEqual(true);
});
- it('handles non homeoffice domain', () => {
+ it('handles non dc domain', () => {
+ const iterator = getAssociateProfile();
+ const user = {
+ siteId: '100',
+ domain: 'DC',
+ userId: 'tuff',
+ countryCode: 'US',
+ };
+ expect(iterator.next().value).toEqual(select(getUser));
+ expect(iterator.next(user).value).toEqual(select(getUserSite));
+ const next = iterator.next(user.siteId);
+ expect(next.value).toEqual({
+ siteId: user.siteId,
+ domain: Domain.DC,
+ userId: user.userId,
+ countryCode: user.countryCode,
+ });
+ expect(next.done).toEqual(true);
+ });
+
+ it('handles store domain', () => {
const iterator = getAssociateProfile();
const user = {
siteId: '100',
@@ -372,11 +402,11 @@ describe('getAssociateProfile', () => {
countryCode: 'US',
};
expect(iterator.next().value).toEqual(select(getUser));
- expect(iterator.next(user).value).toEqual(select(getOriginalSite));
+ expect(iterator.next(user).value).toEqual(select(getUserSite));
const next = iterator.next(user.siteId);
expect(next.value).toEqual({
- siteNbr: Number(user.siteId),
- domain: 'store',
+ siteId: user.siteId,
+ domain: Domain.STOREORCLUB,
userId: user.userId,
countryCode: user.countryCode,
});
@@ -411,7 +441,7 @@ describe('getPreHireProfile', () => {
expect(iterator.next().value).toEqual(select(getUser));
const next = iterator.next(user);
expect(next.value).toEqual({
- domain: 'candidate',
+ domain: Domain.CANDIDATE,
userId: user.emailId,
countryCode: 'US',
});
| Increasing test coverage for notification init changes | Increasing test coverage for notification init changes
|
b578daafe3c547eaa5115351bd829d9a8a4c9d90 | --- packages/allspark-foundation/__tests__/Environment/client.test.ts
@@ -65,15 +65,7 @@ describe('EnvironmentClient', () => {
});
expect(resolveEnvironmentMock).toHaveBeenCalled();
});
- it('tests extend and calls _resolveEnvironment', () => {
- const initialConfig = {
- dev: { key1: 'value1' },
- };
- client.initialize({
- env: 'dev',
- config: initialConfig,
- overrides: {},
- });
+ it('tests extend with undefined env and calls _resolveEnvironment', () => {
client['_environment'] = {
current: undefined,
set: jest.fn(),
@@ -83,12 +75,11 @@ describe('EnvironmentClient', () => {
runEvent: jest.fn(),
addListener: jest.fn(),
};
+ client['_config'] = undefined;
const resolveEnvironmentMock = jest.spyOn(client, '_resolveEnvironment');
- const extendedConfig = {};
+ const extendedConfig = { dev: undefined };
client.extend(extendedConfig);
- expect(client['_config']).toEqual({
- dev: { key1: 'value1' },
- });
+ expect(client['_config']).toBeUndefined();
expect(resolveEnvironmentMock).toHaveBeenCalled();
});
it('the environment initialization without envType set', () => {
| test: increase branch coverage for Environment client | test: increase branch coverage for Environment client
|
b949478c2900aeb50cc77776298c0360b37c197b | --- src/components/MyWalmartv2/Widgets/SalariedOrTeamLead/SalariedOrTeamLeadRosterWidget.tsx
@@ -51,14 +51,12 @@ import {useSelector} from 'react-redux';
import {HubWidget} from '@walmart/my-walmart-hub';
import {Body, Heading, Alert} from '@walmart/gtp-shared-components';
import {Skeleton} from '@walmart/gtp-shared-components';
-import {WidgetErrorBoundary} from '../../Shared';
import {logger, rosterTelemetry, translationClient} from '../../../../common';
import {useSalariedOrTeamLeadRosterWidget} from './useSalariedOrTeamLeadRosterWidget';
import {SiteSelectors} from '@walmart/allspark-foundation/Site';
import {WarningAlert} from '../../../WarningAlert/WarningAlert';
import {styles} from './styles';
import {AllsparkNavigationClient} from '@walmart/allspark-foundation';
-import {ActivityAwareWidget} from '@walmart/associate-exp-hub-hub';
/**
* WIDGET PROPS INTERFACE
@@ -317,6 +315,28 @@ const SalariedOrTeamLeadRosterWidgetCore: React.FC<
showDivider={true}
showChevron={true}
style={styles.widgetContainer}
+ // Enable built-in activity-aware and error boundary functionality
+ enableActivityAware={true}
+ enableErrorBoundary={true}
+ refresh={refresh ?? undefined}
+ teamData={teamData}
+ debugActivity={true} // Enable debug logging for testing
+ onActivityChange={(isActive: boolean) => {
+ logger.info('SalariedOrTeamLeadRosterWidget activity changed', {
+ message: `Widget activity changed: ${isActive ? 'active' : 'inactive'}`,
+ isActive,
+ widgetId: 'salaried-or-team-lead-roster-widget',
+ timestamp: Date.now(),
+ });
+ }}
+ onErrorBoundaryCatch={(error: Error, errorInfo: React.ErrorInfo) => {
+ logger.error('SalariedOrTeamLeadRosterWidget error boundary caught error', {
+ message: error.message,
+ errorMessage: error.message,
+ componentStack: errorInfo.componentStack?.substring(0, 500) || 'No stack',
+ widgetId: 'salaried-or-team-lead-roster-widget',
+ });
+ }}
onHeaderPress={() => {
// Handle navigation to roster details
rosterTelemetry.logEvent('salaried_roster_header_tap', {
@@ -385,32 +405,22 @@ const SalariedOrTeamLeadRosterWidgetCore: React.FC<
};
/**
- * SalariedOrTeamLeadRosterWidget with error boundary wrapper
+ * SalariedOrTeamLeadRosterWidget wrapper
+ *
+ * NOTE: ActivityAwareWidget and WidgetErrorBoundary functionality is now built into HubWidget
+ * via enableActivityAware and enableErrorBoundary props. See HubWidget implementation below.
*/
export const SalariedOrTeamLeadRosterWidget: React.FC<
SalariedOrTeamLeadRosterWidgetProps
> = (props) => {
-
return (
- <WidgetErrorBoundary
- widgetId="salaried-or-team-lead-roster-widget"
- widgetName="SalariedOrTeamLeadRosterWidget"
- >
- {/* ActivityAwareWidget now properly stabilizes refresh prop and handles activity detection */}
- <ActivityAwareWidget
- refresh={props.refresh ?? undefined}
- teamData={props.teamData}
- name="SalariedOrTeamLeadRosterWidget"
- >
- <SalariedOrTeamLeadRosterWidgetCore
- refresh={props.refresh}
- teamData={props.teamData}
- isSiteDC={props.isSiteDC}
- isExternalLoading={props.isExternalLoading}
- hasExternalError={props.hasExternalError}
- />
- </ActivityAwareWidget>
- </WidgetErrorBoundary>
+ <SalariedOrTeamLeadRosterWidgetCore
+ refresh={props.refresh}
+ teamData={props.teamData}
+ isSiteDC={props.isSiteDC}
+ isExternalLoading={props.isExternalLoading}
+ hasExternalError={props.hasExternalError}
+ />
);
};
--- src/config/HubConfig.tsx
@@ -25,6 +25,7 @@ export const ROSTER_HUB_CONFIG = {
* Uses CORE_CONTAINERS.MY_TEAM from @walmart/me-at-walmart-common
*/
MYTEAM_HUB_ID: CORE_CONTAINERS.MY_TEAM,
+ TODAYS_PLAN_HUB_ID: CORE_CONTAINERS.TODAYS_PLAN, // Example additional container
WIDGET_IDS: {
ROSTER: 'MyTeam.RosterWidget', // Must match MyTeam's configuration
},
@@ -75,6 +76,13 @@ export const registerRosterComponents = (isSiteDC: boolean = false) => {
RosterWidgetWithUserTypeLogic
);
+ // Temporary: Register to TODAYS_PLAN container as well for testing/demo purposes
+ ComponentsModule.ComponentContainers.add(
+ ROSTER_HUB_CONFIG.TODAYS_PLAN_HUB_ID,
+ ROSTER_HUB_CONFIG.WIDGET_IDS.ROSTER,
+ RosterWidgetWithUserTypeLogic
+ );
+
console.log(`✅ Roster widget registered to ${ROSTER_HUB_CONFIG.MYTEAM_HUB_ID} for ${isSiteDC ? 'DC' : 'Store'} site`);
} catch (error) {
console.error('❌ Failed to register Roster components:', error);
| feat(ui): update allspark component containers | feat(ui): update allspark component containers
|
702a130b7780104767e9620f7f62c468a2befd10 | --- targets/US/package.json
@@ -136,7 +136,7 @@
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.7.2-alpha.2",
"@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch",
- "@walmart/receipt-check-miniapp": "1.27.1",
+ "@walmart/receipt-check-miniapp": "1.27.2",
"@walmart/redux-store": "~6.3.28",
"@walmart/returns-mini-app": "4.15.0",
"@walmart/rfid-scan-mini-app": "2.6.3",
--- yarn.lock
@@ -7051,7 +7051,7 @@ __metadata:
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.7.2-alpha.2"
"@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch"
- "@walmart/receipt-check-miniapp": "npm:1.27.1"
+ "@walmart/receipt-check-miniapp": "npm:1.27.2"
"@walmart/redux-store": "npm:~6.3.28"
"@walmart/returns-mini-app": "npm:4.15.0"
"@walmart/rfid-scan-mini-app": "npm:2.6.3"
@@ -7683,20 +7683,19 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/receipt-check-miniapp@npm:1.27.1":
- version: 1.27.1
- resolution: "@walmart/receipt-check-miniapp@npm:1.27.1"
+"@walmart/receipt-check-miniapp@npm:1.27.2":
+ version: 1.27.2
+ resolution: "@walmart/receipt-check-miniapp@npm:1.27.2"
dependencies:
"@walmart/tcnumber": "npm:^2.3.3"
"@xstate/react": "npm:^3.0.1"
cpc-input: "npm:^1.7.28"
dayjs: "npm:^1.11.1"
- expo-asset: "npm:~9.0.2"
uuid: "npm:^3.3.2"
xstate: "npm:^4.32.1"
peerDependencies:
"@walmart/allspark-foundation": "*"
- checksum: 10c0/34f85af1656f63e54ce40e2b5f2d0946cce71d4c6a4cd47ef32a63967b824bc16cdaf0c68d0137c5df2f14011b989d689317ed55291bb114ccded1fa13332474
+ checksum: 10c0/57b843fbe6f54a229fa24ace9ac47e69cadfd0174bee3103caf386f073394beee94e644a8b263c55bcee58b55b0a304af74ddb1032ef4956085554262a834632
languageName: node
linkType: hard
| update | update
|
0674cd108b42aeed06101fcfc2aa9a3bc99aea07 | --- src/components/RosterDetailPageHeader/RosterDetailPageHeader.tsx
@@ -39,8 +39,15 @@ export const RosterDetailPageHeader = ({
{siteIsDC ? (
<TeamImage
style={styles.teamImage}
- source={{uri: SupplyChainImages[teamId]?.uri}}
- placeholder={SupplyChainImages[teamId]?.blurhash}
+ source={{
+ uri:
+ SupplyChainImages[teamId]?.uri ||
+ SupplyChainImages['0000000']?.uri,
+ }}
+ placeholder={
+ SupplyChainImages[teamId]?.blurhash ||
+ SupplyChainImages['0000000']?.blurhash
+ }
testID={`team-image-${teamId}`}
/>
) : (
| show correct Image - fix missing team images | show correct Image - fix missing team images
|
6bb17203afcf4780aec13c14aa2c90c3bc5548e1 | --- package-lock.json
@@ -48,7 +48,7 @@
"@walmart/exception-mini-app": "1.2.30",
"@walmart/facilities-management-miniapp": "0.6.30",
"@walmart/feedback-all-spark-miniapp": "0.9.32",
- "@walmart/financial-wellbeing-feature-app": "1.6.3",
+ "@walmart/financial-wellbeing-feature-app": "1.8.0",
"@walmart/functional-components": "~4.0.3",
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.5",
@@ -5213,7 +5213,9 @@
}
},
"node_modules/@walmart/financial-wellbeing-feature-app": {
- "version": "1.6.3",
+ "version": "1.8.0",
+ "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.8.0.tgz",
+ "integrity": "sha512-cjMCqhPhnXBRxkpyzZi9ttvRxL/QJDvpRA1I2ZDZaSFYmmJ54k0tvGb7zspFGJqhQNoJrFT04FJcWnE3Ubd3Sg==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -25252,7 +25254,9 @@
"integrity": "sha512-rjO+YZ2W5CYKXwYXGZTVt5ztJOy9l5no1wOYmvbUsnZQZ8/U7J6ZYQQ3HOX5zabGEYtSdZadEGV0CBixLgGEGg=="
},
"@walmart/financial-wellbeing-feature-app": {
- "version": "1.6.3"
+ "version": "1.8.0",
+ "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.8.0.tgz",
+ "integrity": "sha512-cjMCqhPhnXBRxkpyzZi9ttvRxL/QJDvpRA1I2ZDZaSFYmmJ54k0tvGb7zspFGJqhQNoJrFT04FJcWnE3Ubd3Sg=="
},
"@walmart/functional-components": {
"version": "4.0.3",
--- package.json
@@ -90,7 +90,7 @@
"@walmart/exception-mini-app": "1.2.30",
"@walmart/facilities-management-miniapp": "0.6.30",
"@walmart/feedback-all-spark-miniapp": "0.9.32",
- "@walmart/financial-wellbeing-feature-app": "1.6.3",
+ "@walmart/financial-wellbeing-feature-app": "1.8.0",
"@walmart/functional-components": "~4.0.3",
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.5",
| bumped financial-wellbeing-feature-app to 1.8.0 | bumped financial-wellbeing-feature-app to 1.8.0
|
6e180752f5ae6dcb9cd5ed49ce95a446ccf29f12 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart",
- "version": "1.34.2",
+ "version": "1.34.3",
"main": "index.js",
"private": true,
"workspaces": [
| fix: hotfix version bump for v1.34.3 | fix: hotfix version bump for v1.34.3
|
387d5d09728d86d5d6424f1c7d0674a43e0aa602 | --- .looper-native-common.yml
@@ -29,6 +29,7 @@ envs:
tools:
maven: 3.5.4
nodejs: 9.11.2
+ jdk: 8
flows:
npm-install-and-coverage:
| added jdk | added jdk
|
d27c4a879bfb4ac55d9d23392c807c33c559a108 | --- src/navigation/AssociateHallwayNav/SideMenuContent.tsx
@@ -20,6 +20,7 @@ import {ClockSelectors} from '@walmart/allspark-foundation/Clock';
import {DeviceSelectors} from '@walmart/allspark-foundation/Device';
import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation';
import {MeAtWalmartAuthActions} from '@walmart/me-at-walmart-common';
+import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation';
import appJson from '../../../app.json';
import {useCanImpersonate} from '../../hooks';
@@ -86,17 +87,16 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = (
route: string,
params?: Record<string, any> | undefined,
) => {
- const navState = navigation.getState() ?? {routes: []};
- const currentRoutes = navState?.routes[0]?.state?.routes;
-
onDrawerClose();
- if (
- route === 'itemInfoQuickAction' &&
- currentRoutes &&
- currentRoutes[currentRoutes.length - 1].name === 'itemInfo'
- ) {
- return;
+ // Special handling for itemInfoQuickAction, if already on item_info_landing, do nothing
+ // since we are already on the correct screen
+ if (route === 'itemInfoQuickAction') {
+ if (
+ AllsparkNavigationClient.getCurrentRouteName() === 'item_info_landing'
+ ) {
+ return;
+ }
}
setImmediate(() =>
| refactor: update side menu navigation item info case | refactor: update side menu navigation item info case
|
ca928baa3d4957cc3ba589fef6e29e462ffbd868 | --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/TeamShiftSwitcher/TeamShiftSwitcher.tsx
@@ -84,7 +84,7 @@ export const TeamShiftSwitcher = ({
}
};
- return isLoading || !teamAndShiftText ? (
+ return isLoading ? (
<TeamSwitcherLoading />
) : (
<TouchableOpacity
@@ -109,7 +109,7 @@ export const TeamShiftSwitcher = ({
accessibilityLabel={accessibilityLabel}
testID='team-and-shift-text'
>
- {teamAndShiftText}
+ {fullTeamAndShiftText || teamAndShiftText}
</Body>
{allSavedTeams && (
<Body
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Hub/SiteHubDashboard.tsx
@@ -288,13 +288,9 @@ export const SiteHubDashboard = ({ name, widgets }: HubDashboardProps) => {
<View style={styles.switcherContainer}>
<TeamShiftSwitcher
isLoading={isLoading}
- allSavedTeams={allTeamData.length > 1 ? allTeamData : undefined}
+ allSavedTeams={allTeamData}
numTotalShifts={DEFAULT_SHIFTS_COUNT}
- teamName={
- allTeamData.length > 1
- ? t('teamShiftSwitcher.allSavedTeams')
- : allTeamData[0]
- }
+ teamName={allTeamData[0]}
teamId={selectedTeamIds?.[0]}
selectedShifts={shiftData}
onPress={() => {
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingContext.tsx
@@ -27,6 +27,8 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => {
const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead);
const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried);
const eligibleForOnboarding = isTeamLead || isSalaried || isPeopleLead;
+ const associateId = useSelector(UserSelectors.getWin);
+ const storageKey = ONBOARDING_KEY + associateId;
const { data, teamPreferenceData, shiftPreferenceData, onCompleted } =
useGetSupplyChainTeamsPreferenceQuery();
@@ -125,6 +127,7 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => {
showOnboardingFlow,
hideOnboardingFlow,
disableOnboarding,
+ storageKey,
}}
>
{children}
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingScreen.tsx
@@ -34,7 +34,7 @@ export const OnboardingScreen = () => {
const { t } = useAllsparkTranslation(FEATURE_ID);
const teamSelectionTelemetry = useTelemetryService();
const logger = LoggerService.getContainerInstance();
- const { disableOnboarding } = useOnboardingContext();
+ const { disableOnboarding, storageKey } = useOnboardingContext();
const {
allSiteTeamsSections,
error: teamsError,
| feat(ui): cleanup and style fixes | feat(ui): cleanup and style fixes
|
dd970e9c63ee8617e6417808456eff1270c62fa1 | --- .yarnrc.yml
@@ -1,5 +1,5 @@
enableInlineHunks: true
nodeLinker: node-modules
-npmRegistryServer: ${REPOSOLNS_NPM_REPO}
+npmRegistryServer: "${REPOSOLNS_NPM_REPO}"
--- Gemfile
@@ -0,0 +1,16 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+source 'https://repository.walmart.com/content/repositories/rubygems'
+
+gem 'fastlane'
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)
+
+# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
+# bound in the template on Cocoapods with next React Native release.
+gem 'cocoapods', '>= 1.13', '< 1.15'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+gem 'xcodeproj', '1.27.0'
--- README.md
@@ -2,34 +2,53 @@
This is a template for creating a feature app in typescript.
-## Getting started
-- npm install on node version 16.17.0
-- cd ios & pod install
-- run project in iOS or Android
+## Project Setup
-### Pre-requisites
+### Prerequisites
- Xcode
- Android Studio
-- Cocoapods
-- node and npm
- - you also need **npx** `npm install -g npx`
-- React Native Debugger (nice to have)
-
-### Setup and Install
-
-Follow [these directions](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-from-a-template#creating-a-repository-from-a-template) to make a new repo using this one as the template.
-
-- edit package.json
- - change the name of the module to your feature app's name
- - remove `"private": true`
-- edit `sonar-project.properties`
- - change the project key
- - change the project name
-- `npm install`
+- Yarn/ruby/java/node (see [mise.toml](mise.toml) for version requirements)
+
+### Optional prereqs
+- [brew](https://brew.sh/)
+- [mise](https://mise.jdx.dev/)
+
+### brew setup steps
+
+- turn off VPN or if onsite switch off of eagle to walmartwifi
+- run: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
+
+### mise setup steps
+
+- turn off VPN or if onsite switch off of eagle to walmartwifi
+- `brew install mise`
+ - if you want to adopt mise for your system
+ - otherwise run this: `echo 'eval "$(/opt/homebrew/bin/mise activate zsh)"' >> ~/.zshrc`
+ - review your .zshrc and comment out other version managers to reduce chances of conflicts
+ - restart your terminal
+ - if you want to only use mise adhoc when working on allspark-core
+ - `mise active zsh`
+ - run `mise i`
+ - `yarn -v` answer Y to download correct yarn version if prompted
+ - reconnect to eagle/VPN
+- note that whenever you git pull and the mise.toml file changes you will need to run `mise i`
+
+### universal setup steps
+
+- `yarn`
+- `yarn build`
+- `bundle install`
+- `cd ios`
+
+### ios setup steps
+
- `cd ios`
-- `pod install --repo-update --verbose`
+- `bundle exec pod install`
- `cd ..`
+- default env is dev, run: `xed ios/FeatureAppTemplateTS.xcworkspace`
+- `yarn start`
+- press play in Xcode
### Running
--- mise.toml
@@ -0,0 +1,4 @@
+[tools]
+ruby = "3.3.6"
+java = "openjdk-20"
+nodejs = { version = '23.6.0', postinstall = 'corepack enable;yarn set version berry' }
\ No newline at end of file
--- package.json
@@ -228,7 +228,7 @@
"pre-commit": "run-p lint verifyBranchName"
}
},
- "packageManager": "yarn@4.4.0",
+ "packageManager": "yarn@4.6.0",
"engines": {
"node": ">=18"
}
| fix(ui): update the gem file for myteam | fix(ui): update the gem file for myteam
|
505147fb5f16c8b8dd00d2f0d63b2b2ee7fa210c | --- package.json
@@ -155,7 +155,7 @@
"@walmart/core-utils": "~6.3.9",
"@walmart/core-widget-registry": "workspace:^",
"@walmart/functional-components": "~6.3.28",
- "@walmart/me-at-walmart-athena-queries": "6.27.0",
+ "@walmart/me-at-walmart-athena-queries": "6.30.1",
"@walmart/me-at-walmart-common": "workspace:^",
"@walmart/me-at-walmart-container": "workspace:^",
"@walmart/moment-walmart": "1.0.4",
--- packages/me-at-walmart-container/__tests__/services/user/transforms.test.ts
@@ -58,35 +58,66 @@ describe('services/user/transforms.ts', () => {
describe('determineTeams function', () => {
test('returns teams from associate.teams if present', () => {
- const associate = {
- teams: [{name: 'Team A'}, {name: 'Team B'}],
- };
- const expectedTeams = [{name: 'Team A'}, {name: 'Team B'}];
-
- const result = determineTeams(associate as any);
-
- expect(result).toEqual(expectedTeams);
- });
-
- test('returns teams from associate.workdayTeams if present', () => {
- const associate = {
- workdayTeams: [{name: 'Workday Team A'}, {name: 'Workday Team B'}],
+ const assignedBusinessUnit = {
+ __typename: 'AssociateSupplyChainBusinessUnitAssignment',
+ businessUnitNumber: 6094,
+ teams: [
+ {
+ __typename: 'SupplyChainTeam',
+ members: ['104318088'],
+ membership: [
+ {
+ __typename: 'SupplyChainTeamAssociateMembership',
+ baseTeam: false,
+ role: 'TA',
+ walmartIdentificationNumber: '987654321',
+ },
+ {
+ __typename: 'SupplyChainTeamAssociateMembership',
+ baseTeam: true,
+ role: 'PA',
+ walmartIdentificationNumber: '12345678',
+ },
+ ],
+ teamId: '7000110',
+ teamName: 'RSR - Staple Stock',
+ },
+ ],
};
const expectedTeams = [
- {name: 'Workday Team A'},
- {name: 'Workday Team B'},
+ {
+ __typename: 'SupplyChainTeam',
+ members: ['104318088'],
+ membership: [
+ {
+ __typename: 'SupplyChainTeamAssociateMembership',
+ baseTeam: false,
+ role: 'TA',
+ win: '987654321',
+ },
+ {
+ __typename: 'SupplyChainTeamAssociateMembership',
+ baseTeam: true,
+ role: 'PA',
+ win: '12345678',
+ },
+ ],
+ site: 6094,
+ teamId: '7000110',
+ teamName: 'RSR - Staple Stock',
+ },
];
- const result = determineTeams(associate as any);
+ const result = determineTeams(assignedBusinessUnit as any);
expect(result).toEqual(expectedTeams);
});
test('returns empty array if no teams are present', () => {
- const associate = {};
+ const assignedBusinessUnit = {};
const expectedTeams: any[] = [];
- const result = determineTeams(associate as any);
+ const result = determineTeams(assignedBusinessUnit as any);
expect(result).toEqual(expectedTeams as any);
});
--- packages/me-at-walmart-container/src/services/user/transforms.ts
@@ -14,8 +14,10 @@ import {
inferUserIdfromUpn,
stripStoreFromUserId,
} from './utils';
+import {TeamMembership} from '@walmart/allspark-foundation/User/types';
type UserResponse = GetLoggedInUserQuery['getLoggedInUser'];
+type AssignedBussinessUnit = NonNullable<UserResponse>['assignedBusinessUnit'];
export const DEFAULT_COUNTRY_CODE = 'US';
@@ -36,19 +38,31 @@ export const determineSiteProps = (
};
};
-export const determineTeams = (
- associate: NonNullable<UserResponse>['associate'],
-) => {
+export const determineTeams = (assignedBusinessUnit: AssignedBussinessUnit) => {
let teams: Team[] = [];
-
- if (associate && 'teams' in associate) {
- // @ts-ignore - Team type is incorrect
- teams = (associate.teams?.filter((t) => !!t) as Team[]) || [];
- }
-
- if (associate && 'workdayTeams' in associate) {
+ const site = assignedBusinessUnit?.businessUnitNumber;
+ if (assignedBusinessUnit && 'teams' in assignedBusinessUnit) {
// @ts-ignore - Team type is incorrect
- teams = (associate.workdayTeams?.filter((t) => !!t) as Team[]) || [];
+ // @ts-ignore
+ teams =
+ (assignedBusinessUnit.teams
+ // @ts-ignore
+ ?.filter((t) => !!t)
+ // @ts-ignore
+ .map((teamData) => ({
+ ...teamData,
+ site,
+ // @ts-ignore
+ membership: teamData?.membership.map((memberShipData) => {
+ //Need to remap win
+ const {walmartIdentificationNumber: win, ...restMemberShipData} =
+ memberShipData || {};
+ return {
+ win,
+ ...restMemberShipData,
+ } as TeamMembership;
+ }),
+ })) as Team[]) || [];
}
return teams;
@@ -90,12 +104,13 @@ export const parseUserResponse = (
tokenData: TokenData,
) => {
const associate = user.associate;
+ const assignedBusinessUnit = user.assignedBusinessUnit;
const emailId = tokenData.upn;
const siteId = inferSiteId(emailId);
const workingSite = user.wmBusinessUnitNumber;
const domain = inferDomain(user.wmBusinessUnitType, emailId);
const fullyQualifiedUserID = inferUserIdfromUpn(tokenData.upn);
- const teams = determineTeams(associate);
+ const teams = determineTeams(assignedBusinessUnit);
return {
...determineSiteProps(domain, siteId, workingSite),
--- yarn.lock
@@ -7431,12 +7431,12 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/me-at-walmart-athena-queries@npm:6.27.0":
- version: 6.27.0
- resolution: "@walmart/me-at-walmart-athena-queries@npm:6.27.0"
+"@walmart/me-at-walmart-athena-queries@npm:6.30.1":
+ version: 6.30.1
+ resolution: "@walmart/me-at-walmart-athena-queries@npm:6.30.1"
peerDependencies:
"@apollo/client": "*"
- checksum: 10c0/3bfb6ab8ed2114fe08d731e279b9348f453fad50deec4e42a3e1cf13d8259e77f347f3505eef2c13ba1300a4fd8f95b616ff24b574b8e78ab5b2e98f9579e97b
+ checksum: 10c0/8e43bb0ced875db39b605cd3816d7a7cf8678fdbe5adb4bf6bdd90077427535715056ad5456722fd0546837bda7799bf078b572324970b659482f31c561e229b
languageName: node
linkType: hard
@@ -7758,7 +7758,7 @@ __metadata:
"@walmart/iteminfo-mini-app": "npm:8.0.4"
"@walmart/learning-mini-app": "npm:20.0.39"
"@walmart/manager-approvals-miniapp": "npm:0.3.2"
- "@walmart/me-at-walmart-athena-queries": "npm:6.27.0"
+ "@walmart/me-at-walmart-athena-queries": "npm:6.30.1"
"@walmart/me-at-walmart-common": "workspace:^"
"@walmart/me-at-walmart-container": "workspace:^"
"@walmart/me-at-walmart-core": "workspace:^"
| update transform for getLoggedInUser | update transform for getLoggedInUser
|
f463dded006ef52fe3ce055a3ae5813f6b3ea8f2 | --- .looper.multibranch.yml
@@ -607,11 +607,11 @@ flows:
- var(END_TIME):
date +%s
- var(TIME_ELAPSED):
- $START_TIME-$END_TIME
+ $(($START_TIME-$END_TIME))
- var(MINUTES):
- ($TIME_ELAPSED%3600)/60
+ $((($TIME_ELAPSED%3600)/60))
- var(SECONDS):
- (($TIME_ELAPSED%3600)/60)%60
+ $(((($TIME_ELAPSED%3600)/60)%60))
- slack.postMessage:
message: $MESSAGE_TITLE
channelId: ${slackChannel}
| Update .looper.multibranch.yml | Update .looper.multibranch.yml
|
08605839ce6fd68f2bdf02afb8b8157814f6afe4 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "2.12.24",
+ "version": "2.12.25",
"main": "dist/index.js",
"files": [
"dist"
| Update roster mini app version | Update roster mini app version
|
133e14768526604343f949d69b9e8096c94861ce | --- package-lock.json
@@ -58,7 +58,7 @@
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.10",
"@walmart/impersonation-mini-app": "1.20.2",
- "@walmart/ims-print-services-ui": "2.5.5",
+ "@walmart/ims-print-services-ui": "2.5.6",
"@walmart/inbox-mini-app": "0.86.1",
"@walmart/iteminfo-mini-app": "7.5.4",
"@walmart/manager-approvals-miniapp": "0.2.4",
@@ -8460,9 +8460,9 @@
}
},
"node_modules/@walmart/ims-print-services-ui": {
- "version": "2.5.5",
- "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.5.tgz",
- "integrity": "sha512-rIOk7ml4n938wLkZs9OuQ4OziX48Ia3F+/2ApciSVFxGGet53ildFyLJnf10CcepUrKfvGRbdFj2IAmWcAb9HQ==",
+ "version": "2.5.6",
+ "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.6.tgz",
+ "integrity": "sha512-ZE3tFpJPSTy8sbWd1Z5dGWHJr1N6Rx/J89+vhC+8Ecyq2RtOOaHZiQiLFLnegGji+JIj9BJQeTuuw843Qsy7XA==",
"peerDependencies": {
"@react-native-firebase/analytics": ">=10.5.1",
"@react-native-firebase/app": ">=10.5.0",
@@ -33653,9 +33653,9 @@
"integrity": "sha512-Eubyowsouh6ZEZEfJ4je0i+GwZzSFc36p5q1JeUfjrkLWNt/lJZUnIZ1cNKnEHVqCR+y5HwJ9JuRiioWyJ5sfQ=="
},
"@walmart/ims-print-services-ui": {
- "version": "2.5.5",
- "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.5.tgz",
- "integrity": "sha512-rIOk7ml4n938wLkZs9OuQ4OziX48Ia3F+/2ApciSVFxGGet53ildFyLJnf10CcepUrKfvGRbdFj2IAmWcAb9HQ=="
+ "version": "2.5.6",
+ "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.6.tgz",
+ "integrity": "sha512-ZE3tFpJPSTy8sbWd1Z5dGWHJr1N6Rx/J89+vhC+8Ecyq2RtOOaHZiQiLFLnegGji+JIj9BJQeTuuw843Qsy7XA=="
},
"@walmart/inbox-mini-app": {
"version": "0.86.1",
--- package.json
@@ -99,7 +99,7 @@
"@walmart/gta-react-native-calendars": "0.0.16",
"@walmart/gtp-shared-components": "2.0.10",
"@walmart/impersonation-mini-app": "1.20.2",
- "@walmart/ims-print-services-ui": "2.5.5",
+ "@walmart/ims-print-services-ui": "2.5.6",
"@walmart/inbox-mini-app": "0.86.1",
"@walmart/iteminfo-mini-app": "7.5.4",
"@walmart/manager-approvals-miniapp": "0.2.4",
| bumup Print version for drop15 bugfix | bumup Print version for drop15 bugfix
|
e0d54d0c183a72596aa564162ae5ac665959b450 | --- .looper.multibranch.yml
@@ -38,7 +38,7 @@ envs:
global:
variables:
CI: true
- NO_FLIPPER: true,
+ NO_FLIPPER: 1,
LOOPER_NODES: '((osx||stable_osx)&&!dualcore)'
GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}"
--- ios/Podfile
@@ -14,7 +14,7 @@ install! 'cocoapods', :deterministic_uuids => false
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
-flipper_config = ENV['NO_FLIPPER'] == true ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(["Debug"], { 'Flipper' => '0.172.0' })
+flipper_config = ENV['NO_FLIPPER'] == '1' ? FlipperConfiguration.disabled : FlipperConfiguration.enabled(["Debug"], { 'Flipper' => '0.172.0' })
source 'git@gecgithub01.walmart.com:store-systems-associate-tech-platform/cocoapods-specs.git'
source 'git@gecgithub01.walmart.com:ssaeSCTP/CocoaPodSpecs.git'
--- react-native.config.js
@@ -4,9 +4,7 @@ module.exports = {
android: {},
},
dependencies: {
- ...(process.NO_FLIPPER
- ? {'react-native-flipper': {platforms: {ios: null}}}
- : {}),
+ ...(process.CI ? {'react-native-flipper': {platforms: {ios: null}}} : {}),
},
assets: ['node_modules/@walmart/ui-components/assets'],
};
| fix: testing flipper ci changes | fix: testing flipper ci changes
|
9af2d89e271c1f2a6adc1a58333fa72112ab9fd7 | --- targets/US/package.json
@@ -111,7 +111,7 @@
"@walmart/inbox-mini-app": "0.96.6",
"@walmart/iteminfo-mini-app": "7.16.2",
"@walmart/learning-mini-app": "20.0.35",
- "@walmart/manager-approvals-miniapp": "0.3.0",
+ "@walmart/manager-approvals-miniapp": "0.3.1",
"@walmart/me-at-walmart-athena-queries": "6.26.1",
"@walmart/me-at-walmart-common": "workspace:^",
"@walmart/me-at-walmart-container": "workspace:^",
--- yarn.lock
@@ -6682,9 +6682,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/manager-approvals-miniapp@npm:0.3.0":
- version: 0.3.0
- resolution: "@walmart/manager-approvals-miniapp@npm:0.3.0"
+"@walmart/manager-approvals-miniapp@npm:0.3.1":
+ version: 0.3.1
+ resolution: "@walmart/manager-approvals-miniapp@npm:0.3.1"
peerDependencies:
"@react-navigation/native": ^6.0.8
"@react-navigation/stack": ^6.2.0
@@ -6699,7 +6699,7 @@ __metadata:
react-native-wm-telemetry: 0.3.0
react-redux: ^8.0.4
reselect: ^4.1.0
- checksum: 10c0/f45ade9494417939fc645abce196fab1012107aa225f0ac5a73bc2694ab1459d746ec91d716d4fbffd01876f0d40fb2265404c5c763874aced17a5b7a72be2e5
+ checksum: 10c0/2ebfc051d8eb9a3d0e571ed01cd951779782ad5aa06c052a4d0d148a4fac806e0e7f542e377a999e662304fb09aabb3fa2b5b4ac661890ff9a61fd084dcd3c50
languageName: node
linkType: hard
@@ -7027,7 +7027,7 @@ __metadata:
"@walmart/inbox-mini-app": "npm:0.96.6"
"@walmart/iteminfo-mini-app": "npm:7.16.2"
"@walmart/learning-mini-app": "npm:20.0.35"
- "@walmart/manager-approvals-miniapp": "npm:0.3.0"
+ "@walmart/manager-approvals-miniapp": "npm:0.3.1"
"@walmart/me-at-walmart-athena-queries": "npm:6.26.1"
"@walmart/me-at-walmart-common": "workspace:^"
"@walmart/me-at-walmart-container": "workspace:^"
| Bump manager approvals mini app version to 0.3.1 | Bump manager approvals mini app version to 0.3.1
|
002955afff82aaf2f6472eb52788080a4455005d | --- packages/me-at-walmart-container/src/services/user/index.ts
@@ -49,6 +49,10 @@ export const MeAtWalmartUserService = {
context: {
headers: {
'wm_consumer.id': env.consumerId,
+ //This value is required by People Api Team
+ 'impersonated-request': 1,
+ 'X-O-Platform': 'core',
+ 'X-O-Platform-Version': 'v1',
},
},
errorPolicy: 'all',
| fix: missing headers on impersonate query | fix: missing headers on impersonate query
|
a6423b030049ef558c3127310eae27d5393b63f8 | --- src/containers/UserHeader.tsx
@@ -10,7 +10,7 @@ import {Body, colors, ListItem, Switch} from '@walmart/gtp-shared-components';
import {useUserPresence} from '../presence/hooks';
import {Avatar} from '../components/Avatar';
-import {goOfflineForUser, goOnlineForUser, readData} from '../presence/service';
+import {goOfflineForUser, goOnlineForUser} from '../presence/service';
import {getEncryptedUserId} from '../redux/selectors';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../translations';
@@ -45,16 +45,6 @@ export const UserHeader = () => {
: goOfflineForUser(storeId, userId);
};
- useEffect(() => {
- // const res = setTimeout(() => {
- const res = setInterval(() => {
- const dt = readData(storeId, userId);
- }, 10000);
- return () => {
- clearInterval(res);
- };
- });
-
const renderDoNotDisturbToggle = () => {
return (
<>
--- src/presence/provider.tsx
@@ -9,11 +9,10 @@ import React, {
import {useSelector} from 'react-redux';
import {SiteSelectors} from '@walmart/redux-store';
import firestore from '@react-native-firebase/firestore';
-// import {getEncryptedUserId} from '../redux/selectors';
+
import {PresenceState} from './types';
import {PresenceContext} from './context';
import {createUserCollectionPath} from './utils';
-// import {readData} from './service';
/**
* @description Stores and manages all presence data throughout lifetime of the app.
@@ -34,9 +33,6 @@ export const PresenceProvider = (props: PropsWithChildren<{}>) => {
SiteSelectors.getUserWorkingSite,
);
- // const userId: string = useSelector(getEncryptedUserId);
- // const storeid: string = useSelector(SiteSelectors.getUserWorkingSite);
-
const subscriptionOn = () => {
if (storeId) {
const userCollection = createUserCollectionPath(storeId!);
@@ -64,7 +60,6 @@ export const PresenceProvider = (props: PropsWithChildren<{}>) => {
useEffect(() => {
subscriptionOff();
subscriptionOn();
- // readData(storeid, userId);
}, [storeId]);
const value = useMemo(
--- src/containers/UserHeader.tsx
@@ -10,7 +10,7 @@ import {Body, colors, ListItem, Switch} from '@walmart/gtp-shared-components';
import {useUserPresence} from '../presence/hooks';
import {Avatar} from '../components/Avatar';
-import {goOfflineForUser, goOnlineForUser, readData} from '../presence/service';
+import {goOfflineForUser, goOnlineForUser} from '../presence/service';
import {getEncryptedUserId} from '../redux/selectors';
import {useTranslation} from 'react-i18next';
import {TEXTING_I18N_NAMESPACE} from '../translations';
@@ -45,16 +45,6 @@ export const UserHeader = () => {
: goOfflineForUser(storeId, userId);
};
- useEffect(() => {
- // const res = setTimeout(() => {
- const res = setInterval(() => {
- const dt = readData(storeId, userId);
- }, 10000);
- return () => {
- clearInterval(res);
- };
- });
-
const renderDoNotDisturbToggle = () => {
return (
<>
--- src/presence/provider.tsx
@@ -9,11 +9,10 @@ import React, {
import {useSelector} from 'react-redux';
import {SiteSelectors} from '@walmart/redux-store';
import firestore from '@react-native-firebase/firestore';
-// import {getEncryptedUserId} from '../redux/selectors';
+
import {PresenceState} from './types';
import {PresenceContext} from './context';
import {createUserCollectionPath} from './utils';
-// import {readData} from './service';
/**
* @description Stores and manages all presence data throughout lifetime of the app.
@@ -34,9 +33,6 @@ export const PresenceProvider = (props: PropsWithChildren<{}>) => {
SiteSelectors.getUserWorkingSite,
);
- // const userId: string = useSelector(getEncryptedUserId);
- // const storeid: string = useSelector(SiteSelectors.getUserWorkingSite);
-
const subscriptionOn = () => {
if (storeId) {
const userCollection = createUserCollectionPath(storeId!);
@@ -64,7 +60,6 @@ export const PresenceProvider = (props: PropsWithChildren<{}>) => {
useEffect(() => {
subscriptionOff();
subscriptionOn();
- // readData(storeid, userId);
}, [storeId]);
const value = useMemo(
| revert testing changes to dnd header and provider | revert testing changes to dnd header and provider
|
4daa484e21c6ef62c5afdf6931e95831b824b479 | --- .yarn/patches/@walmart-taskit-mini-app-npm-5.8.15-5e208f7dbc.patch
@@ -0,0 +1,36 @@
+diff --git a/dist/screens/index.js b/dist/screens/index.js
+index 05a2a284589e8b25afd1bda3a8d66bbf3b7814d9..ca7e68f942871e5f3e278c5b5fe6c2d2ec9c4346 100644
+--- a/dist/screens/index.js
++++ b/dist/screens/index.js
+@@ -1,10 +1,30 @@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
++const { useEffect } = require("react");
+ const me_at_walmart_common_1 = require("@walmart/me-at-walmart-common");
++const react_navigation = require('@react-navigation/native')
+ const feature_1 = require("../common/feature");
+ const enums_1 = require("../constants/enums");
+ const navigation_1 = require("../navigation");
+-const notesMiniAppScreen = feature_1.NotesFeature.createScreen(navigation_1.TaskItMiniApp, {
++const { default: getTaskTabBarBadge } = require("../components/getTaskTabBarBadge");
++const MiniAppWrapper = () => {
++ const navigation = react_navigation.useNavigation();
++ const taskitBadge = getTaskTabBarBadge();
++
++ useEffect(() => {
++ navigation.setOptions({
++ tabBarBadge: taskitBadge,
++ tabBarAccessibilityLabel: translate('navigation.notifications', {
++ label: translate('navigation.taskit'),
++ count: taskitBadge || 0,
++ context: `${taskitBadge || 0}`,
++ }),
++ });
++ }, [taskitBadge]);
++
++ return (<navigation_1.TaskItMiniApp />)
++}
++const notesMiniAppScreen = feature_1.NotesFeature.createScreen(MiniAppWrapper, {
+ tags: [me_at_walmart_common_1.ScreenTags.AssociateStack],
+ clockCheckRequired: true,
+ });
--- core/src/navigation/USHallway/AssociateHallwayNav/Tabs/index.tsx
@@ -78,7 +78,7 @@ export const MainTabsNav = (_: MainStackScreenProps<'tabs'>) => {
/>
)}
{taskit.enabled &&
- TaskItMiniApp.buildAllScreens({
+ TaskItMiniApp.buildScreen('taskit', {
Navigator: MainTabs as any,
routeConfig: {
options: {
--- targets/US/package.json
@@ -147,7 +147,7 @@
"@walmart/shop-gnfr-mini-app": "1.0.137",
"@walmart/sidekick-mini-app": "4.84.14",
"@walmart/store-feature-orders": "1.27.1",
- "@walmart/taskit-mini-app": "5.8.15",
+ "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A5.8.15#~/.yarn/patches/@walmart-taskit-mini-app-npm-5.8.15-5e208f7dbc.patch",
"@walmart/time-clock-mini-app": "2.448.1",
"@walmart/topstock-mini-app": "1.19.4",
"@walmart/translator-mini-app": "1.3.7",
| fix: taskit patch | fix: taskit patch
|
8b16aded104486a42ed5c77359ae8f5c78f0199a | --- package-lock.json
@@ -3032,9 +3032,9 @@
}
},
"@walmart/ask-sam-mini-app": {
- "version": "0.19.0",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.19.0.tgz",
- "integrity": "sha512-oRR7/bgc8jwbiiFYflAS7fM+mVdmM/ozXWaVIkOEapJaL4cE2SsQPwYmBGjob4Ib2T+FnNkepgaz1QNYAp3IRQ==",
+ "version": "0.21.0",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.21.0.tgz",
+ "integrity": "sha512-2BpjegUnn8+c8SPGK13S5rFhU+0MSGe+2kjEpF6Rd/iXQB/KIveUHYPwljSMSm/AIcc5CRCDpa6VKIJgw1/hIg==",
"requires": {
"apisauce": "^1.1.2",
"lodash": "^4.17.19",
--- package.json
@@ -66,7 +66,7 @@
"@walmart/allspark-health-survey-mini-app": "0.0.38",
"@walmart/allspark-home-mini-app": "0.4.0",
"@walmart/allspark-me-mini-app": "0.1.0",
- "@walmart/ask-sam-mini-app": "0.19.0",
+ "@walmart/ask-sam-mini-app": "0.21.0",
"@walmart/config-components": "1.0.21",
"@walmart/feedback-all-spark-miniapp": "0.0.50",
"@walmart/functional-components": "1.0.27",
| Bumping ask sam for crash fix and item info integration | Bumping ask sam for crash fix and item info integration
|
f2701405e1138489b69eb7e2c4cca2036d1089fe | --- packages/me-at-walmart-common/src/components/SidekickAssistantFAB/index.tsx
@@ -262,9 +262,9 @@ export const FooterAvoidingSidekickAssistantFAB = ({children, footerHasSafeArea
const {bottom: safeAreaBottom} = useSafeAreaInsets();
const onHeightUpdate = (newHeight: number) => {
- let updateHeight = newHeight;
+ let updateHeight = newHeight + SIDEKICK_ASSISTANT_FAB_INSETS;
if (footerHasSafeArea) {
- updateHeight = Math.max(0, newHeight - safeAreaBottom);
+ updateHeight = Math.max(0, updateHeight - safeAreaBottom);
}
setFooterHeight(updateHeight);
}
| fix: fab height | fix: fab height
|
06585e4fb817d1763fb948b028686228e9e57b11 | --- targets/US/package.json
@@ -147,7 +147,7 @@
"@walmart/sidekick-mini-app": "4.67.15",
"@walmart/store-feature-orders": "1.26.12",
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch",
- "@walmart/time-clock-mini-app": "2.415.0",
+ "@walmart/time-clock-mini-app": "2.419.0",
"@walmart/topstock-mini-app": "1.15.20",
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch",
"@walmart/welcomeme-mini-app": "0.95.1",
--- yarn.lock
@@ -7125,7 +7125,7 @@ __metadata:
"@walmart/sidekick-mini-app": "npm:4.67.15"
"@walmart/store-feature-orders": "npm:1.26.12"
"@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.3.0#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.3.0-a2dd632c59.patch"
- "@walmart/time-clock-mini-app": "npm:2.415.0"
+ "@walmart/time-clock-mini-app": "npm:2.419.0"
"@walmart/topstock-mini-app": "npm:1.15.20"
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch"
"@walmart/welcomeme-mini-app": "npm:0.95.1"
@@ -8057,9 +8057,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/time-clock-mini-app@npm:2.415.0":
- version: 2.415.0
- resolution: "@walmart/time-clock-mini-app@npm:2.415.0"
+"@walmart/time-clock-mini-app@npm:2.419.0":
+ version: 2.419.0
+ resolution: "@walmart/time-clock-mini-app@npm:2.419.0"
dependencies:
"@react-navigation/elements": "npm:^1.3.1"
moment-timezone: "npm:0.5.33"
@@ -8102,7 +8102,7 @@ __metadata:
uuid: ^3.3.2
wifi-store-locator: ^1.4.0
xdate: ^0.8.2
- checksum: 10c0/292528b5d50105d9012f1251eaacbe20008bf9d0f5fc862afdbe135570c9c6bc748fd130747c7b3c57bd08b8d334f85045b26a9d291bd95432d080f28436ecbc
+ checksum: 10c0/88022d6bba110f37bbbc006d5f7c966811c16184400a36f4e19a7bfb5af85563843946b68a95fe9efe645e6d55c987226d5ad7fb4f8f859973cce82bd5cd90c4
languageName: node
linkType: hard
| Update time clock to 2.419.0 | Update time clock to 2.419.0
|
1650beb1fbd48db260f0156b16c55e12d6624e5a | --- package.json
@@ -116,7 +116,7 @@
"@walmart/refrigeration-alarms-mini-app": "1.35.0",
"@walmart/schedule-mini-app": "0.24.0",
"@walmart/settings-mini-app": "1.8.0",
- "@walmart/shelfavailability-mini-app": "1.2.4-SNAPSHOT.0",
+ "@walmart/shelfavailability-mini-app": "1.2.4",
"@walmart/taskit-mini-app": "0.34.5",
"@walmart/time-clock-mini-app": "0.13.1",
"@walmart/ui-components": "1.4.0",
| Update package.json | Update package.json
|
3d38b31e4c41768bd6bac857f56386156ed846d9 | --- packages/allspark-foundation-hub/__tests__/supplyChain/components/ModalErrorScreen.test.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { render, fireEvent } from '@testing-library/react-native';
-import ModalErrorScreen from './../../../src/SupplyChain/Components/Modal/ModalErrorScreen';
+import {ModalErrorScreen} from './../../../src/SupplyChain/Components/Modal/ModalErrorScreen';
describe('ModalErrorScreen', () => {
const handleCloseModalMock = jest.fn();
--- packages/allspark-foundation-hub/src/SupplyChain/Components/Modal/ModalErrorScreen.tsx
@@ -40,5 +40,3 @@ export const ModalErrorScreen = ({
</View>
);
};
-
-export default ModalErrorScreen;
| test(ui): removed default export | test(ui): removed default export
|
c17200eece8244294db8835c44d99c4f505d445f | --- android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
<queries>
<package android:name="com.walmart.sso.app" />
</queries>
-
+
<queries>
<package android:name="com.walmart.gif2" />
<intent>
@@ -29,7 +29,6 @@
android:allowBackup="false"
android:theme="@style/AppTheme"
tools:replace="android:allowBackup"
- android:debuggable="true"
android:extractNativeLibs="true">
<!-- disables automatic screen tracking; removing for now due to an issue: https://github.com/firebase/firebase-android-sdk/issues/3240 -->
| remove debug true | remove debug true
|
f6aa740393a03132f9cf68a01beeeea04c36be0b | --- src/channels/components/TextingDisabled.tsx
@@ -22,6 +22,8 @@ const styles = StyleSheet.create({
lineHeight: 22,
textAlign: 'center',
marginTop: 8,
+ paddingLeft: 16,
+ paddingRight: 16,
},
imageSize: {
height: 100,
@@ -30,17 +32,17 @@ const styles = StyleSheet.create({
});
export type TextinDisabledScreenProps = {
+ title: string;
description: string;
};
export const TextingDisabledScreen = (props: TextinDisabledScreenProps) => {
- const {description} = props;
- const {t} = useTranslation([TEXTING_I18N_NAMESPACE]);
+ const {title, description} = props;
return (
<View style={styles.textingDisabledView}>
<Image source={Images.textinDisabledWarning} style={styles.imageSize} />
<Body UNSAFE_style={styles.textingUnavailable} weight='700'>
- {t('channelsScreen.textingDisabled.textingUnavailable')}
+ {title}
</Body>
<Body UNSAFE_style={styles.textingUnavailableDescription}>
{description}
--- src/screens/ChannelsScreen.tsx
@@ -103,6 +103,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = (
/>
) : (
<TextingDisabledScreen
+ title={t('channelsScreen.textingDisabled.textingUnavailable')}
description={
!userIsInRoster
? t('rosterScreen.notInRoster', {siteId: currentUserSite})
--- src/screens/RosterScreen.tsx
@@ -135,12 +135,12 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => {
<>
{/* @todo - determine if this should be shown on empty state */}
+ <RosterFilters associates={allAssociates} onFilter={onFilter} />
{!loading && !userIsInRoster && (
<Alert variant='warning' UNSAFE_style={styles.error}>
{t('rosterScreen.notInRoster', {siteId: currentUserSite})}
</Alert>
)}
- <RosterFilters associates={allAssociates} onFilter={onFilter} />
<TeamChatCard
style={styles.teamCard}
scrollToTop={handleScrollToTop}
--- src/translations/en-US.ts
@@ -45,7 +45,7 @@ export const enUS = {
},
teamListItem: {
viewTeam: 'View team',
- clockedIn: '{{count}} Clocked In',
+ clockedIn: '{{count}} Clocked in',
messageBtn: 'Message',
showTeamsFooter: 'Show teams',
hideTeamsFooter: 'Hide teams',
--- src/channels/components/TextingDisabled.tsx
@@ -22,6 +22,8 @@ const styles = StyleSheet.create({
lineHeight: 22,
textAlign: 'center',
marginTop: 8,
+ paddingLeft: 16,
+ paddingRight: 16,
},
imageSize: {
height: 100,
@@ -30,17 +32,17 @@ const styles = StyleSheet.create({
});
export type TextinDisabledScreenProps = {
+ title: string;
description: string;
};
export const TextingDisabledScreen = (props: TextinDisabledScreenProps) => {
- const {description} = props;
- const {t} = useTranslation([TEXTING_I18N_NAMESPACE]);
+ const {title, description} = props;
return (
<View style={styles.textingDisabledView}>
<Image source={Images.textinDisabledWarning} style={styles.imageSize} />
<Body UNSAFE_style={styles.textingUnavailable} weight='700'>
- {t('channelsScreen.textingDisabled.textingUnavailable')}
+ {title}
</Body>
<Body UNSAFE_style={styles.textingUnavailableDescription}>
{description}
--- src/screens/ChannelsScreen.tsx
@@ -103,6 +103,7 @@ export const ChannelsScreen: React.FC<ChannelScreenProps> = (
/>
) : (
<TextingDisabledScreen
+ title={t('channelsScreen.textingDisabled.textingUnavailable')}
description={
!userIsInRoster
? t('rosterScreen.notInRoster', {siteId: currentUserSite})
--- src/screens/RosterScreen.tsx
@@ -135,12 +135,12 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => {
<>
{/* @todo - determine if this should be shown on empty state */}
+ <RosterFilters associates={allAssociates} onFilter={onFilter} />
{!loading && !userIsInRoster && (
<Alert variant='warning' UNSAFE_style={styles.error}>
{t('rosterScreen.notInRoster', {siteId: currentUserSite})}
</Alert>
)}
- <RosterFilters associates={allAssociates} onFilter={onFilter} />
<TeamChatCard
style={styles.teamCard}
scrollToTop={handleScrollToTop}
--- src/translations/en-US.ts
@@ -45,7 +45,7 @@ export const enUS = {
},
teamListItem: {
viewTeam: 'View team',
- clockedIn: '{{count}} Clocked In',
+ clockedIn: '{{count}} Clocked in',
messageBtn: 'Message',
showTeamsFooter: 'Show teams',
hideTeamsFooter: 'Hide teams',
| update the style for text, clocked in change | update the style for text, clocked in change
|
8fd0963ed3c38011e319e22ec26b29030c4a9ff3 | --- core/__tests__/navigation/USHallway/AssociateHallwayNav/Tabs/__snapshots__/HomeStackNavTest.tsx.snap
@@ -61,7 +61,7 @@ exports[`HomeStackNav has expected behavior 1`] = `
name="torInbox"
options={
{
- "headerShown": false,
+ "headerShown": true,
}
}
tags={
@@ -159,7 +159,7 @@ exports[`HomeStackNav has expected behavior 2`] = `
name="torInbox"
options={
{
- "headerShown": false,
+ "headerShown": true,
}
}
tags={
| TOR inbox header update snapshot | TOR inbox header update snapshot
|
3008c00543b69dce514f2c6d5bd71e7a7f857c03 | --- package-lock.json
@@ -3218,9 +3218,9 @@
}
},
"@walmart/welcomeme-mini-app": {
- "version": "0.10.0",
- "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.10.0.tgz",
- "integrity": "sha512-1inuWksM02Nj6bNGQ9RvC6LoHEipX05IgR82PPKd/Z89BQAXYz65KgIUvzaHV4BNTb1EQltFXfNc3VF/TLmb4g=="
+ "version": "0.15.0",
+ "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.15.0.tgz",
+ "integrity": "sha512-93n+RztJtrpMveB0HpCxKDvFdc0p7HZiytSUGYmnSsODNqoFFs0H3sk0CcnAR0iT3UrXCV2tC5xY13W1R+Td6w=="
},
"@walmart/wfm-ui": {
"version": "0.1.50",
--- package.json
@@ -83,7 +83,7 @@
"@walmart/settings-mini-app": "1.2.3",
"@walmart/time-clock-mini-app": "0.3.1",
"@walmart/ui-components": "1.1.14",
- "@walmart/welcomeme-mini-app": "0.10.0",
+ "@walmart/welcomeme-mini-app": "0.15.0",
"@walmart/wfm-ui": "^0.1.50",
"axios-cache-adapter": "2.7.3",
"crypto-js": "^3.3.0",
| welcomeme-mini version increment | welcomeme-mini version increment
|
b923ef0c49e543c6992234c849140c8259ab11e6 | --- src/channels/provider.tsx
@@ -347,23 +347,21 @@ export const ChannelsProvider = (props: PropsWithChildren<{}>) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [channelState.dataById, viewerId]);
- useMemo(() => {
+ useEffect(() => {
dispatch(
wmConnectSlice.actions.UPDATE_UNREAD_CHANNELS_COUNT(
channelState.totalUnreadChannels,
),
);
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [channelState.totalUnreadChannels]);
+ }, [dispatch, channelState.totalUnreadChannels]);
- useMemo(() => {
+ useEffect(() => {
dispatch(
wmConnectSlice.actions.UPDATE_UNREAD_MESSAGES_COUNT(
channelState.totalUnread,
),
);
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [channelState.totalUnread]);
+ }, [dispatch, channelState.totalUnread]);
const value = useMemo(
() => ({
| feat(ui): update channel provider | feat(ui): update channel provider
|
85b7af07abe32c47c78ec4fcce4c0e01c120f948 | --- package.json
@@ -145,7 +145,7 @@
"@walmart/shelfavailability-mini-app": "1.5.26",
"@walmart/store-feature-orders": "1.26.9",
"@walmart/taskit-mini-app": "3.0.1",
- "@walmart/time-clock-mini-app": "2.393.0",
+ "@walmart/time-clock-mini-app": "2.394.0",
"@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch",
"@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch",
"@walmart/welcomeme-mini-app": "0.94.0",
--- yarn.lock
@@ -7121,9 +7121,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/time-clock-mini-app@npm:2.393.0":
- version: 2.393.0
- resolution: "@walmart/time-clock-mini-app@npm:2.393.0"
+"@walmart/time-clock-mini-app@npm:2.394.0":
+ version: 2.394.0
+ resolution: "@walmart/time-clock-mini-app@npm:2.394.0"
dependencies:
"@react-navigation/elements": "npm:^1.3.1"
moment-timezone: "npm:0.5.33"
@@ -7166,7 +7166,7 @@ __metadata:
uuid: ^3.3.2
wifi-store-locator: ^1.4.0
xdate: ^0.8.2
- checksum: 10c0/c58795707e37348e66e2648e27a37f8f4bd88fe880d554afc8e8b2e968da45967a204460764f3cb91a5f146896b20b7e26a91abcf9d6ed79cbd72b5a518cd501
+ checksum: 10c0/e53978211566b8f0991756f3acf05e7cee47ffb73a96be0bca3d48ea9c5a1ee5158da0dfa506b892f218e782c01b045b112bd847cb489aa15a363dc22cf83fe4
languageName: node
linkType: hard
@@ -7762,7 +7762,7 @@ __metadata:
"@walmart/shelfavailability-mini-app": "npm:1.5.26"
"@walmart/store-feature-orders": "npm:1.26.9"
"@walmart/taskit-mini-app": "npm:3.0.1"
- "@walmart/time-clock-mini-app": "npm:2.393.0"
+ "@walmart/time-clock-mini-app": "npm:2.394.0"
"@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch"
"@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch"
"@walmart/welcomeme-mini-app": "npm:0.94.0"
| Update TCMA to 2.394.0 | Update TCMA to 2.394.0
|
7cb5f605a7f43bf0575cf57d1f85b40c1c6a38eb | --- targets/US/package.json
@@ -91,7 +91,7 @@
"@walmart/avp-shared-library": "0.10.1",
"@walmart/backroom-mini-app": "1.7.4",
"@walmart/calling-mini-app": "0.5.17",
- "@walmart/checkout-mini-app": "4.0.10",
+ "@walmart/checkout-mini-app": "4.0.14",
"@walmart/compass-sdk-rn": "5.19.15",
"@walmart/config-components": "4.4.5",
"@walmart/core-services": "~6.5.2",
--- yarn.lock
@@ -6153,9 +6153,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/checkout-mini-app@npm:4.0.10":
- version: 4.0.10
- resolution: "@walmart/checkout-mini-app@npm:4.0.10"
+"@walmart/checkout-mini-app@npm:4.0.14":
+ version: 4.0.14
+ resolution: "@walmart/checkout-mini-app@npm:4.0.14"
dependencies:
"@stomp/stompjs": "npm:^7.0.0"
cpc-input: "npm:^1.7.28"
@@ -6193,7 +6193,7 @@ __metadata:
react-native-safe-area-context: "*"
react-redux: ^8.1.3
redux: ^4.0.5
- checksum: 10c0/2e4672a576ef35206fb9b951439b77a765ff5e075459948cf8ad665935e485eabb90970dbb65830cfdd4335779880c25391a6caf7bbd26fb7255c56f8a6ae218
+ checksum: 10c0/6c47ba086628124e07cfa6b46d6faec958de12d12e91bafcbcf3ac2fdbfa800b87d0deb6908df5be2d9a393f851bb72f70cd82836cb651f100c9643ab8024062
languageName: node
linkType: hard
@@ -7003,7 +7003,7 @@ __metadata:
"@walmart/avp-shared-library": "npm:0.10.1"
"@walmart/backroom-mini-app": "npm:1.7.4"
"@walmart/calling-mini-app": "npm:0.5.17"
- "@walmart/checkout-mini-app": "npm:4.0.10"
+ "@walmart/checkout-mini-app": "npm:4.0.14"
"@walmart/compass-sdk-rn": "npm:5.19.15"
"@walmart/config-components": "npm:4.4.5"
"@walmart/core-services": "npm:~6.5.2"
| CO : 4.0.14 | CO : 4.0.14
|
a734a1711ca11f29e78409970d609e8bef817370 | --- graphql.yml
@@ -85,7 +85,8 @@ applications:
hash: '8a0ff1bceff296ade72cd86c88273c0924510d42ff6bd3487819814045781f31'
queryTemplate: 'src/queries/getTeamById.graphql'
tags:
- - 'v1'
+ - 'v2'
+ - 'Drop16'
- name: 'GetTeamsByStore'
hash: '873fc65ca1ee7ff9f729ef6efc5c674ab9a9037b1838693e0fcbe9a00031a513'
queryTemplate: 'src/queries/getTeamsbyStore.graphql'
--- graphql.yml
@@ -85,7 +85,8 @@ applications:
hash: '8a0ff1bceff296ade72cd86c88273c0924510d42ff6bd3487819814045781f31'
queryTemplate: 'src/queries/getTeamById.graphql'
tags:
- - 'v1'
+ - 'v2'
+ - 'Drop16'
- name: 'GetTeamsByStore'
hash: '873fc65ca1ee7ff9f729ef6efc5c674ab9a9037b1838693e0fcbe9a00031a513'
queryTemplate: 'src/queries/getTeamsbyStore.graphql'
| Added requested PR changes | Added requested PR changes
|
de4b6cc0b2397b529637e6f441a543f9ab0a78fa | --- __tests__/communications/vanillaTest.tsx
@@ -1,39 +0,0 @@
-import React from 'react';
-import firestore from '@react-native-firebase/firestore';
-import {createAssociateChannelId} from '../../src/channels';
-import {rawUserList} from '../harness/firestore/data/users';
-import {createMockChannelsContext} from '../harness/firestore/channelsProvider';
-
-describe('vanilla', () => {
- it('testing stuff', () => {
- return firestore
- .collection('text_channels')
- .doc('STORE_100')
- .collection('channels')
- .doc(createAssociateChannelId([rawUserList[0], rawUserList[1]]))
- .get()
- .then((channelDoc) => {
- console.log(channelDoc.data());
- });
- });
-
- it('query scratchpad', async () => {
- const store100ChannelDocs = (
- await firestore
- .collection('text_channels')
- .doc('STORE_100')
- .collection('channels')
- .get()
- ).docs;
- console.log(store100ChannelDocs);
- });
-
- it('print mock channels context', async () => {
- const channelsContext = await createMockChannelsContext(
- firestore,
- 'STORE_100',
- );
-
- console.log(channelsContext);
- });
-});
--- __tests__/communications/vanillaTest.tsx
@@ -1,39 +0,0 @@
-import React from 'react';
-import firestore from '@react-native-firebase/firestore';
-import {createAssociateChannelId} from '../../src/channels';
-import {rawUserList} from '../harness/firestore/data/users';
-import {createMockChannelsContext} from '../harness/firestore/channelsProvider';
-
-describe('vanilla', () => {
- it('testing stuff', () => {
- return firestore
- .collection('text_channels')
- .doc('STORE_100')
- .collection('channels')
- .doc(createAssociateChannelId([rawUserList[0], rawUserList[1]]))
- .get()
- .then((channelDoc) => {
- console.log(channelDoc.data());
- });
- });
-
- it('query scratchpad', async () => {
- const store100ChannelDocs = (
- await firestore
- .collection('text_channels')
- .doc('STORE_100')
- .collection('channels')
- .get()
- ).docs;
- console.log(store100ChannelDocs);
- });
-
- it('print mock channels context', async () => {
- const channelsContext = await createMockChannelsContext(
- firestore,
- 'STORE_100',
- );
-
- console.log(channelsContext);
- });
-});
| remove vanilla tests not needed | remove vanilla tests not needed
|
f4cac31091e14eb4eea4aa3574e8e9e47d3339cb | --- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/TeamSelectionList.tsx
@@ -77,11 +77,40 @@ export const TeamSelectionList = ({
logger.info('managerExperienceMutation success', {
message: 'Manager experience mutation completed',
});
+ if (isUserAlreadyOnboarded) {
+ dispatch(
+ ManagerExperienceCreators.completeTeamSelection(
+ Date.now().toString()
+ )
+ );
+ AllsparkNavigationClient.navigate(hubScreeName, {
+ teamSelectionComplete: selectedTeams,
+ });
+ } else {
+ dispatch(ManagerExperienceCreators.completeUserOnboarding());
+ if (hubScreeName) {
+ AllsparkNavigationClient.navigate(hubScreeName);
+ } else {
+ AllsparkNavigationClient.dispatch(StackActions.pop(2));
+ }
+ }
},
onError: (err: any) => {
logger.error('managerExperienceMutation error', {
message: `${err}`,
});
+ teamSelectionTelemetry.logEvent('save_teams_event', {
+ message: 'Save teams event failed',
+ win: win as string,
+ site: String(site),
+ });
+ if (isUserAlreadyOnboarded) {
+ dispatch(
+ ManagerExperienceCreators.userTeamSelectionFailed(err.message)
+ );
+ } else {
+ dispatch(ManagerExperienceCreators.userOnboardingFailed(err.message));
+ }
},
});
@@ -109,40 +138,7 @@ export const TeamSelectionList = ({
countryCode: countryCode,
})) as TeamPreference[],
},
- })
- .then(() => {
- if (isUserAlreadyOnboarded) {
- dispatch(
- ManagerExperienceCreators.completeTeamSelection(
- Date.now().toString()
- )
- );
- AllsparkNavigationClient.navigate(hubScreeName, {
- teamSelectionComplete: selectedTeams,
- });
- } else {
- dispatch(ManagerExperienceCreators.completeUserOnboarding());
- if (hubScreeName) {
- AllsparkNavigationClient.navigate(hubScreeName);
- } else {
- AllsparkNavigationClient.dispatch(StackActions.pop(2));
- }
- }
- })
- .catch((err: Error) => {
- teamSelectionTelemetry.logEvent('save_teams_event', {
- message: 'Save teams event failed',
- win: win as string,
- site: String(site),
- });
- if (isUserAlreadyOnboarded) {
- dispatch(
- ManagerExperienceCreators.userTeamSelectionFailed(err.message)
- );
- } else {
- dispatch(ManagerExperienceCreators.userOnboardingFailed(err.message));
- }
- });
+ });
//TODO: Add confirmation screen navigation
logger.info('Save teams event', {
message: 'Save teams event triggered',
| Update the few changes on the hub for imports | Update the few changes on the hub for imports
|
b15b7f61d5c8acc28124306cb102a42c5adf51d6 | --- package.json
@@ -104,7 +104,7 @@
"@walmart/iteminfo-mini-app": "7.5.7",
"@walmart/manager-approvals-miniapp": "0.2.4",
"@walmart/me-field-mini-app": "14.0.2",
- "@walmart/metrics-mini-app": "0.15.13",
+ "@walmart/metrics-mini-app": "0.14.2",
"@walmart/mod-flex-mini-app": "1.11.6",
"@walmart/moment-walmart": "1.0.4",
"@walmart/onewalmart-miniapp": "1.0.16",
| metrics version bump for coming soon TEST | metrics version bump for coming soon TEST
|
f2851f4b6036847c0039a173534fd9881132c4df | --- jest.config.js
@@ -11,7 +11,7 @@ module.exports = {
coverageThreshold: {
global: {
statements: 88,
- branches: 83,
+ branches: 80,
functions: 79,
lines: 88,
},
| reduce target coverage to pass husky error | reduce target coverage to pass husky error
|
40ba2b39a878e40c9f5645e21f972eb625b70767 | --- __tests__/__mocks__/@walmart/allspark-foundation/Network.js
@@ -2,6 +2,7 @@ module.exports = {
...jest.requireActual('@walmart/allspark-foundation/Network'),
useNetwork: jest.fn(),
NetworkSelectors: {
+ getData: jest.fn(),
getNetworkState: jest.fn(),
getType: jest.fn(),
getNetworkType: jest.fn(),
--- __tests__/settings/dataSaver/sagasTest.ts
@@ -1,4 +1,14 @@
import {User} from '@walmart/redux-store';
+import {all, call, debounce, put, select, takeLatest} from 'redux-saga/effects';
+import {
+ NetworkActionTypes,
+ NetworkSelectors,
+} from '@walmart/allspark-foundation/Network';
+import {UserSelectors} from '@walmart/allspark-foundation/User';
+import {LocalStorageService} from '@walmart/allspark-foundation/LocalStorage';
+import {LoggerService} from '@walmart/allspark-foundation/Logger';
+import {AllsparkHttpClient} from '@walmart/allspark-foundation/HTTP';
+
import {
createDataSaverKey,
syncDataSaverSetting,
@@ -9,36 +19,18 @@ import {
dataSaverSagas,
updateConnectivityWarning,
} from '../../../src/settings/dataSaver/sagas';
-import {all, call, put, select, takeLatest} from 'redux-saga/effects';
-import {getDeferredLocalStorageContext} from '@walmart/core-services/LocalStorage';
import {
SettingsActionCreators,
SettingsActionTypes,
} from '../../../src/settings/redux';
-import {getDeferredLoggerContext} from '@walmart/core-services/Logger';
-import {
- NetworkGlobalSelectors,
- NetworkTypes,
-} from '@walmart/core-services/Network';
-import HttpClient from '@walmart/allspark-http-client';
import {
getDataSaverOn,
getSettingsAppConfig,
} from '../../../src/settings/selectors';
-import {
- NetworkActionTypes,
- NetworkSelectors,
-} from '@walmart/allspark-foundation/Network';
-import {UserSelectors} from '@walmart/allspark-foundation/User';
-import {LocalStorage} from '../../../src/core/LocalStorage';
-import {LocalStorageService} from '@walmart/allspark-foundation/LocalStorage';
-import {LoggerService} from '@walmart/allspark-foundation/Logger';
-import {AllsparkHttpClient} from '@walmart/allspark-foundation/HTTP';
+import {getShowConnectivityWarning} from '../../../src/redux/SharedSelectors';
const user = {userId: 'swalton3'} as User;
const dataSaverKey = 'swalton3_data_saver';
-const localStorage = {get: jest.fn(), set: jest.fn()};
-const logger = {error: jest.fn()};
describe('createDataSaverKey', () => {
it('handles defined user', () => {
@@ -60,9 +52,7 @@ describe('syncDataSaverSetting', () => {
expect(iterator.next('true').value).toEqual(
put(SettingsActionCreators.DATA_SAVER_CHANGE(true)),
);
- expect(iterator.next('true').value).toEqual(
- put(SettingsActionCreators.SHOW_CONNECTIVITY_WARNING(true)),
- );
+ expect(iterator.next().value).toEqual(call(updateConnectivityWarning));
expect(iterator.next().done).toEqual(true);
});
@@ -75,9 +65,7 @@ describe('syncDataSaverSetting', () => {
expect(iterator.next('false').value).toEqual(
put(SettingsActionCreators.DATA_SAVER_CHANGE(false)),
);
- expect(iterator.next('false').value).toEqual(
- put(SettingsActionCreators.SHOW_CONNECTIVITY_WARNING(false)),
- );
+ expect(iterator.next().value).toEqual(call(updateConnectivityWarning));
expect(iterator.next().done).toEqual(true);
});
@@ -164,40 +152,13 @@ describe('updateHttpClientForDataSaver', () => {
describe('updateConnectivityWarning', () => {
it('handles data saver on without wifi connection', () => {
- const dataSaverOn = true;
- const iterator = updateConnectivityWarning(dataSaverOn);
- expect(iterator.next().value).toEqual(
- select(NetworkSelectors.getNetworkType),
- );
- expect(iterator.next('cellular').value).toEqual(
+ const iterator = updateConnectivityWarning();
+ expect(iterator.next().value).toEqual(select(getShowConnectivityWarning));
+ expect(iterator.next(true).value).toEqual(
put(SettingsActionCreators.SHOW_CONNECTIVITY_WARNING(true)),
);
expect(iterator.next().done).toEqual(true);
});
-
- it('handles data saver on with wifi connection', () => {
- const dataSaverOn = true;
- const iterator = updateConnectivityWarning(dataSaverOn);
- expect(iterator.next().value).toEqual(
- select(NetworkSelectors.getNetworkType),
- );
- expect(iterator.next('wifi').value).toEqual(
- put(SettingsActionCreators.SHOW_CONNECTIVITY_WARNING(false)),
- );
- expect(iterator.next().done).toEqual(true);
- });
-
- it('handles data saver off', () => {
- const dataSaverOn = false;
- const iterator = updateConnectivityWarning(dataSaverOn);
- expect(iterator.next().value).toEqual(
- select(NetworkSelectors.getNetworkType),
- );
- expect(iterator.next('cellular').value).toEqual(
- put(SettingsActionCreators.SHOW_CONNECTIVITY_WARNING(false)),
- );
- expect(iterator.next().done).toEqual(true);
- });
});
describe('onDataSaverChange', () => {
@@ -207,9 +168,7 @@ describe('onDataSaverChange', () => {
payload: false,
});
expect(iterator.next().value).toEqual(call(persistDataSaverSetting, false));
- expect(iterator.next().value).toEqual(
- call(updateConnectivityWarning, false),
- );
+ expect(iterator.next().value).toEqual(call(updateConnectivityWarning));
expect(iterator.next().done).toEqual(true);
});
@@ -220,9 +179,7 @@ describe('onDataSaverChange', () => {
});
expect(iterator.next().value).toEqual(call(persistDataSaverSetting, true));
expect(iterator.next().value).toEqual(call(updateHttpClientForDataSaver));
- expect(iterator.next().value).toEqual(
- call(updateConnectivityWarning, true),
- );
+ expect(iterator.next().value).toEqual(call(updateConnectivityWarning));
expect(iterator.next().done).toEqual(true);
});
});
@@ -240,9 +197,7 @@ describe('onNetworkChange', () => {
expect(iterator.next({enableDataSaver: true}).value).toEqual(
select(getDataSaverOn),
);
- expect(iterator.next(false).value).toEqual(
- call(updateConnectivityWarning, false),
- );
+ expect(iterator.next(false).value).toEqual(call(updateConnectivityWarning));
expect(iterator.next().done).toEqual(true);
});
@@ -255,9 +210,7 @@ describe('onNetworkChange', () => {
expect(iterator.next(true).value).toEqual(
call(updateHttpClientForDataSaver),
);
- expect(iterator.next().value).toEqual(
- call(updateConnectivityWarning, true),
- );
+ expect(iterator.next().value).toEqual(call(updateConnectivityWarning));
expect(iterator.next().done).toEqual(true);
});
});
@@ -268,7 +221,7 @@ test('dataSaverSagas', () => {
expect(iterator.next().value).toEqual(
all([
takeLatest(SettingsActionTypes.DATA_SAVER_CHANGE, onDataSaverChange),
- takeLatest(NetworkActionTypes.STATE_CHANGED, onNetworkChange),
+ debounce(500, NetworkActionTypes.STATE_CHANGED, onNetworkChange),
]),
);
});
--- jest.config.js
@@ -3,10 +3,10 @@ module.exports = {
coverageReporters: ['lcov', 'text'],
coverageThreshold: {
global: {
- statements: 99,
- branches: 97.5,
- functions: 98.1,
- lines: 99,
+ statements: 95,
+ branches: 95,
+ functions: 95,
+ lines: 95,
},
},
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
| chore: fix data saver saga tests | chore: fix data saver saga tests
|
ad1a77eb0c7d702ea7aef017cde36866429ed172 | --- packages/allspark-foundation/src/Container/AllsparkContainer.tsx
@@ -176,7 +176,9 @@ export class AllsparkContainer<
const setupList = this._setupMap.get(type);
if (setupList) {
+ AllsparkReduxStore.dispatch(ContainerActionCreators.SETUP_BEGIN(type));
await Promise.all(setupList.map((config) => config.setup()));
+ AllsparkReduxStore.dispatch(ContainerActionCreators.SETUP_COMPLETE(type));
}
this.eventManager.runEvent('onSetup', type);
--- packages/allspark-foundation/src/Container/redux.ts
@@ -8,13 +8,17 @@ import { InferActionTypes } from '../Redux/types';
export type ContainerState = {
name: string;
isStartingUp: boolean;
- isSafeForFeatures: boolean;
+ isSafeForFeatureSetup: boolean;
+ isSafeForFeatureStartup: boolean;
+ activeSetupType: string | null;
};
const INITIAL_STATE: ContainerState = {
name: 'default',
isStartingUp: true,
- isSafeForFeatures: false,
+ isSafeForFeatureSetup: false,
+ isSafeForFeatureStartup: false,
+ activeSetupType: null,
};
export const containerSlice = createSlice({
@@ -26,17 +30,29 @@ export const containerSlice = createSlice({
},
STARTUP_BEGIN: (state) => {
state.isStartingUp = true;
- state.isSafeForFeatures = false;
+ state.isSafeForFeatureSetup = false;
},
STARTUP_COMPLETE: (state) => {
state.isStartingUp = false;
- state.isSafeForFeatures = true;
+ state.isSafeForFeatureSetup = true;
+ },
+ SETUP_BEGIN: (state, action: PayloadAction<string>) => {
+ state.activeSetupType = action.payload;
+ },
+ SETUP_COMPLETE: (state, _: PayloadAction<string>) => {
+ state.activeSetupType = null;
},
SAFE_FOR_FEATURES: (state) => {
- state.isSafeForFeatures = true;
+ state.isSafeForFeatureSetup = true;
},
UNSAFE_FOR_FEATURES: (state) => {
- state.isSafeForFeatures = false;
+ state.isSafeForFeatureSetup = false;
+ },
+ SAFE_FOR_FEATURE_STARTUP: (state) => {
+ state.isSafeForFeatureStartup = true;
+ },
+ UNSAFE_FOR_FEATURE_STARTUP: (state) => {
+ state.isSafeForFeatureStartup = false;
},
},
});
| feat: add container actions for setup. refactor actions to distinguish between setup and startup | feat: add container actions for setup. refactor actions to distinguish between setup and startup
|
4168250d2fcdd4b50ecd4f0d94ab9696c54bad52 | --- src/screens/RosterScreen.tsx
@@ -2,8 +2,6 @@ import React from 'react';
import {Roster} from '../components/Roster/Roster';
import {View} from 'react-native';
-
-
export const RosterScreen: React.FC<any> = () => {
return (
<View style={{paddingVertical: 24, flex: 1}}>
| fix spacing | fix spacing
|
750d8e7c81fad898424c4201f6322c74e3abecbf | --- targets/US/package.json
@@ -147,9 +147,9 @@
"@walmart/shop-gnfr-mini-app": "1.0.137",
"@walmart/sidekick-mini-app": "4.84.14",
"@walmart/store-feature-orders": "1.27.1",
- "@walmart/topstock-mini-app": "1.19.2",
"@walmart/taskit-mini-app": "4.25.8",
"@walmart/time-clock-mini-app": "2.448.1",
+ "@walmart/topstock-mini-app": "1.19.4",
"@walmart/translator-mini-app": "1.3.7",
"@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.17.1#~/.yarn/patches/@walmart-ui-components-npm-1.17.1-4a29feac03.patch",
"@walmart/walmart-fiscal-week": "^0.3.6",
| fix():bumped up topstock version | fix():bumped up topstock version
|
021e88d51693cff3e00726fa0a03a723419f8dee | --- packages/allspark-foundation/src/Feature/AllsparkFeature.tsx
@@ -15,6 +15,7 @@ import { AllsparkTranslationClient } from '../Translation';
import { AllsparkFeatureModule } from './AllsparkFeatureModule';
import {
AllsparkModuleConfig,
+ IAllsparkFeatureFlows,
IAllsparkFeatureListeners,
IAllsparkFeatureModals,
IAllsparkFeatureRedux,
@@ -176,10 +177,21 @@ export class AllsparkFeature<ID extends string = string> {
return TelemetryService.createFeatureInstance(this.id, config);
}
+ /**
+ * Creates a flows object ready to be used with `AllsparkFeature.createModule()`
+ * @param listeners - An object containing feature flows.
+ * @returns A flows object to be used when creating an AllsparkFeatureModule.
+ * @example
+ * const MyFeatureListeners = MyFeature.createFlows({
+ * startup: handleFeatureStartup
+ * });
+ */
+ public createFlows = <F extends IAllsparkFeatureFlows>(flows: F) => flows;
+
/**
* Creates a listeners object ready to be used with `AllsparkFeature.createModule()`
* @param listeners - An object containing feature listeners.
- * @returns An listeners object to be used when creating an AllsparkFeatureModule.
+ * @returns A listeners object to be used when creating an AllsparkFeatureModule.
* @example
* const MyFeatureListeners = MyFeature.createListeners({
* notification: {
| chore: fix: add missing feature flows creator | chore: fix: add missing feature flows creator
|
6b173ec4be85b25c70ad1299129bec8a9851f016 | --- src/components/TeamList.tsx
@@ -214,7 +214,7 @@ export const TeamItem = (props: TeamItemProps) => {
const onViewTeam = () => {
analytics('view_team', {
- message: 'navigate to the view team page',
+ message: 'navigate to the view team screen',
teamName: team?.teamName,
teamID: teamId,
});
| feat: updated page to screen | feat: updated page to screen
|
ca01001cc84f2d69875647cb1b5687fd34014c37 | --- src/containers/RosterFilters.tsx
@@ -70,7 +70,7 @@ export const RosterFilters = (props: {
);
setFilters(newFilters);
}
- }, [rosterData]);
+ }, [rosterData, availableCount]);
return (
<View style={styles.container}>
--- src/containers/RosterFilters.tsx
@@ -70,7 +70,7 @@ export const RosterFilters = (props: {
);
setFilters(newFilters);
}
- }, [rosterData]);
+ }, [rosterData, availableCount]);
return (
<View style={styles.container}>
| update filter chip avaible count to update when presence changes | update filter chip avaible count to update when presence changes
|
e861c0a32984cf24e5bb236f7bc44a1aec84e8e5 | --- core/__tests__/navigation/USHallway/AssociateHallwayNav/Tabs/__snapshots__/MeStackNavTest.tsx.snap
@@ -32,7 +32,8 @@ exports[`MeStackNav matches snapshot 1`] = `
screenOptions={
{
"header": [Function],
- "headerShown": false,
+ "headerRight": [Function],
+ "headerShown": true,
}
}
>
--- core/__tests__/navigation/USHallway/AssociateHallwayNav/Tabs/__snapshots__/MyTeamStackNavTest.tsx.snap
@@ -6,6 +6,7 @@ exports[`MyTeamStackNav matches snapshot - attendanceminiapp false 1`] = `
{
"header": [Function],
"headerMode": "float",
+ "headerRight": [Function],
"headerShown": false,
}
}
@@ -58,6 +59,7 @@ exports[`MyTeamStackNav matches snapshot 1`] = `
{
"header": [Function],
"headerMode": "float",
+ "headerRight": [Function],
"headerShown": false,
}
}
| Fix tests | Fix tests
|
788b18ee7304159f58bc3103649b11a181d70590 | --- .looper.multibranch.yml
@@ -5,5 +5,4 @@ updateTaskStatusOnGit: true # added as per discussion on SREDP-11895
envs:
global:
variables:
- TEMPLATE_REPO_BRANCH: feature/WiFiAPEnabled
ALLOW_NPM_PUSH_TO_AF: true
| remove wifi variable for time clock | remove wifi variable for time clock
|
26b713ecb32ea8b072968e8517ae47866f8a48fe | --- __tests__/home/components/TaskCard/__snapshots__/indexTest.tsx.snap
@@ -26,17 +26,25 @@ exports[`TaskCard doesnt render clock status if config value is false 1`] = `
>
teams.teamTaskTitle
</Headline>
- <TaskCards
- onRefreshEnd={[MockFunction]}
- onRefreshStart={[MockFunction]}
- refresh={false}
- refreshKey="TaskCard"
+ <View
style={
Object {
- "backgroundColor": "red",
+ "display": "flex",
}
}
- />
+ >
+ <TaskCards
+ onRefreshEnd={[MockFunction]}
+ onRefreshStart={[MockFunction]}
+ refresh={false}
+ refreshKey="TaskCard"
+ style={
+ Object {
+ "backgroundColor": "red",
+ }
+ }
+ />
+ </View>
</View>
`;
@@ -75,17 +83,25 @@ exports[`TaskCard matches team view 1 if config version is 1 1`] = `
}
}
/>
- <TaskCards
- onRefreshEnd={[MockFunction]}
- onRefreshStart={[MockFunction]}
- refresh={false}
- refreshKey="TaskCard"
+ <View
style={
Object {
- "backgroundColor": "red",
+ "display": "flex",
}
}
- />
+ >
+ <TaskCards
+ onRefreshEnd={[MockFunction]}
+ onRefreshStart={[MockFunction]}
+ refresh={false}
+ refreshKey="TaskCard"
+ style={
+ Object {
+ "backgroundColor": "red",
+ }
+ }
+ />
+ </View>
</View>
`;
@@ -124,6 +140,25 @@ exports[`TaskCard should not render if copilot is enabled 1`] = `
}
}
/>
+ <View
+ style={
+ Object {
+ "display": "none",
+ }
+ }
+ >
+ <TaskCards
+ onRefreshEnd={[MockFunction]}
+ onRefreshStart={[MockFunction]}
+ refresh={false}
+ refreshKey="TaskCard"
+ style={
+ Object {
+ "backgroundColor": "red",
+ }
+ }
+ />
+ </View>
</View>
`;
@@ -162,17 +197,25 @@ exports[`TaskCard should render teamCard2 1`] = `
}
}
/>
- <TaskCards
- onRefreshEnd={[MockFunction]}
- onRefreshStart={[MockFunction]}
- refresh={false}
- refreshKey="TaskCard"
+ <View
style={
Object {
- "backgroundColor": "red",
+ "display": "flex",
}
}
- />
+ >
+ <TaskCards
+ onRefreshEnd={[MockFunction]}
+ onRefreshStart={[MockFunction]}
+ refresh={false}
+ refreshKey="TaskCard"
+ style={
+ Object {
+ "backgroundColor": "red",
+ }
+ }
+ />
+ </View>
</View>
`;
@@ -211,17 +254,25 @@ exports[`TaskCard shows card if clocked in and store view of no teams 1`] = `
}
}
/>
- <TaskCards
- onRefreshEnd={[MockFunction]}
- onRefreshStart={[MockFunction]}
- refresh={false}
- refreshKey="TaskCard"
+ <View
style={
Object {
- "backgroundColor": "red",
+ "display": "flex",
}
}
- />
+ >
+ <TaskCards
+ onRefreshEnd={[MockFunction]}
+ onRefreshStart={[MockFunction]}
+ refresh={false}
+ refreshKey="TaskCard"
+ style={
+ Object {
+ "backgroundColor": "red",
+ }
+ }
+ />
+ </View>
</View>
`;
@@ -260,16 +311,24 @@ exports[`TaskCard shows team view if clocked in and teams present 1`] = `
}
}
/>
- <TaskCards
- onRefreshEnd={[MockFunction]}
- onRefreshStart={[MockFunction]}
- refresh={false}
- refreshKey="TaskCard"
+ <View
style={
Object {
- "backgroundColor": "red",
+ "display": "flex",
}
}
- />
+ >
+ <TaskCards
+ onRefreshEnd={[MockFunction]}
+ onRefreshStart={[MockFunction]}
+ refresh={false}
+ refreshKey="TaskCard"
+ style={
+ Object {
+ "backgroundColor": "red",
+ }
+ }
+ />
+ </View>
</View>
`;
--- package-lock.json
@@ -81,7 +81,7 @@
"@walmart/schedule-mini-app": "0.37.0",
"@walmart/settings-mini-app": "1.18.1",
"@walmart/shelfavailability-mini-app": "1.5.16",
- "@walmart/taskit-mini-app": "2.40.3",
+ "@walmart/taskit-mini-app": "2.40.5",
"@walmart/time-clock-mini-app": "2.98.0",
"@walmart/topstock-mini-app": "1.0.6",
"@walmart/ui-components": "1.15.0",
@@ -6004,9 +6004,9 @@
}
},
"node_modules/@walmart/taskit-mini-app": {
- "version": "2.40.3",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.3.tgz",
- "integrity": "sha512-eXG9NXxRPPbeTKR06/ajP7f4Zvr8G/sANHb1IhVkhQkTY4eQV8ZkBBxnrWyDXZvec2HLNicr29RWdxoWUyy6iQ==",
+ "version": "2.40.5",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.5.tgz",
+ "integrity": "sha512-Jqab31rzSYArJqSCWFjRdYJe7PZEky/Ngj7WHhQ2Vj3iuXx7Af5Kar41gNKw3bbVIy/V0G11o3m2gBz/ttEPkQ==",
"peerDependencies": {
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@types/lodash": ">=4.14.176",
@@ -25399,9 +25399,9 @@
"version": "1.5.16"
},
"@walmart/taskit-mini-app": {
- "version": "2.40.3",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.3.tgz",
- "integrity": "sha512-eXG9NXxRPPbeTKR06/ajP7f4Zvr8G/sANHb1IhVkhQkTY4eQV8ZkBBxnrWyDXZvec2HLNicr29RWdxoWUyy6iQ=="
+ "version": "2.40.5",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.40.5.tgz",
+ "integrity": "sha512-Jqab31rzSYArJqSCWFjRdYJe7PZEky/Ngj7WHhQ2Vj3iuXx7Af5Kar41gNKw3bbVIy/V0G11o3m2gBz/ttEPkQ=="
},
"@walmart/tcnumber": {
"version": "2.3.3",
--- package.json
@@ -123,7 +123,7 @@
"@walmart/schedule-mini-app": "0.37.0",
"@walmart/settings-mini-app": "1.18.1",
"@walmart/shelfavailability-mini-app": "1.5.16",
- "@walmart/taskit-mini-app": "2.40.3",
+ "@walmart/taskit-mini-app": "2.40.5",
"@walmart/time-clock-mini-app": "2.98.0",
"@walmart/topstock-mini-app": "1.0.6",
"@walmart/ui-components": "1.15.0",
--- src/home/components/TaskCard/index.tsx
@@ -53,7 +53,9 @@ export const TaskCard: FC<TaskCardProps> = (props) => {
)}
</>
)}
- {!copilot.enabled && <TaskCards {...props} />}
+ <View style={copilot.enabled ? styles.disableCard : styles.enableCard}>
+ <TaskCards {...props} />
+ </View>
</View>
) : null;
};
--- src/home/components/TaskCard/styles.ts
@@ -49,4 +49,10 @@ export default StyleSheet.create({
viewRosterButton: {
alignSelf: 'flex-start',
},
+ enableCard: {
+ display: 'flex',
+ },
+ disableCard: {
+ display: 'none',
+ },
});
| chore(DWORK-00): bump taskit and home card bug fix | chore(DWORK-00): bump taskit and home card bug fix
|
9b3c6b4f7f627fac408366a38f8731316c3f7037 | --- .solidarity
@@ -20,8 +20,8 @@
"rule": "cli",
"binary": "pod",
"platform": "darwin",
- "semver": "1.11.3"
+ "semver": "1.12.0"
}
]
}
-}
\ No newline at end of file
+}
| Update .solidarity | Update .solidarity |
b0158891848cf47917ebbeb17330164a2b9fddee | --- src/navigation/AssociateHallwayNav/SideMenuContent.tsx
@@ -66,7 +66,6 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = (
);
const [showDialog, setShowDialog] = useState(false);
- console.log('rlane1 - sideMenuConfig', sideMenuConfig);
useEffect(() => {
if (drawerStatus === 'open') {
GlobalNavTelemetry.logEvent('opened', {
| chore: remove console log | chore: remove console log
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.