commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
357b3c94dc728782ef00dbaf734c9b30ddd259e2
--- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -404,7 +404,7 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ name: 'money.auth', component: MoneyAuthScreen, options: { - headerShown: false, + headerShown: true, }, clockCheckEnabled: false, }, --- targets/US/package.json @@ -120,7 +120,7 @@ "@walmart/metrics-mini-app": "1.24.3", "@walmart/mod-flex-mini-app": "1.19.6", "@walmart/moment-walmart": "1.0.4", - "@walmart/money-auth-shared-components": "0.1.10", + "@walmart/money-auth-shared-components": "0.1.20", "@walmart/myteam-mini-app": "1.10.0", "@walmart/native-rfid-scanner": "3.9.15", "@walmart/onewalmart-miniapp": "1.0.24", @@ -356,4 +356,4 @@ ] } } -} \ No newline at end of file +} --- yarn.lock @@ -7048,7 +7048,7 @@ __metadata: "@walmart/metrics-mini-app": "npm:1.24.3" "@walmart/mod-flex-mini-app": "npm:1.19.6" "@walmart/moment-walmart": "npm:1.0.4" - "@walmart/money-auth-shared-components": "npm:0.1.10" + "@walmart/money-auth-shared-components": "npm:0.1.20" "@walmart/myteam-mini-app": "npm:1.10.0" "@walmart/native-rfid-scanner": "npm:3.9.15" "@walmart/onewalmart-miniapp": "npm:1.0.24" @@ -7370,14 +7370,14 @@ __metadata: languageName: node linkType: hard -"@walmart/money-auth-shared-components@npm:0.1.10": - version: 0.1.10 - resolution: "@walmart/money-auth-shared-components@npm:0.1.10" +"@walmart/money-auth-shared-components@npm:0.1.20": + version: 0.1.20 + resolution: "@walmart/money-auth-shared-components@npm:0.1.20" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 "@walmart/functional-components": ^1.0.34 - "@walmart/gtp-shared-components": ^2.0.6 + "@walmart/gtp-shared-components": 2.2.3-rc.1 "@walmart/react-native-logger": ^1.9.0 "@walmart/react-native-shared-navigation": ^0.2.0 "@walmart/redux-store": ^1.0.12 @@ -7387,7 +7387,7 @@ __metadata: react-native-wm-telemetry: ^0.3.0 react-redux: ^7.2.1 redux: ^4.0.5 - checksum: 10c0/b05f8ec08144fb8299e61a24663c4d804648a991ba3fdeee56d2c5ac9ec250663079c9878d92271a4da5602211d1f52209e42e9df44eafc72f21ba87759038ca + checksum: 10c0/6d9d4de05f67faf63a9469d47bf5496aa142ebf7ac73efa6798aff845a795086c0bf7c190c09ae8cbbe1f7ee7090eb494db3e5755e009106cd06d57e0ff118ed languageName: node linkType: hard
bump version
bump version
7b8d7b62d01813bfd64750c7d346d9921c6e26fe
--- packages/core-services/Permissions/index.tsx @@ -10,6 +10,20 @@ import { import { ConsumerChild } from '@walmart/allspark-utils'; import { getPermissionState } from './selectors'; +/** + * @deprecated Use `PermissionStatus` from '@walmart/allspark-foundation/Permissions' instead. + * + * @example + * import {PermissionStatus} from '@walmart/allspark-foundation/Permissions'; + */ +export const STATUSES = { + UNAVAILABLE: 'unavailable', + BLOCKED: 'blocked', + DENIED: 'denied', + GRANTED: 'granted', + LIMITED: 'limited', +} as const; + /** * @deprecated Permissions is no longer a dynamic service. It's static implementation, `AllsparkPermissionClient`, is defined by the Allspark Foundation. *
fix: export statuses enum for backwards compatability
fix: export statuses enum for backwards compatability
54c7971e47be0d96c428c521f44b1c87ae19faf5
--- package-lock.json @@ -3357,9 +3357,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.0.15", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.15.tgz", - "integrity": "sha512-vzirL8LmvVnJdyNGFtqfzf3Pth9kuwqnd0cxllT7Gw3Qil4+snxw6yrC9Iw49jIvUFqjGjfkkFbXPeSqOcCVzw==" + "version": "1.0.18", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.18.tgz", + "integrity": "sha512-obMi22nJz2FN8CWuJ/0ekV9pKMRQJz0u4qiX5lQTAv6yOVUmtJtksvErLAlZtc+ACiLUakj2EiRyw1bUcN+YNQ==" }, "@walmart/ims-print-services-ui": { "version": "0.0.30", --- package.json @@ -73,7 +73,7 @@ "@walmart/feedback-all-spark-miniapp": "0.0.55", "@walmart/functional-components": "1.0.31", "@walmart/gtp-shared-components": "^1.2.0", - "@walmart/impersonation-mini-app": "1.0.15", + "@walmart/impersonation-mini-app": "1.0.18", "@walmart/ims-print-services-ui": "0.0.30", "@walmart/inbox-mini-app": "0.0.101", "@walmart/iteminfo-mini-app": "2.0.1",
impersonation version bump (#834)
impersonation version bump (#834) Co-authored-by: Anthony Helms - awhelms <awhelms@wal-mart.com>
453c5df99554a6839b7fe2e8f030f777f6566d62
--- __tests__/auth/AuthenticatorViewTest.tsx @@ -5,7 +5,6 @@ import {AuthService} from '@walmart/allspark-foundation/Auth'; import {AuthenticatorView} from '../../src/auth/AuthenticatorView'; import {LocalStorage} from '../../src/core/LocalStorage'; -import env from '../../env.dev'; import {Image} from 'expo-image'; const _dispatch = (useDispatch as jest.Mock)();
chore: lint fix
chore: lint fix
9497580697f3144a529055be30ef8aac1a67bafe
--- packages/allspark-foundation/__tests__/GraphQL/utils/links.test.ts @@ -0,0 +1,195 @@ +import { + ApolloLink, + Observable, + Operation, + } from '@apollo/client'; + import { PersistedQueryLink, AllsparkHttpLink, DynamicLink } from '../../../src/GraphQL/links'; + + import { AllsparkHttpClient } from '../../../src/HTTP'; + import { AllsparkGraphQLClient } from '../../../src/GraphQL/client'; + + jest.mock('../../../src/HTTP'); + jest.mock('../../../src/GraphQL/client'); + +const createMockOperation = (context = {}) => ({ + setContext: jest.fn(), + getContext: jest.fn(() => context), + extensions: {}, + variables: {}, + query: {}, + operationName: '', +} as unknown as Operation); + +describe('PersistedQueryLink', () => { + let link: PersistedQueryLink; + + beforeEach(() => { + link = new PersistedQueryLink(); + }); + + test('should enable persisted queries by default', () => { + expect(link.enabled).toBe(true); + }); + + test('should disable persisted queries', () => { + link.disable(); + expect(link.enabled).toBe(false); + }); + + test('should enable persisted queries', () => { + link.disable(); + link.enable(); + expect(link.enabled).toBe(true); + }); + + test('should not forward the operation if persisted queries are disabled', done => { + link.disable(); + const operation = createMockOperation(); + const forward = jest.fn((op: Operation) => Observable.of({ data: 'result' })); + + link.request(operation, forward)?.subscribe({ + next: (result) => { + expect(result).toEqual({ data: 'result' }); + expect(forward).toHaveBeenCalledWith(operation); + done(); + }, + }); + }); +}); + +describe('DynamicLink', () => { + let link: DynamicLink; + + beforeEach(() => { + link = new DynamicLink(); + }); + + test('should forward operation by default', done => { + const operation = createMockOperation(); + const forward = jest.fn((op: Operation) => Observable.of({ data: 'result' })); + + link.request(operation, forward)?.subscribe({ + next: (result) => { + expect(result).toEqual({ data: 'result' }); + expect(forward).toHaveBeenCalledWith(operation); + done(); + }, + }); + }); + + test('should add and use dynamic link', done => { + const operation = { + getContext: () => ({}), + }; + + const forward = jest.fn((op) => { + return new Observable(observer => { + observer.next({ data: { result: 'result' } }); + observer.complete(); + }); + }); + + const dynamicLink = new ApolloLink((operation, forward) => { + return forward(operation).map((data) => ({ + ...data, + data: { + ...data.data, + dynamic: 'dynamic data', + } + })); + }); + + const link = dynamicLink; + link.request(operation, forward)?.subscribe({ + next: (result) => { + expect(result).toEqual({ + data: { + dynamic: 'dynamic data', + result: 'result', + } + }); + expect(forward).toHaveBeenCalledWith(operation); + done(); + }, + error: done.fail, + }); + }, 10000); + + test('should add multiple dynamic links', done => { + const operation = { + getContext: () => ({}), + }; + + const forward = jest.fn((op) => { + return new Observable(observer => { + observer.next({ data: { result: 'result' } }); + observer.complete(); + }); + }); + + const dynamicLink1 = new ApolloLink((operation, forward) => { + return forward(operation).map((data) => ({ + ...data, + data: { + ...data.data, + dynamic1: 'dynamic data 1', + } + })); + }); + + const dynamicLink2 = new ApolloLink((operation, forward) => { + return forward(operation).map((data) => ({ + ...data, + data: { + ...data.data, + dynamic2: 'dynamic data 2', + } + })); + }); + + const link = ApolloLink.from([dynamicLink1, dynamicLink2]); + link.request(operation, forward)?.subscribe({ + next: (result) => { + expect(result).toEqual({ + data: { + dynamic1: 'dynamic data 1', + dynamic2: 'dynamic data 2', + result: 'result', + } + }); + expect(forward).toHaveBeenCalledWith(operation); + done(); + }, + error: done.fail, + }); + }, 10000); +}); + +describe('AllsparkHttpLink', () => { + let allsparkHttpLink; + let mockDefaultHttpLink; + let mockFeatureClient; + let mockFeatureClientConfig; + beforeEach(() => { + mockDefaultHttpLink = {}; + mockFeatureClient = { fetch: jest.fn() }; + mockFeatureClientConfig = { headers: {} }; + AllsparkHttpClient.getFeatureClient = jest.fn().mockImplementation(() => mockFeatureClient); + AllsparkGraphQLClient.getFeatureClientConfig = jest.fn().mockImplementation(() => mockFeatureClientConfig); + allsparkHttpLink = new AllsparkHttpLink(mockDefaultHttpLink); + }); + + test('should update options at runtime', () => { + const newOptions = { uri: 'http://new-uri' }; + allsparkHttpLink.setOptions(newOptions); + expect(allsparkHttpLink.options).toEqual(newOptions); + }); + + test('should return existing HttpLink if it already exists for the featureId', () => { + const featureId = 'feature1'; + const existingLink = {}; + allsparkHttpLink['_httpLinkMap'] = new Map([[featureId, existingLink]]); + const link = allsparkHttpLink['_getLinkForFeatureId'](featureId); + expect(link).toBe(existingLink); + }); + }); \ No newline at end of file
graphal links unit test
graphal links unit test
c800def110a30814cdf8f6bf5ac1218772aee79a
--- __tests__/navigation/PreHireHallwayNav/__snapshots__/indexTest.tsx.snap @@ -11,5 +11,22 @@ exports[`PreHireHallwayNav matches snapshot 1`] = ` } } /> + <Screen + component={[Function]} + name="askSam" + options={ + Object { + "cardOverlayEnabled": true, + "cardStyle": Object { + "backgroundColor": "rgba(0, 0, 0, 0)", + }, + "cardStyleInterpolator": [Function], + "gestureDirection": "vertical", + "gestureEnabled": true, + "headerShown": false, + "presentation": "transparentModal", + } + } + /> </Navigator> `; --- __tests__/navigation/PreHireHallwayNav/indexTest.tsx @@ -1,9 +1,17 @@ import React from 'react'; import {create} from 'react-test-renderer'; +import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; import PreHireHallwayNav from '../../../src/navigation/PreHireHallwayNav/index'; + +jest.mock('react', () => ({ + ...(jest.requireActual('react') as any), + useEffect: (func: any) => func(), +})); + describe('PreHireHallwayNav', () => { const component = create(<PreHireHallwayNav />); it('matches snapshot', () => { expect(component.toJSON()).toMatchSnapshot(); + expect(AskSamMiniApp.init).toHaveBeenCalled(); }); }); --- __tests__/navigation/__snapshots__/indexTest.tsx.snap @@ -46,11 +46,6 @@ exports[`RootNav matches snapshot when app accessible 1`] = ` listeners={[MockFunction]} name="main" /> - <Screen - component="WelcomeMeMiniApp" - listeners={[MockFunction]} - name="WelcomeMeMiniApp" - /> </Group> <Group screenOptions={ --- src/navigation/PreHireHallwayNav/index.tsx @@ -1,18 +1,36 @@ __DEV__ && console.log('loading pre-hire hallway'); -import React from 'react'; +import React, {useEffect} from 'react'; import {createStackNavigator} from '@react-navigation/stack'; import WelcomeMeMiniApp from '@walmart/welcomeme-mini-app'; +import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; +import {modalTransitionOptions} from '../NavigationConstants'; const PreHireStack = createStackNavigator(); -const PreHireHallwayNav = () => ( - <PreHireStack.Navigator> - <PreHireStack.Screen - name='WelcomeMeMiniApp' - component={WelcomeMeMiniApp} - options={{headerShown: false}} - /> - </PreHireStack.Navigator> -); +const PreHireHallwayNav = () => { + useEffect(() => { + AskSamMiniApp.init(); + }, []); + + return ( + <PreHireStack.Navigator> + <PreHireStack.Screen + name='WelcomeMeMiniApp' + component={WelcomeMeMiniApp} + options={{headerShown: false}} + /> + <PreHireStack.Screen + name='askSam' + component={AskSamMiniApp} + options={{ + gestureEnabled: true, + gestureDirection: 'vertical', + presentation: 'transparentModal', + ...modalTransitionOptions, + }} + /> + </PreHireStack.Navigator> + ); +}; export default PreHireHallwayNav; --- src/navigation/index.tsx @@ -2,7 +2,6 @@ import React from 'react'; import {useTranslation} from 'react-i18next'; import {useSelector} from 'react-redux'; import {createStackNavigator, TransitionPresets} from '@react-navigation/stack'; -import WelcomeMeMiniApp from '@walmart/welcomeme-mini-app'; import {Header} from '@walmart/ui-components'; import { @@ -78,11 +77,6 @@ export const RootNav = () => { component={UserRootNav} listeners={hideSplashScreenListeners} /> - <RootStack.Screen - name='WelcomeMeMiniApp' - component={WelcomeMeMiniApp} - listeners={hideSplashScreenListeners} - /> </RootStack.Group> {/* Screens with header but no title, just back button */}
Adding ask sam to prehire nav stack
Adding ask sam to prehire nav stack
6297f08bf6bb5ac2af8da40623ca05712315e758
--- example/src/teamHub/tempComponentForTesting/TeamSelectionListItem.tsx @@ -2,7 +2,7 @@ import React, {useMemo} from 'react'; import {View, Image, Text} from 'react-native'; import {teamSelectionListItemStyles} from './styles'; import {Checkbox} from '@walmart/gtp-shared-components/dist'; -import {Images} from './Images'; +import {Images} from './images'; export enum TeamImageNames { 'Admin & Support' = 'adminAndSupport', @@ -59,7 +59,7 @@ export const TeamSelectionListItem = ({ <View style={styles.teamInfoContainer}> <Image resizeMode="contain" - source={Images[TeamImageNames[teamName]]} + src="https://i5-me.walmartimages.com/images/asksam/barcode-help-e2e17b6c94.png" style={styles.teamImage} /> <Text style={styles.teamName}>{teamName}</Text> --- example/src/teamHub/tempComponentForTesting/images.tsx @@ -0,0 +1,43 @@ +import {TeamImageNames} from './TeamSelectionListItem'; + +export const Images: Record<TeamImageNames, any> = { + adminAndSupport: + 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png', + apparel: + 'https://i5-me.walmartimages.com/images/teams/task-image-apparel.png', + assetProtection: + 'https://i5-me.walmartimages.com/images/teams/task-image-assetprotection.png', + autoCareCenter: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + deliBakery: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + digital: 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + digitalOvernight: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + entertainment: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + foodConsumables: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + frontEnd: 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + fuel: 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + hardlines: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + healthBeauty: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + home: 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + management: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + meatProduce: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + pharmacy: 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + remodel: 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + seasonal: 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + stockingDayOne: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + stockingDayTwo: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', + stockingOvernight: + 'https://i5-me.walmartimages.com/images/teams/task-image-store-fda1b4e348.png', + visionCenter: + 'https://i5-me.walmartimages.com/images/teams/task-image-store.png', +};
feat: updated images urls
feat: updated images urls
0a267cacb48d542e1dea53a23896c5cfb61bcb18
--- targets/US/package.json @@ -142,7 +142,7 @@ "@walmart/roster-mini-app": "2.4.0", "@walmart/schedule-mini-app": "0.114.2", "@walmart/shelfavailability-mini-app": "1.5.26", - "@walmart/shop-gnfr-mini-app": "1.0.93", + "@walmart/shop-gnfr-mini-app": "1.0.95", "@walmart/store-feature-orders": "1.26.9", "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.0.2#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.0.2-4cbd5b8e6d.patch", "@walmart/time-clock-mini-app": "2.395.0", --- yarn.lock @@ -6749,7 +6749,7 @@ __metadata: "@walmart/roster-mini-app": "npm:2.4.0" "@walmart/schedule-mini-app": "npm:0.114.2" "@walmart/shelfavailability-mini-app": "npm:1.5.26" - "@walmart/shop-gnfr-mini-app": "npm:1.0.93" + "@walmart/shop-gnfr-mini-app": "npm:1.0.95" "@walmart/store-feature-orders": "npm:1.26.9" "@walmart/taskit-mini-app": "patch:@walmart/taskit-mini-app@npm%3A3.0.2#~/.yarn/patches/@walmart-taskit-mini-app-npm-3.0.2-4cbd5b8e6d.patch" "@walmart/time-clock-mini-app": "npm:2.395.0" @@ -7590,9 +7590,9 @@ __metadata: languageName: node linkType: hard -"@walmart/shop-gnfr-mini-app@npm:1.0.93": - version: 1.0.93 - resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.93" +"@walmart/shop-gnfr-mini-app@npm:1.0.95": + version: 1.0.95 + resolution: "@walmart/shop-gnfr-mini-app@npm:1.0.95" dependencies: "@testing-library/react-native": "npm:^12.5.1" react-native-drop-shadow: "npm:^1.0.0" @@ -7606,7 +7606,7 @@ __metadata: "@walmart/gtp-shared-components": ^2.0.0 react: ^18.2.0 react-native: ~0.70.5 - checksum: 10c0/f6912c90855e305ef7b85953662918e4f89ef9fc1cf58633011544f47f1308de366557c09b2f54fe9e8a68310a11b1a1dc500daa801342d35d479f7fd4fb579d + checksum: 10c0/74464e677b43ae1dc1853c5f198be9108b5972e003e486c29c11e47201a7ca1c77cb655436ce345a32590739fdf0570ab0cccd33d179f01dff5d91fb4cab68e7 languageName: node linkType: hard
Version 1.0.95
Version 1.0.95
253123193bce35fc8502d219126176010fc16282
--- src/navigation/utils.ts @@ -121,6 +121,8 @@ export const onNewMessage = () => { ); navigate(ROOT_CONTAINER_SCREEN_NAME, { + //@ts-ignore + initial: false, // @ts-ignore screen: NEW_MESSAGES_SCREEN_NAME, }); --- src/navigation/utils.ts @@ -121,6 +121,8 @@ export const onNewMessage = () => { ); navigate(ROOT_CONTAINER_SCREEN_NAME, { + //@ts-ignore + initial: false, // @ts-ignore screen: NEW_MESSAGES_SCREEN_NAME, });
fixing navigation not being initial when navigate from meganav
fixing navigation not being initial when navigate from meganav
adce735aff5765f1a2e938013b597d07365ce088
--- package-lock.json @@ -3577,11 +3577,6 @@ "resolved": "https://npme.walmart.com/@react-native-firebase/remote-config/-/remote-config-14.11.0.tgz", "integrity": "sha512-yZ9fu3ckZ55t3nrtDnZ5ju60dzMuu24+xhrFHMnYBfc2jeUekwB6R3qXt9rurguT89XHCUOXWUtHvzZf+T14hA==" }, - "@react-native-picker/picker": { - "version": "2.4.1", - "resolved": "https://npme.walmart.com/@react-native-picker/picker/-/picker-2.4.1.tgz", - "integrity": "sha512-1XWy3IQgwr7MWd30KdY1iUh2gQZD+JiotN1ifj/ptFUYKon/0UFwngKQaWCO/CP/FdLl20/huSSLwKedYrdMMA==" - }, "@react-native/assets": { "version": "1.0.0", "resolved": "https://npme.walmart.com/@react-native/assets/-/assets-1.0.0.tgz", @@ -4358,9 +4353,9 @@ } }, "@walmart/gtp-shared-components": { - "version": "1.8.4", - "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.4.tgz", - "integrity": "sha512-YTHs+/mciUjXt8OUqB6hOsOcMPiAf9zAQvoasjVEni7ClmmmppukxTzRUpCQlz1wINjayxrwbdtwNqSQ8BGN8w==", + "version": "1.8.0", + "resolved": "https://npme.walmart.com/@walmart/gtp-shared-components/-/gtp-shared-components-1.8.0.tgz", + "integrity": "sha512-mEIlzVmN5Seqa0z6jGhLlKF1zYCQCvZPccXIcYr/b6HGJAgpTT6YnaXYFWLutTMaoMymirmGnuKGmEzWwwXdYA==", "requires": { "@livingdesign/tokens": "^0.41.0", "lodash": "^4.17.15", --- package.json @@ -62,7 +62,6 @@ "@react-native-firebase/firestore": "14.11.0", "@react-native-firebase/perf": "14.11.0", "@react-native-firebase/remote-config": "14.11.0", - "@react-native-picker/picker": "^2.4.0", "@react-navigation/bottom-tabs": "^6.2.0", "@react-navigation/drawer": "^6.3.0", "@react-navigation/material-top-tabs": "^6.1.0",
removing unnecessary dependency
removing unnecessary dependency
afcd67af6d430a679231277c865fd1aab80cfcf7
--- src/containers/ChatInput/index.tsx @@ -205,13 +205,16 @@ export const ChatInput = (props: { } }; + //TODO: Log to splunk, no console logging const onAttachImage = async () => { const pickerResponse: ImagePickerResponse | void = await launchImageLibrary( { mediaType: 'photo', selectionLimit: 1, + maxHeight: 1024, + maxWidth: 1024, }, - ).catch((e) => console.log('pick iamge error', e)); + ).catch((e) => console.log('pick image error', e)); if (pickerResponse && pickerResponse.assets) { setImageAssets(pickerResponse.assets); --- src/containers/ChatInput/index.tsx @@ -205,13 +205,16 @@ export const ChatInput = (props: { } }; + //TODO: Log to splunk, no console logging const onAttachImage = async () => { const pickerResponse: ImagePickerResponse | void = await launchImageLibrary( { mediaType: 'photo', selectionLimit: 1, + maxHeight: 1024, + maxWidth: 1024, }, - ).catch((e) => console.log('pick iamge error', e)); + ).catch((e) => console.log('pick image error', e)); if (pickerResponse && pickerResponse.assets) { setImageAssets(pickerResponse.assets);
adding size restriction
adding size restriction
981925bd6cdbdc7faf806a42e7102c9cf9bd9043
--- __tests__/navigation/AssociateHallwayNav/MainTabsNavTest.tsx @@ -10,9 +10,9 @@ import { renderTabBar, getMainHeaderTitle, getTabsScreenOptions, - TabsHeader, TabsHeaderLeft, } from '../../../src/navigation/AssociateHallwayNav/MainTabsNav'; +import {MainHeader} from '../../../src/navigation/AssociateHallwayNav/Components'; jest.mock('i18next', () => ({ __esModule: true, @@ -75,13 +75,6 @@ describe('getMainHeaderTitle', () => { }); }); -describe('TabsHeader', () => { - it('matches snapshot', () => { - const component = create(<TabsHeader />); - expect(component.toJSON()).toMatchSnapshot(); - }); -}); - describe('TabsHeaderLeft', () => { it('matches snapshot', () => { const component = create(<TabsHeaderLeft />); @@ -95,7 +88,7 @@ describe('getTabsScreenOptions', () => { const options = getTabsScreenOptions({route: 'inbox'}); expect(options).toEqual({ - header: TabsHeader, + header: MainHeader, headerShown: true, headerTitle: 'navigation.inbox', headerLeft: TabsHeaderLeft, --- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainTabsNavTest.tsx.snap @@ -112,8 +112,6 @@ exports[`TabBar matches snapshot 1`] = ` /> `; -exports[`TabsHeader matches snapshot 1`] = `<MainHeader />`; - exports[`TabsHeaderLeft matches snapshot 1`] = ` <DrawerButton style={ --- src/navigation/AssociateHallwayNav/MainTabsNav.tsx @@ -55,12 +55,10 @@ export const getMainHeaderTitle = (route: any) => { } }; -export const TabsHeader = (props: any) => <MainHeader {...props} />; - export const TabsHeaderLeft = () => <DrawerButton style={styles.menuButton} />; export const getTabsScreenOptions = ({route}: any) => ({ - header: TabsHeader, + header: MainHeader, headerShown: true, headerTitle: getMainHeaderTitle(route), headerLeft: TabsHeaderLeft,
Simplifying config
Simplifying config
7288d172ad844b14d265906b8982833e0290a71e
--- .yarn/patches/@walmart-react-native-webex-sdk-npm-0.6.89-6c8a310254.patch @@ -1,67 +0,0 @@ -diff --git a/android_dynamic_modules/webex_dynamic_module/build.gradle b/android_dynamic_modules/webex_dynamic_module/build.gradle -index c08fd93fe1ace4a4e13b7fafb4e70e8c82bca4db..2565f202119f5d0f30cd75b7d37616a56760a8df 100644 ---- a/android_dynamic_modules/webex_dynamic_module/build.gradle -+++ b/android_dynamic_modules/webex_dynamic_module/build.gradle -@@ -50,13 +50,13 @@ android { - buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() - } - -- flavorDimensions "default" -- productFlavors { -- dev {} -- teflon {} -- prod {} -- beta {} -- } -+ // flavorDimensions "default" -+ // productFlavors { -+ // dev {} -+ // teflon {} -+ // prod {} -+ // beta {} -+ // } - - buildTypes { - debug { -diff --git a/ios/CallingSdk_Utils.h b/ios/CallingSdk_Utils.h -index 219e7b2675fabb2532c018fa2015502d2d1a0e2d..d0382e700a1124b69f51409bd631b74e7e34dc92 100644 ---- a/ios/CallingSdk_Utils.h -+++ b/ios/CallingSdk_Utils.h -@@ -1,6 +1,6 @@ - #import <Foundation/Foundation.h> - #import <React/RCTBridge.h> --#import <SumoSDK-Swift.h> -+#import <SumoSDK/SumoSDK-Swift.h> - - @interface CallingSDK_Utils : NSObject - -diff --git a/ios/CallingSdk_Utils.m b/ios/CallingSdk_Utils.m -index 464a63ffd903b898d8dfa3d7b4daf63891d11a95..b596924dcbc5c979a864a0e446dcbdbfee320f5e 100644 ---- a/ios/CallingSdk_Utils.m -+++ b/ios/CallingSdk_Utils.m -@@ -1,10 +1,10 @@ - #import "CallingSdk_Utils.h" --#import <SumoSDK-Swift.h> -+#import <SumoSDK/SumoSDK-Swift.h> - #import <React/RCTBridge.h> - #import <React/RCTConvert.h> - #import <React/RCTEventDispatcher.h> - #import "ConnectionModule.h" --#import "react_native_webex_sdk-Swift.h" -+#import <react_native_webex_sdk/react_native_webex_sdk-Swift.h> - - - @implementation CallingSDK_Utils -diff --git a/ios/ConnectionModule.m b/ios/ConnectionModule.m -index 353f1f909d03f6ae260725db38196656c7051fdc..a32033cb2e2aa5c4b2fe7e85ea2fa45983956089 100644 ---- a/ios/ConnectionModule.m -+++ b/ios/ConnectionModule.m -@@ -17,7 +17,7 @@ - - #import <AVFoundation/AVAudioSession.h> - #import <CallKit/CallKit.h> --#import "react_native_webex_sdk-Swift.h" -+#import <react_native_webex_sdk/react_native_webex_sdk-Swift.h> - - #ifdef DEBUG - static int const OUTGOING_CALL_WAKEUP_DELAY = 10;
chore: remove old patch file
chore: remove old patch file
215becf61a2e5bf93e00f378bfadc4941ae5e987
--- package.json @@ -111,7 +111,7 @@ "resolutions": { "@react-native-community/datetimepicker": "^7.6.2", "@walmart/allspark-utils": "6.3.3", - "@walmart/allspark-foundation": "6.10.0", + "@walmart/allspark-foundation": "6.12.0", "@walmart/me-at-walmart-athena-queries": "6.4.1", "@walmart/me-at-walmart-common": "workspace:^", "@walmart/me-at-walmart-container": "workspace:^", --- targets/US/package.json @@ -77,7 +77,7 @@ "@terrylinla/react-native-sketch-canvas": "patch:@terrylinla/react-native-sketch-canvas@npm%3A0.8.0#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch", "@walmart/allspark-authentication": "6.3.2", "@walmart/allspark-cope-key-listener": "0.0.17", - "@walmart/allspark-foundation": "6.10.0", + "@walmart/allspark-foundation": "6.12.0", "@walmart/allspark-graphql-client": "6.3.4", "@walmart/allspark-http-client": "6.3.4", "@walmart/allspark-neon-core": "0.1.31", --- yarn.lock @@ -5403,9 +5403,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation@npm:6.10.0": - version: 6.10.0 - resolution: "@walmart/allspark-foundation@npm:6.10.0" +"@walmart/allspark-foundation@npm:6.12.0": + version: 6.12.0 + resolution: "@walmart/allspark-foundation@npm:6.12.0" dependencies: "@apollo/client": "npm:^3.8.6" "@graphql-codegen/cli": "npm:^5.0.0" @@ -5415,7 +5415,7 @@ __metadata: "@graphql-codegen/typescript-react-apollo": "npm:^4.1.0" "@reduxjs/toolkit": "npm:^1.9.7" "@types/node-fetch": "npm:^2.6.9" - "@walmart/allspark-utils": "npm:^6.3.4" + "@walmart/allspark-utils": "npm:^6.4.0" axios: "npm:~1.6.0" axios-cache-interceptor: "npm:^1.3.2" crypto-js: "npm:~4.2.0" @@ -5433,7 +5433,7 @@ __metadata: typed-redux-saga: "npm:^1.5.0" peerDependencies: "@react-native-community/datetimepicker": "*" - "@react-native-community/netinfo": 9.x + "@react-native-community/netinfo": 11.x "@react-native-firebase/analytics": 17.x "@react-native-firebase/app": 17.x "@react-native-picker/picker": "*" @@ -5449,7 +5449,7 @@ __metadata: "@walmart/react-native-env": ">=6" "@walmart/react-native-scanner-3.0": ">=0.6.3" "@walmart/react-native-shared-navigation": ">=6" - "@walmart/react-native-sumo-sdk": ^2.6.0 + "@walmart/react-native-sumo-sdk": ^2.7.0 "@walmart/react-native-wm-network": ">=6" "@walmart/react-native-wm-notification": ">=6" "@walmart/react-native-wm-telemetry": ">=6" @@ -5495,7 +5495,7 @@ __metadata: allspark-generate-graphql: cli/generate.js allspark-link: cli/link.js allspark-setup: cli/setup.js - checksum: 10c0/744a2b44ebc20111a2d150771e10c14c7ecaf2277063439da8b555c557506e1369cab543beae08a2c6183fa4d51fa15440e07ea6444eefca7b53d61350645c7f + checksum: 10c0/e0940a20176ebc52a267e6d19baf92deea6892e085baba9796b13755a2b350202b4d377de0df7d2ab8141e5f334601bad5b005f47c372cac8bae0c5190898274 languageName: node linkType: hard @@ -6664,7 +6664,7 @@ __metadata: "@types/uuid": "npm:^8.3.0" "@walmart/allspark-authentication": "npm:6.3.2" "@walmart/allspark-cope-key-listener": "npm:0.0.17" - "@walmart/allspark-foundation": "npm:6.10.0" + "@walmart/allspark-foundation": "npm:6.12.0" "@walmart/allspark-graphql-client": "npm:6.3.4" "@walmart/allspark-http-client": "npm:6.3.4" "@walmart/allspark-neon-core": "npm:0.1.31"
chore: bump foundation packages
chore: bump foundation packages
fa6ad21064428b554e2f04cb8f1859943ee736e2
--- package-lock.json @@ -68,7 +68,7 @@ "@walmart/gtp-shared-components": "2.2.1", "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.11.1", - "@walmart/inbox-mini-app": "0.93.23", + "@walmart/inbox-mini-app": "0.93.27", "@walmart/iteminfo-mini-app": "7.12.1", "@walmart/learning-mini-app": "20.0.21", "@walmart/manager-approvals-miniapp": "0.2.4", @@ -11732,9 +11732,9 @@ } }, "node_modules/@walmart/inbox-mini-app": { - "version": "0.93.23", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.93.23.tgz", - "integrity": "sha512-OGOAzuaRM6GKwo81MSvoG/FAb/gzmsellp0H5X2Cep0yaqXvTT6wzm8MCddjG0UK7Qk4f078bNCJ7S8q5S9QDA==", + "version": "0.93.27", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.93.27.tgz", + "integrity": "sha512-y2A/S0MUObs1wuuZpqAT6Qm5pjNHR7Yr+51mMn9RlsUkOTPxIeRw8npOF3DOgOYrB07jTwdNwZcDTKYVbo4DiA==", "dependencies": { "@walmart/moment-walmart": "^1.0.4", "@walmart/walmart-fiscal-week": "^0.3.6", @@ -41497,4 +41497,4 @@ } } } -} \ No newline at end of file +} --- package.json @@ -110,7 +110,7 @@ "@walmart/gtp-shared-components": "2.2.1", "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.11.1", - "@walmart/inbox-mini-app": "0.93.23", + "@walmart/inbox-mini-app": "0.93.27", "@walmart/iteminfo-mini-app": "7.12.1", "@walmart/learning-mini-app": "20.0.21", "@walmart/manager-approvals-miniapp": "0.2.4", @@ -375,7 +375,7 @@ "@walmart/gtp-shared-components": "2.2.1", "@walmart/impersonation-mini-app": "1.20.8", "@walmart/ims-print-services-ui": "2.11.1", - "@walmart/inbox-mini-app": "0.93.23", + "@walmart/inbox-mini-app": "0.93.27", "@walmart/iteminfo-mini-app": "7.12.1", "@walmart/learning-mini-app": "20.0.21", "@walmart/manager-approvals-miniapp": "0.2.4",
inbox version
inbox version
1eeb40f9fc02c8c9aece425dcb5abf9ac70f7044
--- .looper.yml @@ -14,18 +14,24 @@ triggers: - manual: name: Publish Changed call: publishFromChanges - - manual: - name: Publish All - call: publishAll - - manual: - name: Publish Patch - call: publishPatch - - manual: - name: Publish Minor - call: publishMinor - - manual: - name: Publish Major - call: publishMajor + # - manual: + # name: Publish All + # call: publishAll + # - manual: + # name: Publish Patch + # call: publishPatch + # - manual: + # name: Publish Minor + # call: publishMinor + # - manual: + # name: Publish Major + # call: publishMajor + # - manual: + # name: Publish Pre-Release + # call: publishPrerelease + # - manual: + # name: Publish Graduate + # call: publishGraduate flows: default: @@ -42,7 +48,7 @@ flows: testPackages: - call: buildPackages - (name Test) npm run test - + coverage: - (name Coverage) npm run coverage @@ -80,10 +86,14 @@ flows: - call: preparePublish - (name Publish from Package) HUSKY=0 npx lerna publish from-package --yes - publishFromGit: - - call: preparePublish - - (name Publish from Git) HUSKY=0 npm lerna publish from-git --yes - + publishPrerelease: + - call: preparePackages + - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes --conventional-prerelease + + publishGraduate: + - call: preparePackages + - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes --conventional-graduate + sonar: - call: coverage - sonar("Sonar"): sonar-scanner -Dproject.settings=sonar-project.properties
chore: remove dangerous looper flows
chore: remove dangerous looper flows
a0d66cba6f5ab5b0b2cccbf090eb450f422233fc
--- packages/allspark-foundation/src/types.ts @@ -34,9 +34,3 @@ export type OnlyOne<T, Keys extends keyof T = keyof T> = Pick< [K in Keys]-?: Required<Pick<T, K>> & Partial<Record<Exclude<Keys, K>, undefined>>; }[Keys]; - -export type NestedKeyOf<ObjectType extends object> = { - [Key in keyof ObjectType & (string | number)]: ObjectType[Key] extends object - ? `${Key}` | `${Key}.${NestedKeyOf<ObjectType[Key]>}` - : `${Key}`; -}[keyof ObjectType & (string | number)];
fix: remove type
fix: remove type
70ddcf161d932722851e345b63ac87e298149c8d
--- package-lock.json @@ -79,7 +79,7 @@ "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.17.0", "@walmart/shelfavailability-mini-app": "1.5.13", - "@walmart/taskit-mini-app": "2.28.10", + "@walmart/taskit-mini-app": "2.28.12", "@walmart/time-clock-mini-app": "2.49.0", "@walmart/ui-components": "1.10.1", "@walmart/welcomeme-mini-app": "0.76.0", @@ -6041,9 +6041,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.28.10", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.28.10.tgz", - "integrity": "sha512-U/LYTCPVNxds2sPoNeG7gbsgTnIuqSrO6q95knfdwUQ6meh2M79uSuRNGNjG7aBLrpiLRClrMyYu9pnZWfwYPQ==", + "version": "2.28.12", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.28.12.tgz", + "integrity": "sha512-WXFYlR2b0hUEF29HD6Cm0MK68p8zhW2pQgRvaHY2uyV2AaJw5LCRRneh+J4mDDVbk83qqwt5Af2tRbDzyMKEVw==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -25453,9 +25453,9 @@ "integrity": "sha512-6P9nNTvcS59vzeWoi2JKT4ldRTQgMShlzThbbagd6PzbPkOS+M2Tx009eR8GGL5YNwxUP1n3PKmCudppwE0J+w==" }, "@walmart/taskit-mini-app": { - "version": "2.28.10", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.28.10.tgz", - "integrity": "sha512-U/LYTCPVNxds2sPoNeG7gbsgTnIuqSrO6q95knfdwUQ6meh2M79uSuRNGNjG7aBLrpiLRClrMyYu9pnZWfwYPQ==" + "version": "2.28.12", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.28.12.tgz", + "integrity": "sha512-WXFYlR2b0hUEF29HD6Cm0MK68p8zhW2pQgRvaHY2uyV2AaJw5LCRRneh+J4mDDVbk83qqwt5Af2tRbDzyMKEVw==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -121,7 +121,7 @@ "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.17.0", "@walmart/shelfavailability-mini-app": "1.5.13", - "@walmart/taskit-mini-app": "2.28.10", + "@walmart/taskit-mini-app": "2.28.12", "@walmart/time-clock-mini-app": "2.49.0", "@walmart/ui-components": "1.10.1", "@walmart/welcomeme-mini-app": "0.76.0",
updated taskit version
updated taskit version
98bb589a1c2457de64c47ba850f20c64cb139517
--- package-lock.json @@ -31,12 +31,12 @@ "@react-navigation/stack": "^6.1.0", "@sharcoux/slider": "^6.1.1", "@terrylinla/react-native-sketch-canvas": "0.8.0", - "@walmart/allspark-graphql-client": "^0.0.11", + "@walmart/allspark-graphql-client": "^0.1.0", "@walmart/allspark-home-mini-app": "0.6.13", "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.48", + "@walmart/ask-sam-mini-app": "1.3.49", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.11", @@ -103,7 +103,6 @@ "react-hook-form": "^7.38.0", "react-i18next": "^12.0.0", "react-native": "0.70.5", - "react-native-apollo-devtools-client": "1.0.4", "react-native-app-auth": "^6.4.3", "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", @@ -210,6 +209,7 @@ "npm-run-all": "^4.1.5", "patch-package": "^6.5.0", "prettier": "^2.0.4", + "react-native-apollo-devtools-client": "1.0.4", "react-native-version": "^4.0.0", "react-test-renderer": "^18.2.0", "solidarity": "^3.0.4", @@ -4580,9 +4580,9 @@ } }, "node_modules/@walmart/allspark-graphql-client": { - "version": "0.0.11", - "resolved": "https://npme.walmart.com/@walmart/allspark-graphql-client/-/allspark-graphql-client-0.0.11.tgz", - "integrity": "sha512-6dWPRJZnHCpv3uaekzoBN0CBDCQ3n+NmCr/gV6nJKv4uIc/R2Z6s+nf6ERMreeHW5VsuyGu3hzBBXns/Mb00cw==", + "version": "0.1.0", + "resolved": "https://npme.walmart.com/@walmart/allspark-graphql-client/-/allspark-graphql-client-0.1.0.tgz", + "integrity": "sha512-N43OSXQr5GsWtvGUWLH6JZPkkYPMftUmrvXd/hhZvfsYA8C05VgBY+6YNgbrlswcWt5tOy5JXBin9/d2NZ4KNQ==", "license": "ISC", "dependencies": { "@apollo/client": "^3.7.3", @@ -4596,6 +4596,7 @@ "peerDependencies": { "@graphql-codegen/cli": "^2.16.3", "@graphql-codegen/near-operation-file-preset": "^2.5.0", + "@graphql-codegen/typescript": "^2.8.7", "@graphql-codegen/typescript-operations": "^2.5.10", "@graphql-codegen/typescript-react-apollo": "^3.3.7", "json-to-pretty-yaml": "^1.2.2" @@ -4734,9 +4735,9 @@ } }, "node_modules/@walmart/ask-sam-mini-app": { - "version": "1.3.48", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.48.tgz", - "integrity": "sha512-ZkI7WfDfVvxT402xRuz79CYOL9kBZ7esOisNRhy0fwZtXa84fWATnuARXcO3SHgkrFCLNjvdVD7b8xpiwSpdXA==", + "version": "1.3.49", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.49.tgz", + "integrity": "sha512-knHZP8VlcnYSesvrQoAb9Sx+f4LHhWzD4JEojvJfXxZfMGa3g/0oICzDFB6hhCZH75mt9hJZGD3O0zmw649X+A==", "license": "NONE", "dependencies": { "apisauce": "^1.1.2", @@ -17536,6 +17537,7 @@ "version": "1.0.4", "resolved": "https://npme.walmart.com/react-native-apollo-devtools-client/-/react-native-apollo-devtools-client-1.0.4.tgz", "integrity": "sha512-g/7uxtz+/D3Pvt3H2W1qrqYs1SzOrEOY2d/U6QPtelpTFK9kinQd6D9ToiwpvYZhJ1PYWlWMglKWcHp9AQmhsg==", + "dev": true, "license": "MIT", "peerDependencies": { "react": "*", @@ -25006,9 +25008,9 @@ } }, "@walmart/allspark-graphql-client": { - "version": "0.0.11", - "resolved": "https://npme.walmart.com/@walmart/allspark-graphql-client/-/allspark-graphql-client-0.0.11.tgz", - "integrity": "sha512-6dWPRJZnHCpv3uaekzoBN0CBDCQ3n+NmCr/gV6nJKv4uIc/R2Z6s+nf6ERMreeHW5VsuyGu3hzBBXns/Mb00cw==", + "version": "0.1.0", + "resolved": "https://npme.walmart.com/@walmart/allspark-graphql-client/-/allspark-graphql-client-0.1.0.tgz", + "integrity": "sha512-N43OSXQr5GsWtvGUWLH6JZPkkYPMftUmrvXd/hhZvfsYA8C05VgBY+6YNgbrlswcWt5tOy5JXBin9/d2NZ4KNQ==", "requires": { "@apollo/client": "^3.7.3", "@lifeomic/axios-fetch": "3.0.1", @@ -25064,9 +25066,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "1.3.48", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.48.tgz", - "integrity": "sha512-ZkI7WfDfVvxT402xRuz79CYOL9kBZ7esOisNRhy0fwZtXa84fWATnuARXcO3SHgkrFCLNjvdVD7b8xpiwSpdXA==", + "version": "1.3.49", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.3.49.tgz", + "integrity": "sha512-knHZP8VlcnYSesvrQoAb9Sx+f4LHhWzD4JEojvJfXxZfMGa3g/0oICzDFB6hhCZH75mt9hJZGD3O0zmw649X+A==", "requires": { "apisauce": "^1.1.2", "axios-cache-adapter": "^2.7.3", @@ -32854,7 +32856,8 @@ "react-native-apollo-devtools-client": { "version": "1.0.4", "resolved": "https://npme.walmart.com/react-native-apollo-devtools-client/-/react-native-apollo-devtools-client-1.0.4.tgz", - "integrity": "sha512-g/7uxtz+/D3Pvt3H2W1qrqYs1SzOrEOY2d/U6QPtelpTFK9kinQd6D9ToiwpvYZhJ1PYWlWMglKWcHp9AQmhsg==" + "integrity": "sha512-g/7uxtz+/D3Pvt3H2W1qrqYs1SzOrEOY2d/U6QPtelpTFK9kinQd6D9ToiwpvYZhJ1PYWlWMglKWcHp9AQmhsg==", + "dev": true }, "react-native-app-auth": { "version": "6.4.3", --- package.json @@ -74,12 +74,12 @@ "@sharcoux/slider": "^6.1.1", "@terrylinla/react-native-sketch-canvas": "0.8.0", "@walmart/OneWalmart-MiniApp": "1.0.12", - "@walmart/allspark-graphql-client": "^0.0.11", + "@walmart/allspark-graphql-client": "^0.1.0", "@walmart/allspark-home-mini-app": "0.6.13", "@walmart/allspark-neon-core": "0.1.31", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.3.48", + "@walmart/ask-sam-mini-app": "1.3.49", "@walmart/attendance-mini-app": "0.33.0", "@walmart/config-components": "4.0.1", "@walmart/core-services": "~1.4.11", @@ -145,7 +145,6 @@ "react-hook-form": "^7.38.0", "react-i18next": "^12.0.0", "react-native": "0.70.5", - "react-native-apollo-devtools-client": "1.0.4", "react-native-app-auth": "^6.4.3", "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", @@ -265,6 +264,7 @@ "npm-run-all": "^4.1.5", "patch-package": "^6.5.0", "prettier": "^2.0.4", + "react-native-apollo-devtools-client": "1.0.4", "react-native-version": "^4.0.0", "react-test-renderer": "^18.2.0", "solidarity": "^3.0.4",
Updated package dependencies
Updated package dependencies
f4d9ce4c9ce6ad93a5dd91cdf3517f557b66e379
--- package-lock.json @@ -4400,7 +4400,7 @@ "@walmart/react-native-shared-navigation": { "version": "0.4.0", "resolved": "https://npme.walmart.com/@walmart/react-native-shared-navigation/-/react-native-shared-navigation-0.4.0.tgz", - "integrity": "sha512-xXCe5sJeytOO9HAKLaTiQQMzomfUS2wUP6ICLYv9BGtdJUDmoKNT7aFYeRDGPgvPvkc1A8oFrqJIrOshjLnxSg==" + "integrity": "sha1-dBX44FzZJKjZPuXiMoFiFQzybYE=" }, "@walmart/react-native-sumo-sdk": { "version": "2.2.1",
Removing packge-lock json changes
Removing packge-lock json changes
dc2d0b69d46f31a1849e0c439c22cbadc2613065
--- packages/allspark-foundation/__tests__/Nudge/withNudgeGuard.test.tsx @@ -175,6 +175,7 @@ describe('NudgeGuard', () => { title: 'Force Update', description: 'You must update', }, + enabled: true, }, setBottomSheetOpen: jest.fn(), handleOnNotNow: () => jest.fn(), --- packages/allspark-foundation/src/Nudge/withNudgeGuard.tsx @@ -70,10 +70,10 @@ export const NudgeGuard = (props: PropsWithChildren<IWithNudgeGuardProps>) => { ); }, 1000); } - }, [featureId, config, enabled, optional, isAppVersion, setBottomSheetOpen]); + }, [enabled, optional, isAppVersion]); // eslint-disable-line react-hooks/exhaustive-deps useEffect(() => { - if (mandatory) { + if (mandatory && enabled) { setNudgeLogsAndTelemetry( NudgeSeverityEnum.MANDATORY, NudgeNotificationEnum.FORCE_UPDATE, @@ -86,11 +86,11 @@ export const NudgeGuard = (props: PropsWithChildren<IWithNudgeGuardProps>) => { return () => { setBottomSheetOpen(false); } - }, [featureId, enabled, optional, isAppVersion]); //eslint-disable-line react-hooks/exhaustive-deps + }, [mandatory, enabled]); //eslint-disable-line react-hooks/exhaustive-deps return ( <> - {mandatory ? ( + {mandatory && enabled ? ( <NudgeStack.Navigator initialRouteName={'Core.Nudge'} screenOptions={{
chore(nudge): put mandatory nudge behind ccm (#458)
chore(nudge): put mandatory nudge behind ccm (#458) Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com>
19d877ef138a55891319a7a387c7f59205f248c3
--- docs/docs/components/icons/icons-core-owned.md @@ -1,5 +1,5 @@ --- sidebar_position: 3 -title: Me@Core Owned Icons +title: Me@Core-Owned Icons custom_edit_url: null --- \ No newline at end of file --- docs/docs/components/icons/icons-gtp-owned.md @@ -1,5 +1,54 @@ --- sidebar_position: 2 -title: GTP Owned Icons +title: GTP-Owned Icons custom_edit_url: null ---- \ No newline at end of file +--- + + +## gtp-shared-icons +Refer to [this documentation](https://gecgithub01.walmart.com/pages/electrode-mobile-platform/gtp-shared-components/introduction/icons) to see which icons are included in this library. This [repository](https://gecgithub01.walmart.com/pages/electrode-mobile-platform/gtp-shared-components/introduction/icons) contains shared Living Design icons for WM React Native apps. The [gtp-shared-components library](https://gecgithub01.walmart.com/electrode-mobile-platform/gtp-shared-components), which is in Allspark, pulls its icons from this library. Some of these icons are also available through i5; these are listed below: + +#### ArticleIcon | [welcomeme/icon-first-day](https://i5-me.walmartimages.com/images/welcomeme/icon-first-day-0c62d9067a.png) (i5) +![ArticleIcon](./images/icon-first-day-0c62d9067a.webp) + +#### MoreIcon | [asksam/more](https://i5-me.walmartimages.com/images/asksam/more-237144689e.png) (i5) +![MoreIcon](./images/more-237144689e.webp) + +#### CloseIcon | [core/close-icon](https://i5-me.walmartimages.com/images/core/close-icon-5acb3f778e.png) (i5) +![CloseIcon](./images/close-icon-5acb3f778e.webp) + +#### WalmartProtectionPlanIcon | [teams/ap-team](https://i5-me.walmartimages.com/images/teams/ap-team-f1dbc5c1e0.png) (i5) +![WalmartProtectionPlanIcon](./images/ap-team-f1dbc5c1e0.webp) + +#### ImageIcon | [teams/default-team](https://i5-me.walmartimages.com/images/teams/default-team-8b23f41d6a.png) (i5) +![ImageIcon](./images/default-team-8b23f41d6a.webp) + + +## Community Icons + +These icons are currently available through [Figma](https://www.figma.com/design/g5cXUtRKO8o0ZEUHyOAQiB/LD-Foundation?node-id=71944-209&node-type=section&t=KciesgAwnuAf30DI-0). Some are available through [i5](https://allspark-images-browser.walmart.com), and these are listed below. A streamlined way to access these icons through a repo is coming soon. + +### Community Icons Available Through i5 +#### StoreMap (Figma) | [askSam/map](https://i5-me.walmartimages.com/images/asksam/map-b06f1d5ac3.png) (i5) +![StoreMap](./images/map-b06f1d5ac3.webp) + +#### Currency (Figma) | [welcomeme/icon-feature-payment-currency](https://i5-me.walmartimages.com/images/welcomeme/icon-feature-payment-currency-2ee3c00eb6.png) (i5) +![Currency](./images/icon-feature-payment-currency-2ee3c00eb6.webp) + +#### Apparel (Figma) | [welcomeme/icon-wear](https://i5-me.walmartimages.com/images/welcomeme/icon-wear-75891d28dc.png) (i5) +![Apparel](./images/icon-wear-75891d28dc.webp) + +#### Payment Check (Figma) | [preboarding/payment-icon](https://i5-me.walmartimages.com/images/preboarding/payment-icon-9dfe045850.png) (i5) +![PaymentCheck](./images/payment-icon-9dfe045850.webp) + +#### Vest (Figma) | [preboarding/vest-icon](https://i5-me.walmartimages.com/images/preboarding/vest-icon-46a089a713.png) (i5) +![Vest](./images/vest-icon-46a089a713.webp) + +#### Inbox (Figma) | [sidekick/inbox-icon](https://i5-me.walmartimages.com/images/sidekick/inbox-icon-b097d22db6.png) (i5) +![Inbox](./images/inbox-icon-b097d22db6.webp) + +#### Goal (Figma) | [sidekick/goal-icon-black](https://i5-me.walmartimages.com/images/sidekick/goal-icon-black-a0e7c43f5c.png) (i5) +![Goal](./images/goal-icon-black-a0e7c43f5c.webp) + +#### Pallet Full (Figma) | [metrics/pallet-full](https://i5-me.walmartimages.com/images/metrics/pallet-full-289a7a972a.png) (i5) +![Pallet Full](./images/pallet-full-289a7a972a.webp) \ No newline at end of file --- docs/docs/components/icons/icons-stock.md @@ -1,5 +1,11 @@ --- sidebar_position: 1 -title: Stock Icons +title: Android Stock Icons custom_edit_url: null ---- \ No newline at end of file +--- + +# Android Stock Icons + +Android provides many stock icons for use in the `androidx.compose.material.icons` library. These icons have five distinct themes that can be specified. Refer to the [Android Icon documentation](https://developer.android.com/reference/kotlin/androidx/compose/material/icons/Icons) for more detailed information. The image below shows this selection: + +![Image containing a 7 by 13 grid of Android stock icons](./images/Android-stock-icons.png) --- docs/docs/components/icons/images/Android-stock-icons.png Binary files /dev/null and b/docs/docs/components/icons/images/Android-stock-icons.png differ --- docs/docs/components/icons/images/ap-team-f1dbc5c1e0.webp Binary files /dev/null and b/docs/docs/components/icons/images/ap-team-f1dbc5c1e0.webp differ --- docs/docs/components/icons/images/close-icon-5acb3f778e.webp Binary files /dev/null and b/docs/docs/components/icons/images/close-icon-5acb3f778e.webp differ --- docs/docs/components/icons/images/default-team-8b23f41d6a.webp Binary files /dev/null and b/docs/docs/components/icons/images/default-team-8b23f41d6a.webp differ --- docs/docs/components/icons/images/goal-icon-black-a0e7c43f5c.webp Binary files /dev/null and b/docs/docs/components/icons/images/goal-icon-black-a0e7c43f5c.webp differ --- docs/docs/components/icons/images/icon-feature-payment-currency-2ee3c00eb6.webp Binary files /dev/null and b/docs/docs/components/icons/images/icon-feature-payment-currency-2ee3c00eb6.webp differ --- docs/docs/components/icons/images/icon-first-day-0c62d9067a.webp Binary files /dev/null and b/docs/docs/components/icons/images/icon-first-day-0c62d9067a.webp differ --- docs/docs/components/icons/images/icon-wear-75891d28dc.webp Binary files /dev/null and b/docs/docs/components/icons/images/icon-wear-75891d28dc.webp differ --- docs/docs/components/icons/images/inbox-icon-b097d22db6.webp Binary files /dev/null and b/docs/docs/components/icons/images/inbox-icon-b097d22db6.webp differ --- docs/docs/components/icons/images/map-b06f1d5ac3.webp Binary files /dev/null and b/docs/docs/components/icons/images/map-b06f1d5ac3.webp differ --- docs/docs/components/icons/images/more-237144689e.webp Binary files /dev/null and b/docs/docs/components/icons/images/more-237144689e.webp differ --- docs/docs/components/icons/images/pallet-full-289a7a972a.webp Binary files /dev/null and b/docs/docs/components/icons/images/pallet-full-289a7a972a.webp differ --- docs/docs/components/icons/images/payment-icon-9dfe045850.webp Binary files /dev/null and b/docs/docs/components/icons/images/payment-icon-9dfe045850.webp differ --- docs/docs/components/icons/images/vest-icon-46a089a713.webp Binary files /dev/null and b/docs/docs/components/icons/images/vest-icon-46a089a713.webp differ
docs: information on Android stock icons and GTP owned icons
docs: information on Android stock icons and GTP owned icons
8358a0ca579d275e4b8903d8a295508af69278b0
--- package.json @@ -98,7 +98,7 @@ "@walmart/inbox-mini-app": "0.62.0", "@walmart/iteminfo-mini-app": "6.0.1", "@walmart/manager-approvals-miniapp": "0.1.1", - "@walmart/me-field-mini-app": "1.1.30", + "@walmart/me-field-mini-app": "1.1.31", "@walmart/metrics-mini-app": "0.9.28", "@walmart/mod-flex-mini-app": "1.2.7", "@walmart/moment-walmart": "1.0.4",
:package: Bump learning miniapp for drop 8.3
:package: Bump learning miniapp for drop 8.3
4a3b4a0f95c7948e8f7f6d5f9b243954b897a9d7
--- __tests__/whatsNew/__snapshots__/WhatsNewItemTest.tsx.snap @@ -54,36 +54,19 @@ exports[`WhatsNewItem handles navigation link 1`] = ` } > - <View - accessible={true} - collapsable={false} - focusable={true} - onClick={[Function]} - onResponderGrant={[Function]} - onResponderMove={[Function]} - onResponderRelease={[Function]} - onResponderTerminate={[Function]} - onResponderTerminationRequest={[Function]} - onStartShouldSetResponder={[Function]} + <Text + onPress={[Function]} style={ Object { - "opacity": 1, + "color": "#2e2f32", + "fontFamily": "Bogle-Regular", + "fontSize": 14, + "lineHeight": 20, + "textDecorationLine": "underline", } } testID="itemLink" - > - <Text - style={ - Object { - "color": "#2e2f32", - "fontFamily": "Bogle-Regular", - "fontSize": 14, - "lineHeight": 20, - "textDecorationLine": "underline", - } - } - /> - </View> + /> </Text> </View> </View> @@ -143,36 +126,19 @@ exports[`WhatsNewItem handles navigation link without screen 1`] = ` } > - <View - accessible={true} - collapsable={false} - focusable={true} - onClick={[Function]} - onResponderGrant={[Function]} - onResponderMove={[Function]} - onResponderRelease={[Function]} - onResponderTerminate={[Function]} - onResponderTerminationRequest={[Function]} - onStartShouldSetResponder={[Function]} + <Text + onPress={[Function]} style={ Object { - "opacity": 1, + "color": "#2e2f32", + "fontFamily": "Bogle-Regular", + "fontSize": 14, + "lineHeight": 20, + "textDecorationLine": "underline", } } testID="itemLink" - > - <Text - style={ - Object { - "color": "#2e2f32", - "fontFamily": "Bogle-Regular", - "fontSize": 14, - "lineHeight": 20, - "textDecorationLine": "underline", - } - } - /> - </View> + /> </Text> </View> </View> --- package-lock.json @@ -5094,9 +5094,9 @@ } }, "@walmart/ask-sam-mini-app": { - "version": "1.2.6", - "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.2.6.tgz", - "integrity": "sha512-c8T/dCIRCKqTgp5IveO8RauhjjDE63YaaEGFIiuoUC+jJRwCU7vxwBLMUfGsa1/c1CwnQpcOpUOHoVypgVCRvw==", + "version": "1.2.7", + "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-1.2.7.tgz", + "integrity": "sha512-lBrYgj/0yaCf7MZrg2n4MOzBy5p76gWkaAD61NCZBRij23hOTWicWJVYbMmlYpICq+/n6XGxjwcFt2eZ0YQT4g==", "requires": { "@walmart/core-utils": "^1.0.9", "@walmart/react-native-scanner-3.0": "^0.1.12", --- package.json @@ -79,7 +79,7 @@ "@walmart/allspark-neon-core": "0.1.29", "@walmart/amp-mini-app": "0.2.13", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.2.6", + "@walmart/ask-sam-mini-app": "1.2.7", "@walmart/config-components": "3.0.3", "@walmart/core-services": "~1.2.11", "@walmart/core-services-allspark": "~1.7.18", --- src/whatsNew/WhatsNewItem.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {Image, View, Text, TouchableOpacity} from 'react-native'; +import {Image, View, Text} from 'react-native'; import {useNavigation} from '@react-navigation/native'; import {getValueForCurrentLanguage} from '../transforms/language'; @@ -33,11 +33,12 @@ export const WhatsNewItem = (props: WhatsNewConfig) => { <Text style={styles.itemSubtitle}> {getValueForCurrentLanguage(text)}{' '} {!!link && ( - <TouchableOpacity testID='itemLink' onPress={onLinkPress}> - <Text style={styles.itemLink}> - {getValueForCurrentLanguage(link.title)} - </Text> - </TouchableOpacity> + <Text + testID='itemLink' + onPress={onLinkPress} + style={styles.itemLink}> + {getValueForCurrentLanguage(link.title)} + </Text> )} </Text> </View>
fix: bump ask sam. fix whast new link alignment
fix: bump ask sam. fix whast new link alignment
361ec55b71239a6641a8e4f4e081239fb682b8f8
--- .yarnrc.yml @@ -9,4 +9,4 @@ logFilters: nodeLinker: node-modules -npmRegistryServer: "${REPOSOLNS_NPM_REPO}" +npmRegistryServer: https://npm.ci.artifacts.walmart.com/artifactory/api/npm/npme-npm
chore: hardcode npm registry server in yarnrc yml to avoid publish issue
chore: hardcode npm registry server in yarnrc yml to avoid publish issue
534325a8adbb2a58be3440dad0f8310825607575
--- package-lock.json @@ -69,7 +69,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.1.33-rc.3", + "@walmart/react-native-scanner-3.0": "0.1.32", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", @@ -5803,9 +5803,9 @@ } }, "node_modules/@walmart/react-native-scanner-3.0": { - "version": "0.1.33-rc.3", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.33-rc.3.tgz", - "integrity": "sha512-3Obl7vxzMvJLhXFFJxcHrHZZR6lseS0KibPYEjd2QOrv9eOXoOAcQedUOMknWzVw/6eH7SeY/pasuLbk8aqjNg==", + "version": "0.1.32", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", + "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==", "license": "ISC", "peerDependencies": { "react-native": ">=0.47.1" @@ -25378,9 +25378,9 @@ "version": "1.33.0" }, "@walmart/react-native-scanner-3.0": { - "version": "0.1.33-rc.3", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.33-rc.3.tgz", - "integrity": "sha512-3Obl7vxzMvJLhXFFJxcHrHZZR6lseS0KibPYEjd2QOrv9eOXoOAcQedUOMknWzVw/6eH7SeY/pasuLbk8aqjNg==" + "version": "0.1.32", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", + "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==" }, "@walmart/react-native-shared-navigation": { "version": "1.0.2", --- package.json @@ -111,7 +111,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.1.33-rc.3", + "@walmart/react-native-scanner-3.0": "0.1.32", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1",
Changing back the scanner version from 0.1.33-rc.3 to 0.1.32
Changing back the scanner version from 0.1.33-rc.3 to 0.1.32
105e2f5b4582feded457dc3adbc1c1523083e051
--- env.teflon.js @@ -46,7 +46,7 @@ export default { 'WM_SVC.ENV': 'stage', REQUEST_SOURCE: 'API_PROXY', }, - persistedQueries: true, + persistedQueries: false, }, logLevel: 'debug', internalTestUrl:
updating persisted query to false
updating persisted query to false
79d85cc73fbb098ec9381cd503684b2a3249cb6d
--- package.json @@ -153,7 +153,7 @@ "@walmart/returns-mini-app": "4.17.12", "@walmart/rfid-scan-mini-app": "2.14.3", "@walmart/rn-mobile-sdk-pairing": "2.1.8", - "@walmart/rn-receiving-mini-app": "2.6.19", + "@walmart/rn-receiving-mini-app": "2.6.20", "@walmart/roster-mini-app": "3.8.0", "@walmart/schedule-mini-app": "2.6.2", "@walmart/shelfavailability-mini-app": "1.5.47", --- yarn.lock @@ -8394,7 +8394,7 @@ __metadata: "@walmart/returns-mini-app": "npm:4.17.12" "@walmart/rfid-scan-mini-app": "npm:2.14.3" "@walmart/rn-mobile-sdk-pairing": "npm:2.1.8" - "@walmart/rn-receiving-mini-app": "npm:2.6.19" + "@walmart/rn-receiving-mini-app": "npm:2.6.20" "@walmart/roster-mini-app": "npm:3.8.0" "@walmart/schedule-mini-app": "npm:2.6.2" "@walmart/shelfavailability-mini-app": "npm:1.5.47" @@ -9063,9 +9063,9 @@ __metadata: languageName: node linkType: hard -"@walmart/rn-receiving-mini-app@npm:2.6.19": - version: 2.6.19 - resolution: "@walmart/rn-receiving-mini-app@npm:2.6.19::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Frn-receiving-mini-app%2F-%2F%40walmart%2Frn-receiving-mini-app-2.6.19.tgz" +"@walmart/rn-receiving-mini-app@npm:2.6.20": + version: 2.6.20 + resolution: "@walmart/rn-receiving-mini-app@npm:2.6.20::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Frn-receiving-mini-app%2F-%2F%40walmart%2Frn-receiving-mini-app-2.6.20.tgz" dependencies: "@walmart/atlas-rn-ui-components": "npm:1.4.2" "@walmart/loadquality-mini-app": "npm:2.0.30" @@ -9094,7 +9094,7 @@ __metadata: react-native-svg: ">=14.1.0" react-native-svg-transformer: ">=1.3.0" react-native-vision-camera: "*" - checksum: 10c0/eca88fca3d8bb6867b603664d57ff433f3b0cc3fdc980ef200b893739f9f30fe5c5b172de8fa211ca73f03813c9a32732cf1eeda944032b236d4347ab4e08687 + checksum: 10c0/77a1cdc123d863b14bf5cad0aa1fc2e3b2fce29de6fc49ae2f701ba5e03b2a69bcf8253c2a0a15857bb854ec1be26ae9ee8745381e3b2a94ea7c9fae0a72f0f2 languageName: node linkType: hard
fix(receiving): drop 34 hotfix IP-14624 (#4908)
fix(receiving): drop 34 hotfix IP-14624 (#4908) Co-authored-by: Justin Shuck <justin.shuck@walmart.com>
b9a633992d31f4ba3bf47080b42afd891d81c15b
--- package-lock.json @@ -52,9 +52,9 @@ "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.4", "@walmart/impersonation-mini-app": "1.11.0", - "@walmart/ims-print-services-ui": "2.1.1", + "@walmart/ims-print-services-ui": "2.1.2", "@walmart/inbox-mini-app": "0.81.13", - "@walmart/iteminfo-mini-app": "7.1.3", + "@walmart/iteminfo-mini-app": "7.1.4", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.1.45", "@walmart/metrics-mini-app": "0.9.44", @@ -5296,15 +5296,16 @@ } }, "node_modules/@walmart/ims-print-services-ui": { - "version": "2.1.1", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.1.1.tgz", - "integrity": "sha512-hAP1EzvgDaRVfQWaUdnGmPErdQKfTIZLEaojg+vEszSfbYXgrxPkGebs35Yx5SpNTmdPNuJ8APttyD4NaKXkDw==", + "version": "2.1.2", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.1.2.tgz", + "integrity": "sha512-wLgzD/a0hpXo+hL9tgH860T5faXgbqWdjEFULLbpiNJds/tmltjBS4SfNPbzkifPc/sIkALbZZ+12g8znNvQcQ==", "peerDependencies": { "@react-native-firebase/analytics": ">=10.5.1", "@react-native-firebase/app": ">=10.5.0", "@react-native-firebase/crashlytics": ">=10.5.1", "@react-native-firebase/firestore": ">=10.5.1", "@react-native-firebase/perf": ">=10.5.1", + "@react-navigation/native": ">=6.0.0", "@walmart/functional-components": ">=1.0.22", "@walmart/gtp-shared-components": ">=2.0.0", "@walmart/react-native-logger": ">=1.17.0", @@ -5336,9 +5337,9 @@ } }, "node_modules/@walmart/iteminfo-mini-app": { - "version": "7.1.3", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.3.tgz", - "integrity": "sha512-ax0aspZ/d5L/R8iliVVggPpwHA2DOuoND6LL/1TmnVeslhLX6+71b4xwN1M/Et7M8cOT/K4hCFj8qFazs0GFVQ==", + "version": "7.1.4", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.4.tgz", + "integrity": "sha512-QHq9YvcJtLez/f9a8/0OvZ7BCQ+anUO8Mp5YvIadK122YBPzfMdxuzxBaszcl4yU388SXbof8fDjlhdQucuFSw==", "peerDependencies": { "@react-native-community/async-storage": ">=1.12.1", "@react-native-community/netinfo": ">=9.3.6", @@ -25135,9 +25136,9 @@ "version": "1.11.0" }, "@walmart/ims-print-services-ui": { - "version": "2.1.1", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.1.1.tgz", - "integrity": "sha512-hAP1EzvgDaRVfQWaUdnGmPErdQKfTIZLEaojg+vEszSfbYXgrxPkGebs35Yx5SpNTmdPNuJ8APttyD4NaKXkDw==" + "version": "2.1.2", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.1.2.tgz", + "integrity": "sha512-wLgzD/a0hpXo+hL9tgH860T5faXgbqWdjEFULLbpiNJds/tmltjBS4SfNPbzkifPc/sIkALbZZ+12g8znNvQcQ==" }, "@walmart/inbox-mini-app": { "version": "0.81.13", @@ -25147,9 +25148,9 @@ } }, "@walmart/iteminfo-mini-app": { - "version": "7.1.3", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.3.tgz", - "integrity": "sha512-ax0aspZ/d5L/R8iliVVggPpwHA2DOuoND6LL/1TmnVeslhLX6+71b4xwN1M/Et7M8cOT/K4hCFj8qFazs0GFVQ==" + "version": "7.1.4", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.4.tgz", + "integrity": "sha512-QHq9YvcJtLez/f9a8/0OvZ7BCQ+anUO8Mp5YvIadK122YBPzfMdxuzxBaszcl4yU388SXbof8fDjlhdQucuFSw==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.1" --- package.json @@ -94,9 +94,9 @@ "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.4", "@walmart/impersonation-mini-app": "1.11.0", - "@walmart/ims-print-services-ui": "2.1.1", + "@walmart/ims-print-services-ui": "2.1.2", "@walmart/inbox-mini-app": "0.81.13", - "@walmart/iteminfo-mini-app": "7.1.3", + "@walmart/iteminfo-mini-app": "7.1.4", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.1.45", "@walmart/metrics-mini-app": "0.9.44",
updated iteminfo and print versions with bottomsheet overlay fixes
updated iteminfo and print versions with bottomsheet overlay fixes
f594c072c6a77453fcf9d5e1e79ebea914ad7218
--- src/permissions/PermissionsSaga.ts @@ -1,5 +1,5 @@ import {call, select, fork} from 'typed-redux-saga'; -import {take, cancel, takeLatest, put} from 'redux-saga/effects'; +import {take, cancel} from 'redux-saga/effects'; import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; import { NotificationActionTypes, @@ -9,7 +9,6 @@ import { LocationActionTypes, LocationSelectors, } from '@walmart/allspark-foundation/Location'; -import {createRestartableSaga} from '@walmart/allspark-utils'; import {PERMISSIONS_COMPLETE, PERMISSIONS_START} from '../core/redux'; import {resetTo} from '../redux/SharedSagas'; @@ -64,22 +63,3 @@ export function* handlePermissions() { } } } - -export function* onPermissionsSet() { - const permissionsUnset = yield* call(getPermissionsUnset); - if (!permissionsUnset) { - yield put(PERMISSIONS_COMPLETE()); - } -} - -export function* permissionSagas() { - yield createRestartableSaga( - takeLatest( - [ - LocationActionTypes.UPDATE_PERMISSION, - NotificationActionTypes.UPDATE_PERMISSION, - ], - onPermissionsSet, - ), - ); -} --- src/permissions/index.ts @@ -1,14 +1,3 @@ -import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; -import {permissionSagas} from './PermissionsSaga'; - export * from './LocationScreen'; export * from './NotificationsScreen'; export * from './WelcomeScreen'; - -export const initPermissions = () => { - const permissionTask = AllsparkReduxStore.addSagas(permissionSagas); - - return () => { - permissionTask.cancel(); - }; -}; --- src/startup/RootStartup.ts @@ -10,7 +10,6 @@ import {useToggleState} from '@walmart/allspark-utils'; import {Logger} from '../core/Logger'; import {Telemetry} from '../core/Telemetry'; import {initTranslations} from '../translations'; -import {initPermissions} from '../permissions'; import {initTermsOfUse} from '../termsOfUse'; import {initBiometrics} from '../biometrics'; import {initUpdateCheck} from '../updates'; @@ -66,7 +65,6 @@ export const initRootFeatures = () => { const cleanupBiometrics = initBiometrics(); const cleanupUpdateCheck = initUpdateCheck(); const cleanTermsOfUse = initTermsOfUse(); - const cleanupPermissions = initPermissions(); // TODO: Move this to calling feature // const callingPermissionTask = AllsparkReduxStore.addSagas( // callingPermissionSagas, @@ -80,8 +78,8 @@ export const initRootFeatures = () => { cleanupBiometrics(); cleanupUpdateCheck(); cleanTermsOfUse(); - cleanupPermissions(); - callingPermissionTask.cancel(); + // cleanupPermissions(); + // callingPermissionTask.cancel(); deeplinkTask.cancel(); }; };
fix: remove dispatch of legacy permission complete action
fix: remove dispatch of legacy permission complete action
c43af3aef06e35a46d4b601d8b8960031d60d3eb
--- .looper-pr.yml @@ -13,7 +13,6 @@ flows: - (name Yarn Install) yarn install - (name Test Coverage) yarn run coverage - envs: global: variables: --- __tests__/components/ErrorComponentTest.tsx @@ -14,5 +14,6 @@ describe('ErrorComponent tests', () => { const errorView = errorComponent.getByTestId('errorView'); expect(errorView).toBeDefined(); expect(errorMessage).toBeDefined(); + expect(errorMessage.props.children).toBe('Connection lost'); }); });
chore(ci): updated test case to trigger version change
chore(ci): updated test case to trigger version change
4ef75c8b88a681759db7a06e0fa4e62b3f546411
--- packages/core-widget-registry/src/AskSam/types.ts @@ -81,4 +81,8 @@ export type AskSamEntities = Partial<{ export type AskSamWidgetProps = { entities: AskSamEntities; style?: StyleProp<ViewStyle>; + data?: any; + widgetId: string; + chatHistoryMessageData?: any; + setChatHistoryMessageData?: (data: any) => void; };
Ask Sam - adding new props to save widget data in redux store (#47)
Ask Sam - adding new props to save widget data in redux store (#47) * adding new props to save widget data in redux store * lint fix
5ce6128a1bff5270d05b44eed7f3822f8ea56fc0
--- packages/allspark-foundation-hub/src/HubFeature/TeamSelection/Component/ErrorScreen.tsx @@ -3,6 +3,8 @@ import React from 'react'; import { errorScreenStyles as styles } from '../styles'; import { View } from 'react-native'; import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context'; +import { LoggerService } from '@walmart/allspark-foundation/Logger'; +import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; export interface ErrorScreenProps { errorTitle: string; @@ -18,6 +20,8 @@ export const ErrorScreen = ({ handleButtonPress, }: ErrorScreenProps) => { const TeamImage = useAllsparkImage(); + const logger = LoggerService.getContainerInstance(); + const telemetryService = useTelemetryService(); return ( <View testID='error-screen-container' style={styles.container}> @@ -39,6 +43,14 @@ export const ErrorScreen = ({ placeholder='KLQAN?~9~U=rn$JCyDE3-O' height={162} width={162} + onError={(error) => { + logger.error('ImageFailure', { + message: `Image failure ${error}`, + }); + telemetryService.logEvent('image_uri_failure', { + message: 'Image failure', + }); + }} /> } title={errorTitle}
Adding logs for Error Screen image
Adding logs for Error Screen image
b0d29ce2c03124281be9dfc39f46c17466b327f2
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -8,6 +8,10 @@ import { ManagerExperienceSelectors, TeamShiftSwitcher, } from '@walmart/allspark-foundation-hub'; +import { + supplyChainManagerExperienceSlice, + ManagerExperienceSelectors as supplyChainSelector, +} from '@walmart/allspark-foundation-hub'; import {RosterDetailPageHeader} from '../../components/RosterDetailPageHeader'; import {RosterFiltersAndInfo} from '../../components/RosterFiltersAndInfo'; import {TeamSearchInput} from '../../components/TeamSearchInput'; @@ -33,6 +37,7 @@ import {sortedAssociateList} from '../../utils/associateList'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import { generateTeamRoster, + generateTeamShiftRoster, handleViewAssociateSchedule, filterAssociatesByStatusAndSearchInputAndShift, } from '../../utils/rosterDetail'; @@ -69,7 +74,12 @@ import {RosterDetailScreenProps} from './types'; //import {mapAvailableShifts} from '../../utils/allTeams'; import {WarningBanner} from '../../components/WarningBanner'; import {UserDomain} from '@walmart/me-at-walmart-common'; +import {AllsparkReduxStore} from '@walmart/allspark-foundation'; +AllsparkReduxStore.addReducer( + 'supplyChainManagerExperience', + supplyChainManagerExperienceSlice.reducer, +); //Todo: Refactor some functionalities in this component export const SupplyChainRosterDetailScreen = ({ route, @@ -94,6 +104,8 @@ export const SupplyChainRosterDetailScreen = ({ const selectedTeamIds = useSelector( ManagerExperienceSelectors.getSelectedTeamIDs, ) ?? [TOTAL_STORE_TEAM_ID]; + const shift = useSelector(supplyChainSelector.getSavedSiteShifts); + const getSavedSiteTeams = useSelector(supplyChainSelector.getSavedSiteTeams); const selectedTeamPreference = useSelector(ManagerExperienceSelectors.getSelectedTeamPreference) ?? TOTAL_STORE_TEAM_LABEL; @@ -221,17 +233,41 @@ export const SupplyChainRosterDetailScreen = ({ const currentTeamName = getCurrentTeamName(); const headerAndSubtext = getHeaderAndSubtext(); - + const userTeamIds = selectedTeamIds.length + ? selectedTeamIds + : getSavedSiteTeams; const teamRoster = rosterData - ? (generateTeamRoster( - teamState.teamIds, + ? (generateTeamShiftRoster( rosterData, - currentTeam as unknown as Team, - selectedTeamIds, + userTeamIds, allTeams, ) as Associate[]) : []; + function getShiftNumbers(shifts: any, mapShift: any) { + return shifts.map((shiftData: any) => mapShift[shiftData]); + } + const mapShift = { + A1: 1, + A2: 2, + A3: 3, + B1: 4, + B2: 5, + B3: 6, + }; + const shiftNumbers = getShiftNumbers(shift, mapShift); + function filterTeamRosterByShiftNumbers( + teamRosterData: any, + shiftNumber: any, + ) { + return teamRosterData.filter((member: any) => + shiftNumber.includes(member.shift.number), + ); + } + const filteredTeamRoster = filterTeamRosterByShiftNumbers( + teamRoster, + shiftNumbers, + ); //Todo: Move some of the functions to utils or hooks const [selectedFilter, setSelectedFilter] = useState<FilterValue>( FilterValue.all, @@ -428,7 +464,7 @@ export const SupplyChainRosterDetailScreen = ({ // Effect for non-DC sites filtering useEffect(() => { const associatesFiltered = filterAssociatesByStatusAndSearchInputAndShift( - teamRoster, + filteredTeamRoster, selectedFilter, searchInput, shiftSelected, @@ -439,6 +475,7 @@ export const SupplyChainRosterDetailScreen = ({ selectedFilter, shiftSelected, teamState, + shift, rosterData?.getDailyRoster, dataLoading, ]); @@ -501,7 +538,7 @@ export const SupplyChainRosterDetailScreen = ({ {isSalariedOrLead ? ( <View style={styles.switcherContainer}> <TeamShiftSwitcher - onTeamChange={(teamData, teamLabel, teamIds) => { + onTeamChange={(teamData: any, teamLabel: any, teamIds: any) => { setTeamState({ teamData: teamData, teamLabel: teamLabel, --- src/utils/rosterDetail.tsx @@ -87,6 +87,41 @@ export const generateTeamRoster = ( ); }; +export const generateTeamShiftRoster = ( + rosterData: GetDailyRosterQuery | undefined, + userTeamIds: string[] | unknown, + allTeams: Team[], +) => { + const dailyRoster = rosterData?.getDailyRoster; + + if (dailyRoster === null || dailyRoster === undefined) { + logger.warn('generateTeamRoster Warning: ', { + message: 'roster is null or undefined', + }); + return []; + } + + if (dailyRoster.length === 0) { + logger.warn('generateTeamRoster Warning: ', { + message: 'roster is empty', + }); + } + + const userTeams = allTeams?.filter((team) => + userTeamIds.includes(team?.teamId ?? ''), + ); + const combinedTeamMembers = userTeams?.reduce((accumulator, team) => { + if (!team?.members) return accumulator; + return [...accumulator, ...team.members]; + }, [] as (string | null)[]); + const combinedTeamRoster = dailyRoster.filter((associate) => + associate?.associateId + ? combinedTeamMembers?.includes(associate.associateId) + : false, + ); + return combinedTeamRoster; +}; + export const handleViewAssociateSchedule = ( associate: Associate, storeId: string | undefined,
Adding teamSwitcher inytegration
Adding teamSwitcher inytegration
c17fd75c757c406b171f7e64e3d55808ab079d26
--- targets/US/ios/Podfile.lock @@ -1931,11 +1931,11 @@ PODS: - React-Core - react-native-safe-area-context (4.10.8): - React-Core - - react-native-scanner-3.0 (0.9.2): + - react-native-scanner-3.0 (0.10.2): - Firebase/Analytics - React - - ScanditBarcodeCapture (= 6.25.5) - - ScanditCaptureCore (= 6.25.5) + - ScanditBarcodeCapture (= 6.25.6) + - ScanditCaptureCore (= 6.25.6) - SDWebImage (~> 5.0) - react-native-splash-screen (3.3.0): - React-Core @@ -2231,9 +2231,9 @@ PODS: - React-Core - RNVectorIcons (9.2.0): - React-Core - - ScanditBarcodeCapture (6.25.5): - - ScanditCaptureCore (= 6.25.5) - - ScanditCaptureCore (6.25.5) + - ScanditBarcodeCapture (6.25.6): + - ScanditCaptureCore (= 6.25.6) + - ScanditCaptureCore (6.25.6) - SDWebImage (5.17.0): - SDWebImage/Core (= 5.17.0) - SDWebImage/Core (5.17.0) @@ -2854,7 +2854,7 @@ SPEC CHECKSUMS: react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371 - react-native-scanner-3.0: 3c76c513543f635e24b7dfd8f8d8815d95289424 + react-native-scanner-3.0: 4f69b408149fa274a4ac5187a33c0fc8640ec99d react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688 @@ -2913,8 +2913,8 @@ SPEC CHECKSUMS: RNSoundPlayer: 369105c565b8fe6ea0a43fc882dc81eba444e842 RNSVG: ba3e7232f45e34b7b47e74472386cf4e1a676d0a RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8 - ScanditBarcodeCapture: 801aafd1750a4bdaa0500d676abff01e7c69b9d3 - ScanditCaptureCore: 098ee500ee953b9ab3dad193021abcdcd680318b + ScanditBarcodeCapture: c25cbf6c35b2dfdb4863f0fda82b4b660c00ceaa + ScanditCaptureCore: 3aa4514e5161656069ca17eb82292f2dc267ce52 SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9 SDWebImageAVIFCoder: 8348fef6d0ec69e129c66c9fe4d74fbfbf366112 SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c @@ -2930,7 +2930,7 @@ SPEC CHECKSUMS: walmart-react-native-sumo-sdk: 49d6a1873b29b2279433bd4346755206ac60e1fd WebexSDK: 8a46648ec5992f1a10de5375e91df35750275445 wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3 - Yoga: c716aea2ee01df6258550c7505fa61b248145ced + Yoga: 47d399a73c0c0caa9ff824e5c657eae31215bfee PODFILE CHECKSUM: e45caceff59820fc357600d6b2277634c8242734 --- targets/US/package.json @@ -131,7 +131,7 @@ "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-env": "~6.3.28", "@walmart/react-native-logger": "1.35.0", - "@walmart/react-native-scanner-3.0": "0.9.2", + "@walmart/react-native-scanner-3.0": "0.10.2", "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.7.2-alpha.2", --- yarn.lock @@ -7047,7 +7047,7 @@ __metadata: "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-env": "npm:~6.3.28" "@walmart/react-native-logger": "npm:1.35.0" - "@walmart/react-native-scanner-3.0": "npm:0.9.2" + "@walmart/react-native-scanner-3.0": "npm:0.10.2" "@walmart/react-native-shared-navigation": "npm:~6.3.28" "@walmart/react-native-store-map": "npm:0.3.7" "@walmart/react-native-sumo-sdk": "npm:2.7.2-alpha.2" @@ -7626,12 +7626,12 @@ __metadata: languageName: node linkType: hard -"@walmart/react-native-scanner-3.0@npm:0.9.2": - version: 0.9.2 - resolution: "@walmart/react-native-scanner-3.0@npm:0.9.2" +"@walmart/react-native-scanner-3.0@npm:0.10.2": + version: 0.10.2 + resolution: "@walmart/react-native-scanner-3.0@npm:0.10.2" peerDependencies: react-native: ">=0.47.1" - checksum: 10c0/0e72d45ec8bd4590f08ee28f0782629b9c12f33a1ca8a391189df3ed3fb03efc384de340688c6a09ade031570b3a4a1231e52fc4cce46d6477b89750d0c6dbd2 + checksum: 10c0/7bf01ce3991d375e2c5a2ec88c81b5d7d3952e0480f2fe7dbe3e228a5f780c5721b2bcfab32db5611bcdf10ed081941421c4a7a58130333c2e6489f4bf6146b1 languageName: node linkType: hard
Updated scanner 3.0 version to 0.10.2
Updated scanner 3.0 version to 0.10.2
2432334727add1d2dc4cd5b82455d6fcb9267915
--- packages/associate-exp-hub-hub/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.13.0](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-hub@2.12.1...@walmart/associate-exp-hub-hub@2.13.0) (2025-11-19) + +### Features + +- **ui:** update the use widget management value to false by default ([b0a089c](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/b0a089ccc821713651c8505cb7f773ec891defbd)) + ## [2.12.1](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-hub@2.12.0...@walmart/associate-exp-hub-hub@2.12.1) (2025-11-18) **Note:** Version bump only for package @walmart/associate-exp-hub-hub --- packages/associate-exp-hub-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-hub", - "version": "2.12.1", + "version": "2.13.0", "description": "Hub Framework module for Associate Experience Hub - can be moved to @walmart/my-walmart-hub", "packageManager": "yarn@4.6.0", "engines": { --- packages/associate-exp-hub-mini-app/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.5.0](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.4.0-alpha.42...@walmart/associate-exp-hub-mini-app@1.5.0) (2025-11-19) + +### Features + +- **ui:** update associate exp hub mini app version ([87d4b1d](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/commit/87d4b1d5e25f1a87b0ec2abaf0d9ff57256503a7)) +- **ui:** update the use widget management value to false by default ([b0a089c](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/commit/b0a089ccc821713651c8505cb7f773ec891defbd)) + # [1.4.0-alpha.42](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.4.0-alpha.41...@walmart/associate-exp-hub-mini-app@1.4.0-alpha.42) (2025-11-18) **Note:** Version bump only for package @walmart/associate-exp-hub-mini-app --- packages/associate-exp-hub-mini-app/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-mini-app", - "version": "1.4.1", + "version": "1.5.0", "packageManager": "yarn@4.6.0", "engines": { "node": ">=18"
chore(version): updating package version
chore(version): updating package version - @walmart/associate-exp-hub-hub@2.13.0 - @walmart/associate-exp-hub-mini-app@1.5.0
43316bb6dd3d95cdb6b6d8e58c6b36cf9495b118
--- package-lock.json @@ -4552,9 +4552,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.57.0", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.57.0.tgz", - "integrity": "sha512-+iEG9aj+18OXGvuA6CbUB079cIQNgWZKIr1QvkcVMYbBc74fI43xxi0CCl54+vwBaXYctFWwpG+pQqmvPgRvVw==" + "version": "0.60.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.60.0.tgz", + "integrity": "sha512-Xrea15bq1908UCipB1La9w0MAT08Melb+X7bDH2zWbheznRTtjysYrHHZFImU20hmhjYkxDoxcYx+lDrikd92A==" }, "@walmart/wfm-ui": { "version": "0.2.11", --- package.json @@ -104,7 +104,7 @@ "@walmart/taskit-mini-app": "0.19.0", "@walmart/time-clock-mini-app": "0.5.1", "@walmart/ui-components": "1.4.0-rc.0", - "@walmart/welcomeme-mini-app": "0.57.0", + "@walmart/welcomeme-mini-app": "0.60.0", "@walmart/wfm-ui": "0.2.11", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0",
build(welcomeMe): v0.60.0 -[RECRUIT-48192]
build(welcomeMe): v0.60.0 -[RECRUIT-48192]
2750967fb99ca7c78348c286c4f8aed3231885f8
--- src/auth/ErrorScreen.tsx @@ -15,6 +15,8 @@ import { LinkButton, PrimaryButton, Dropdown, + RadioItemGroup, + CheckboxItemGroup, Subheader, Subheader2, ExclamationCircleFillIcon, @@ -24,7 +26,7 @@ import {SSO_APP} from '../types/telemetryConstants'; import {logger} from '../services/Logger'; import {encryptUserId} from '../services/MaskUserId'; import styles from './styles'; -import {ERROR_CATEGORIES} from './constants'; +import {ERROR_CATEGORIES, Q1Options, Q2Options} from './constants'; export const ErrorScreen: FC<any> = (props) => { const {navigation} = props; @@ -37,6 +39,8 @@ export const ErrorScreen: FC<any> = (props) => { const [detail, setDetail] = useState(''); const [formDirty, setFormDirty] = useState(false); const [selectedValue, setSelectedValue] = useState(''); + const [selectedQ1Options, setselectedQ1Options] = useState([0, '1']); + const [selectedQ2Option, setSelectedQ2Option] = useState(''); const userIdValid = !formDirty || !!userId; const siteIdValid = !formDirty || !!siteId; @@ -72,6 +76,14 @@ export const ErrorScreen: FC<any> = (props) => { const getIssueList = () => ERROR_CATEGORIES.map((err) => translate(`ssoError.issues.${err}`)); + const getOptions = (qNum: Number) => { + const list = qNum === 1 ? Q1Options : Q2Options; + return list.map((opn, index) => ({ + id: index, + label: translate(`ssoError.otherIssue.${opn}`), + })); + }; + const onCancel = () => { WmTelemetry.logEvent(SSO_APP, 'feedback_canceled', {}); navigation.goBack(); @@ -161,13 +173,10 @@ export const ErrorScreen: FC<any> = (props) => { style={styles.input} value={selectedValue} values={getIssueList()} // todo - placeholder={translate('ssoError.selectIssue')} - // onValueChange={(itemValue: React.SetStateAction<string>) => - // setSelectedValue(itemValue) - // } - onSelect={(itemValue: React.SetStateAction<string>) => - setSelectedValue(itemValue) - } + label={translate('ssoError.selectIssue')} + onSelect={(itemValue: string) => { + setSelectedValue(itemValue); + }} /> </View> {missingFields && ( @@ -182,11 +191,32 @@ export const ErrorScreen: FC<any> = (props) => { </View> )} </View> + + {selectedValue === translate('ssoError.issues.other') && ( + <View> + <Text style={styles.fieldTitle}> + {translate('ssoError.otherIssue.q1')} + </Text> + <CheckboxItemGroup + items={getOptions(1)} + selectedIds={selectedQ1Options} + onSelect={(id) => setselectedQ1Options(id)} + /> + <Text style={styles.fieldTitle}> + {translate('ssoError.otherIssue.q2')} + </Text> + <RadioItemGroup + items={getOptions(2)} + selectedId={selectedQ2Option} + onSelect={(id) => setSelectedQ2Option(id)} + /> + </View> + )} + {/* <View style={styles.optionalSection}> */} <Text style={styles.fieldTitle}> {translate('ssoError.optional')} </Text> - <View style={styles.fieldSet}> {!!detail && ( <Text style={styles.legend}>{translate('ssoError.details')}</Text> --- src/auth/constants.ts @@ -14,3 +14,6 @@ export const ERROR_CATEGORIES = [ 'wiFi', 'other', ]; + +export const Q1Options = ['q1Option1', 'q1Option2', 'q1Option3']; +export const Q2Options = ['q1Option1', 'q1Option2', 'q1Option3']; --- src/translations/en-US.ts @@ -96,6 +96,17 @@ export const enUS = { wiFi: 'Store Wi-Fi issue', other: 'Other', }, + otherIssue: { + q1: 'Do any of these apply?', + q1Option1: 'Sign in was not displayed', + q1Option2: 'I could not submit user id / password', + q1Option3: + 'I’m able to login to other Walmart apps on my phone (IE Workplace, One Walmart)', + q2: 'What type of device were you using?', + q2Option1: 'Personal device', + q2Option2: 'Personal device (BYOD enrolled) ', + q2Option3: 'Work phone (Samsung x cover)', + }, }, whatsNew: { modalTitle: "What's new in Me@Walmart",
add other error options screen
add other error options screen
61dad086b8f3e92dcd2917b575bced303367a979
--- package.json @@ -141,7 +141,7 @@ "@walmart/returns-mini-app": "4.6.0", "@walmart/rfid-scan-mini-app": "2.3.10", "@walmart/roster-mini-app": "1.1.7", - "@walmart/schedule-mini-app": "^0.114.2", + "@walmart/schedule-mini-app": "0.114.2", "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.9", "@walmart/taskit-mini-app": "2.81.15", --- yarn.lock @@ -6982,7 +6982,7 @@ __metadata: languageName: node linkType: hard -"@walmart/schedule-mini-app@npm:^0.114.2": +"@walmart/schedule-mini-app@npm:0.114.2": version: 0.114.2 resolution: "@walmart/schedule-mini-app@npm:0.114.2" dependencies: @@ -7764,7 +7764,7 @@ __metadata: "@walmart/returns-mini-app": "npm:4.6.0" "@walmart/rfid-scan-mini-app": "npm:2.3.10" "@walmart/roster-mini-app": "npm:1.1.7" - "@walmart/schedule-mini-app": "npm:^0.114.2" + "@walmart/schedule-mini-app": "npm:0.114.2" "@walmart/shelfavailability-mini-app": "npm:1.5.23" "@walmart/store-feature-orders": "npm:1.26.9" "@walmart/taskit-mini-app": "npm:2.81.15"
updating yarn lock with new SMA version
updating yarn lock with new SMA version
e4792cbd27a399283c94b1e8b83b393c0d9f82e6
--- docs/CHANGELOG.md @@ -1,3 +1,20 @@ +# [3.3.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.2.0...v3.3.0) (2025-07-22) + + +### Features + +* **ui:** adding changes for wmconnect version ([60976a2](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/60976a2c25db91a8475aa351d5dee9f1e2a575bd)) +* **ui:** adding changes for wmconnect version ([d5d597b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/d5d597b45c7b546b7c2cc164f5e5f3298c4c94ee)) +* **ui:** adding changes for wmconnect version ([5d1b5b8](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/5d1b5b8af480e5e5d64f34eb290243c88725d9bd)) +* **ui:** adding new roster pre release version ([3320685](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/3320685d965a57ddb942450379a087051ba4ea09)) +* **ui:** adding new wmconnect version ([8793a13](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8793a139dbddb7877ea37f17145118ff572d6bee)) +* **ui:** lint fix ([ca7bb25](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/ca7bb2563acd1ac07996aac828974cc3c20e704f)) +* **ui:** reverted main script in package.json ([c3c231b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/c3c231b6a4a29e9ec495be56f9b4ab19fc0b561b)) +* **ui:** update roster develop with main ([3a35f64](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/3a35f640a7f178cd887166747fc397d95b39228f)) +* **ui:** updated query functions ([59a9539](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/59a953983525d851f084f49fcd3e05a7c27879f7)) +* **ui:** updated query, removed shift from store query ([5f07a36](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/5f07a364c6333de630cfe6e9637f77e922986018)) +* **ui:** updated store and sc query ([42d8458](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/42d8458d7bdf4a5744a07968ac7bf6bd1d8204ab)) + # [3.2.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.1.1...v3.2.0) (2025-07-01) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.2.0", + "version": "3.3.0", "main": "dist/index.js", "files": [ "dist",
chore(release): 3.3.0 [skip ci]
chore(release): 3.3.0 [skip ci] # [3.3.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.2.0...v3.3.0) (2025-07-22) ### Features * **ui:** adding changes for wmconnect version ([60976a2](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/60976a2c25db91a8475aa351d5dee9f1e2a575bd)) * **ui:** adding changes for wmconnect version ([d5d597b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/d5d597b45c7b546b7c2cc164f5e5f3298c4c94ee)) * **ui:** adding changes for wmconnect version ([5d1b5b8](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/5d1b5b8af480e5e5d64f34eb290243c88725d9bd)) * **ui:** adding new roster pre release version ([3320685](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/3320685d965a57ddb942450379a087051ba4ea09)) * **ui:** adding new wmconnect version ([8793a13](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/8793a139dbddb7877ea37f17145118ff572d6bee)) * **ui:** lint fix ([ca7bb25](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/ca7bb2563acd1ac07996aac828974cc3c20e704f)) * **ui:** reverted main script in package.json ([c3c231b](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/c3c231b6a4a29e9ec495be56f9b4ab19fc0b561b)) * **ui:** update roster develop with main ([3a35f64](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/3a35f640a7f178cd887166747fc397d95b39228f)) * **ui:** updated query functions ([59a9539](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/59a953983525d851f084f49fcd3e05a7c27879f7)) * **ui:** updated query, removed shift from store query ([5f07a36](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/5f07a364c6333de630cfe6e9637f77e922986018)) * **ui:** updated store and sc query ([42d8458](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/42d8458d7bdf4a5744a07968ac7bf6bd1d8204ab))
822613c4fedae3722bcb97830b983ea430887064
--- packages/me-at-walmart-container/src/redux/config.ts @@ -75,6 +75,7 @@ export function* getAppConfigScope() { const env: IMeAtWalmartEnvironment = yield call( AllsparkEnvironment.getDeferred, ); + const [ country, divisionNbr, @@ -117,20 +118,22 @@ export function* getAppConfigScope() { appId, scope: `${env.deployment}/${country || 'US'}/${division}`, params: { + // Site based params division, state: `${state}`, isDCUser, + // User based params siteId: `${siteId}`, payType: `${payType}`, employmentStatus: `${employmentStatus}`, + // Device based params appVersion, appBuildNumber, deviceType, model, osVersion, - os: Platform.OS, }, }; --- packages/me-at-walmart-container/src/redux/navConfig.ts @@ -14,12 +14,14 @@ import { DeviceSagas, } from '@walmart/allspark-foundation/Device'; import { + INavConfigActions, NavConfigActionTypes, NavConfigSagas, } from '@walmart/allspark-foundation/Navigation'; import {EnvironmentSelectors} from '@walmart/allspark-foundation/Environment'; import { IMeAtWalmartEnvironment, + IMeAtWalmartNavConfigActions, MeAtWalmartNavConfigActions, MeAtWalmartUserSelectors, } from '@walmart/me-at-walmart-common'; @@ -150,24 +152,35 @@ export function* fetchNavConfig(forceRefresh: boolean = false) { } } -/* - * Fetch App Config with forced refresh - */ -export function* refetchAppConfig() { - yield call(fetchNavConfig, true); -} - -// On user update, if any of the following fields change, we need to re-fetch nav config -export function* onUserUpdate(action: IUserActions['UPDATE']) { - if (action.payload.userId || action.payload.workingSite) { - yield call(fetchNavConfig); +export function* onFetchNavConfig( + action: + | INavConfigActions['INIT_SUCCESS'] + | IUserActions['START_IMPERSONATION'] + | IUserActions['EXIT_IMPERSONATION'] + | IMeAtWalmartNavConfigActions['REFETCH_CONFIG'] + | IUserActions['UPDATE'], +) { + console.log('rlane1 - fetching nav config for', action); + // Default force refresh to false + let forceRefresh = false; + + switch (action.type) { + // navConfig/REFETCH_CONFIG - manually refetching nav config + case MeAtWalmartNavConfigActions.REFETCH_CONFIG.type: + forceRefresh = true; + yield call(fetchNavConfig, forceRefresh); + break; + // user/UPDATE - user info has changed + case UserActionTypes.UPDATE: + if (action.payload.userId || action.payload.workingSite) { + yield call(fetchNavConfig, forceRefresh); + } + break; + default: + yield call(fetchNavConfig); } } -export function* onFetchNavConfig() { - yield call(fetchNavConfig); -} - export const NavigationConfigSagas = [ call(initializeNavConfig), takeLeading( @@ -175,12 +188,9 @@ export const NavigationConfigSagas = [ NavConfigActionTypes.INIT_SUCCESS, // when nav config is initialized UserActionTypes.START_IMPERSONATION, // when user is impersonating UserActionTypes.EXIT_IMPERSONATION, // when user exits impersonation + MeAtWalmartNavConfigActions.REFETCH_CONFIG.type, // when config is manually re-fetched + UserActionTypes.UPDATE, // when user info is updated ], onFetchNavConfig, ), - takeLeading(UserActionTypes.UPDATE, onUserUpdate), // when user info is updated - takeLeading( - MeAtWalmartNavConfigActions.REFETCH_CONFIG.type, - refetchAppConfig, - ), // when config is manually re-fetched ];
refactor: handle nav config fetch in one saga effect for simplicity and clarity
refactor: handle nav config fetch in one saga effect for simplicity and clarity
d06f240830362904eb1a40d853ab4b3e4314a349
--- package-lock.json @@ -3509,16 +3509,16 @@ "integrity": "sha512-bRj8dBPIo3ShYDH800Lm9XfbCHk8Kclu+Cqbdo/oEB3DIQtoK4TSoyIm8W+c9nhd/kaeEQsev6N99WmNj5BEAg==" }, "@walmart/schedule-mini-app": { - "version": "0.3.1", - "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.3.1.tgz", - "integrity": "sha512-rPUEIhhP0V+qaKBOjCRPSXAQ0tYLO9YNm5XPiCiuNuj13bsV+vM3iGxwCxCc+SnotWRXXNhFFVik04Psipm2Tg==", + "version": "0.4.1", + "resolved": "https://npme.walmart.com/@walmart/schedule-mini-app/-/schedule-mini-app-0.4.1.tgz", + "integrity": "sha512-4XOcWR8zFFY3q+XpaqU3r9Gk1W5/W4xmtc/HHjMlXT6dI1DPTbN8YV0e2OP1YxvEL/oPPo+veGoUEPaxhxD5WQ==", "requires": { "@walmart/moment-walmart": "^1.0.4", - "@walmart/wfm-ui": "0.1.52", + "@walmart/wfm-ui": "0.2.0", "crypto-js": "^3.3.0", "react-native-tab-view": "^2.15.2", "reselect": "^4.0.0", - "wfm-allspark-data-library": "0.1.1" + "wfm-allspark-data-library": "0.2.0" }, "dependencies": { "@walmart/gtp-shared-components": { @@ -3533,9 +3533,9 @@ } }, "@walmart/wfm-ui": { - "version": "0.1.52", - "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.1.52.tgz", - "integrity": "sha1-vsuqaggfL5L/KFXHCYIRDlZL5X0=", + "version": "0.2.0", + "resolved": "https://npme.walmart.com/@walmart/wfm-ui/-/wfm-ui-0.2.0.tgz", + "integrity": "sha512-asGKKuT/cjmFppcrTK61QsbRSA1WhmB6akTMfa2a+QSTPJuimlqN2XrOk1hJ5l3WBn+w9j1hSPy+CBu9kOfdkg==", "requires": { "@walmart/gtp-shared-components": "^0.2.2", "@walmart/moment-walmart": "1.0.3", @@ -3557,9 +3557,9 @@ } }, "wfm-allspark-data-library": { - "version": "0.1.1", - "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.1.1.tgz", - "integrity": "sha512-QjuPCB54P6j+bV3CG1D4l96DRDqQXichOrTQtRoYNXQWvYZpMsVQOkZhfxIqOOCJTLTWlwJih8wGpJmBp53cZw==", + "version": "0.2.0", + "resolved": "https://npme.walmart.com/wfm-allspark-data-library/-/wfm-allspark-data-library-0.2.0.tgz", + "integrity": "sha512-H8CeLGDW4XyoRLXqJM0YNMMPwL5JIGnREgzBDaX6ks5tyMftFDCyIZ6uEtb+zdmEKEx49GI70LGf5Xhil7R2nw==", "requires": { "azure-storage": "2.10.3", "crypto-js": "^3.3.0",
update package-lock.json
update package-lock.json
a7e1071bd0bd475f3085897bc7cecfc703199ab3
--- __tests__/core/analyticsInitTest.ts @@ -5,6 +5,7 @@ import { onNetworkStateChanged, analyticsSagas, initAnalytics, + onClockStatusChange, } from '../../src/core/analyticsInit'; import { @@ -341,12 +342,30 @@ describe('onNetworkStateChanged', () => { }); }); +describe('onClockStatusChange', () => { + it('listens on clock status change', () => { + const iterator = onClockStatusChange(); + expect(iterator.next().value).toEqual( + select(ClockStatusSelectors.getIsClockedIn), + ); + expect(iterator.next(true).value).toEqual( + call(WmTelemetry.setUserProperties, { + clock_status: true, + }), + ); + }); +}); + describe('analyticsSagas', () => { it('sets up a watcher for sign in success', () => { const iterator = analyticsSagas(); expect(iterator.next().value).toEqual( all([ takeLatest(USER_CHANGED_ACTIONS, onUserChanged), + takeLatest( + ['global/CLOCK_CHECK_SUCCESS', 'global/CLOCK_CHECK_FAILURE'], + onClockStatusChange, + ), takeLatest( WMNetworkReducerTypes.NETWORK_STATE_CHANGED, onNetworkStateChanged, --- __tests__/navigation/AssociateHallwayNav/Tabs/HomeStackNavTest.tsx @@ -47,6 +47,7 @@ describe('InboxHeaderRight', () => { describe('HomeStackNav', () => { it('matches snapshot', () => { mockUseSelector.mockReturnValueOnce(true); // inbox header enabled + mockUseSelector.mockReturnValueOnce(true); // task badge const component = create(<HomeStackNav />); expect(component.toJSON()).toMatchSnapshot(); @@ -64,6 +65,7 @@ describe('HomeStackNav', () => { it('matches snapshot with inbox disabled', () => { mockUseSelector.mockReturnValueOnce(false); // inbox header enabled + mockUseSelector.mockReturnValueOnce(true); // task badge const component = create(<HomeStackNav />); expect(component.toJSON()).toMatchSnapshot(); }); --- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/HomeStackNavTest.tsx.snap @@ -70,7 +70,11 @@ exports[`HomeStackNav matches snapshot 1`] = ` </Navigator> `; -exports[`HomeStackNav matches snapshot 2`] = `<DrawerButton />`; +exports[`HomeStackNav matches snapshot 2`] = ` +<DrawerButton + refrigerationAlarm={false} +/> +`; exports[`HomeStackNav matches snapshot 3`] = ` <View --- android/app/src/main/assets/fonts/icomoon.ttf Binary files a/android/app/src/main/assets/fonts/icomoon.ttf and b/android/app/src/main/assets/fonts/icomoon.ttf differ --- ios/icomoon.ttf Binary files a/ios/icomoon.ttf and b/ios/icomoon.ttf differ --- package-lock.json @@ -4532,9 +4532,9 @@ } }, "@walmart/ui-components": { - "version": "1.3.0-beta.3", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-beta.3.tgz", - "integrity": "sha512-2GcJwFH7yUkDTcIPGhw89qeXXSnm7PfEWx6CIC0p+bU/woHcgholb5vUvmqd+Xl3yUVgtSt15tFo0+PoYOlTuQ==", + "version": "1.3.0-beta.5", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-beta.5.tgz", + "integrity": "sha512-kA6TH+g+BO5z0ti9vlAFwc8zHdlb3bs1dE1Fkjrd5yhiz0xyLKpN+ravjDuJtPV/2etjQqGJWL1Z/0p8wLYbNA==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -99,7 +99,7 @@ "@walmart/shelfavailability-mini-app": "0.6.8", "@walmart/taskit-mini-app": "0.0.77-rc.0", "@walmart/time-clock-mini-app": "0.4.24", - "@walmart/ui-components": "1.3.0-beta.3", + "@walmart/ui-components": "1.3.0-beta.5", "@walmart/welcomeme-mini-app": "0.30.4", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", --- src/core/analyticsInit.ts @@ -95,10 +95,23 @@ export function* onNetworkStateChanged({state}: AnyAction) { WmTelemetry.setCrashAttributes(attributes); } +export function* onClockStatusChange() { + const clockedStatus: string = yield select( + ClockStatusSelectors.getIsClockedIn, + ); + yield call(WmTelemetry.setUserProperties, { + clock_status: clockedStatus, + } as any); +} + export function* analyticsSagas() { yield all( createRestartableSagas([ takeLatest(USER_CHANGED_ACTIONS, onUserChanged), + takeLatest( + ['global/CLOCK_CHECK_SUCCESS', 'global/CLOCK_CHECK_FAILURE'], + onClockStatusChange, + ), takeLatest( WMNetworkReducerTypes.NETWORK_STATE_CHANGED, onNetworkStateChanged, --- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -21,6 +21,7 @@ import { } from '@walmart/time-clock-mini-app'; import {TorInboxNavPropsData} from '@walmart/time-clock-mini-app/dist/containers/TorInboxScreen/types'; import WmTelemetry from 'react-native-wm-telemetry'; +import {getTaskBadge} from '@walmart/taskit-mini-app'; import {NavigationTheme} from '../../../core/AllsparkTheme'; import {getInboxHeaderEnabled} from '../../../navConfig/NavConfigRedux'; @@ -69,7 +70,7 @@ export const InboxHeaderRight = () => { export const HomeStackNav = () => { const [t] = useTranslation(); const inboxHeaderEnabled = useSelector(getInboxHeaderEnabled); - + const {highPriorityCount} = useSelector(getTaskBadge); return ( <HomeStack.Navigator screenOptions={{headerMode: 'float', headerShown: true, header: Header}}> @@ -78,7 +79,9 @@ export const HomeStackNav = () => { component={HomeScreen} options={{ title: t('navigation.main'), - headerLeft: () => <DrawerButton />, + headerLeft: () => ( + <DrawerButton refrigerationAlarm={!!highPriorityCount} /> + ), headerRight: InboxHeaderRight, }} /> --- src/translations/en-US.ts @@ -49,7 +49,7 @@ export const enUS = { ManagerApprovals: 'Manager Approvals', itemInfo: 'Item information', loadingText: 'Loading menu options', - errorText: 'Failed to load menu options', + errorText: 'Menu failed to load', retryText: 'Retry', }, welcomeScreen: { --- src/translations/es-MX.ts @@ -50,7 +50,7 @@ export const esMX = { pinpoint: 'Pinpoint', ManagerApprovals: 'Aprobaciones del Gerente', loadingText: 'Loading menu options', - errorText: 'Failed to load menu options', + errorText: 'Menu failed to load', retryText: 'Retry', }, welcomeScreen: { --- src/types/ui-components.d.ts @@ -27,7 +27,6 @@ declare module '@walmart/ui-components' { indicatorContainerStyle?: any; }>; export const ConnectivityBanner: React.FC<{handleWifiSettings?: () => any}>; - export const FontIcon: React.FC<{size: number; name: string; color: string}>; } declare module '@walmart/ui-components/containers' {
added VQA fixes
added VQA fixes
217f6d3cad76201809e9b1f832e5da722b62feac
--- package-lock.json @@ -3504,9 +3504,9 @@ } }, "@walmart/settings-mini-app": { - "version": "1.3.4", - "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.3.4.tgz", - "integrity": "sha512-/iiKI+magHD6zvpnmmEXO3tWorKoDWCG+ftr5zQyxDcjJwXa1d3mcQXqyD+84hkq51N7tHiI9nAK/FZj6P89lA==" + "version": "1.3.5", + "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.3.5.tgz", + "integrity": "sha512-HqzsayD8WUTeiG7VTuHWPgSqKM/RxN90OYmLxBvtyMgGAeAYz8nKnsR5USnPHGb0L2wHUg/KwAhpqRLr0Y2s7w==" }, "@walmart/shelfavailability-mini-app": { "version": "0.3.64", --- package.json @@ -87,7 +87,7 @@ "@walmart/react-native-shared-navigation": "^0.4.0", "@walmart/redux-store": "^1.0.14", "@walmart/schedule-mini-app": "0.2.76", - "@walmart/settings-mini-app": "1.3.4", + "@walmart/settings-mini-app": "1.3.5", "@walmart/time-clock-mini-app": "0.3.10", "@walmart/ui-components": "1.1.51", "@walmart/welcomeme-mini-app": "0.26.2",
notifications copy change in settings app
notifications copy change in settings app
f7940461d0cbc038ee0c01829b506ed6b65d9524
--- __tests__/core/RootContainerTest.tsx @@ -7,6 +7,7 @@ import {initSumoListeners} from '../../src/sumo/SumoEvents'; import {StartupActionCreators} from '../../src/startup/StartupRedux'; import {initStartup, initCandidateSignout} from '../../src/startup'; import {initBiometrics} from '../../src/biometrics'; +import {initPermissions} from '../../src/permissions/PermissionsSaga'; import {initUpdateCheck} from '../../src/updates'; import {initAppState} from '../../src/appState'; import {initTermsOfUse} from '../../src/termsOfUse'; @@ -74,6 +75,10 @@ const mockCleanupBiometrics = jest.fn(); jest.mock('../../src/biometrics', () => ({ initBiometrics: jest.fn(() => mockCleanupBiometrics), })); +const mockCleanupPermissions = jest.fn(); +jest.mock('../../src/permissions/PermissionsSaga', () => ({ + initPermissions: jest.fn(() => mockCleanupPermissions), +})); const mockCleanupUpdate = jest.fn(); jest.mock('../../src/updates', () => ({ initUpdateCheck: jest.fn(() => mockCleanupUpdate), @@ -103,6 +108,7 @@ describe('RootContainer', () => { ); expect(initStartup).toHaveBeenCalled(); expect(initTermsOfUse).toHaveBeenCalled(); + expect(initPermissions).toHaveBeenCalled(); expect(initBiometrics).toHaveBeenCalled(); expect(initUpdateCheck).toHaveBeenCalled(); expect(initAppState).toHaveBeenCalled(); @@ -112,6 +118,7 @@ describe('RootContainer', () => { act(component.unmount); expect(mockCleanupStartup).toHaveBeenCalled(); expect(mockCleanupTermsOfUse).toHaveBeenCalled(); + expect(mockCleanupPermissions).toHaveBeenCalled(); expect(mockCleanupBiometrics).toHaveBeenCalled(); expect(mockCleanupUpdate).toHaveBeenCalled(); expect(mockCleanupAppState).toHaveBeenCalled(); --- __tests__/permissions/PermissionsSagaTest.ts @@ -1,13 +1,26 @@ import {Platform} from 'react-native'; -import {call, select, fork, take, cancel} from 'redux-saga/effects'; +import { + call, + select, + fork, + take, + cancel, + takeLatest, + put, +} from 'redux-saga/effects'; import {createMockTask} from '@redux-saga/testing-utils'; import {navigate} from '@walmart/react-native-shared-navigation'; -import {PermissionTypes} from '@walmart/core-services/Permissions'; +import { + PermissionActionCreators, + PermissionTypes, +} from '@walmart/core-services/Permissions'; import { permissionFlow, getPermissionsSet, handlePermissions, + permissionSagas, + onPermissionsSet, } from '../../src/permissions/PermissionsSaga'; import {resetTo} from '../../src/redux/SharedSagas'; import { @@ -122,4 +135,30 @@ describe('permissions sagas', () => { expect(iterator.next().done).toEqual(true); }); }); + + describe('onPermissionsSet', () => { + it('handles permissions set', () => { + const iterator = onPermissionsSet(); + expect(iterator.next().value).toEqual(call(getPermissionsSet)); + expect(iterator.next(true).value).toEqual( + put(PermissionActionCreators.permissionsComplete()), + ); + expect(iterator.next(false).done).toEqual(true); + }); + + it('handles permissions not set', () => { + const iterator = onPermissionsSet(); + expect(iterator.next().value).toEqual(call(getPermissionsSet)); + expect(iterator.next(false).done).toEqual(true); + }); + }); + + describe('permissionSagas', () => { + it('calls expected actions', () => { + const iterator = permissionSagas(); + expect(iterator.next().value).toEqual( + takeLatest(PermissionTypes.SET, onPermissionsSet), + ); + }); + }); }); --- src/core/RootContainer.tsx @@ -24,6 +24,7 @@ import {StartupActionCreators} from '../startup/StartupRedux'; import {initUpdateCheck} from '../updates'; import {UpdateVersionModal} from '../updates/UpdateVersionModal'; import {initBiometrics} from '../biometrics'; +import {initPermissions} from '../permissions/PermissionsSaga'; import {initAppState} from '../appState'; import {initCandidateSignout, initStartup} from '../startup'; import {initSumoListeners} from '../sumo/SumoEvents'; @@ -46,6 +47,7 @@ export const RootContainer = () => { const cleanupStartup = initStartup(); const cleanupTermsOfUse = initTermsOfUse(); + const cleanupPermissions = initPermissions(); const cleanupBiometrics = initBiometrics(); const cleanupUpdateCheck = initUpdateCheck(); const cleanupAppState = initAppState(); @@ -54,6 +56,7 @@ export const RootContainer = () => { return () => { cleanupStartup(); cleanupTermsOfUse(); + cleanupPermissions(); cleanupBiometrics(); cleanupUpdateCheck(); cleanupAppState(); --- src/permissions/PermissionsSaga.ts @@ -1,6 +1,18 @@ -import {call, select, take, cancel, fork} from 'redux-saga/effects'; +import {Task} from 'redux-saga'; +import { + call, + select, + take, + cancel, + fork, + takeLatest, + put, +} from 'redux-saga/effects'; import {navigate} from '@walmart/react-native-shared-navigation'; -import {PermissionTypes} from '@walmart/core-services/Permissions'; +import { + PermissionActionCreators, + PermissionTypes, +} from '@walmart/core-services/Permissions'; import {resetTo} from '../redux/SharedSagas'; import { PERMISSION_LOCATION_SCREEN, @@ -8,6 +20,8 @@ import { PERMISSION_WELCOME_SCREEN, } from './constants'; import {getLocationSet, getNotificationSet} from './selectors'; +import {createRestartableSaga} from '@walmart/core-services/Shared/Sagas'; +import {initSagas} from '../redux/utils'; export function* permissionFlow() { while (true) { @@ -31,12 +45,12 @@ export function* getPermissionsSet() { return locationSet && notificationsSet; } -export function* handlePermissions(): any { - const permissionsSet = yield call(getPermissionsSet); +export function* handlePermissions() { + const permissionsSet: boolean = yield call(getPermissionsSet); if (!permissionsSet) { yield call(resetTo, PERMISSION_WELCOME_SCREEN); - const flowTask = yield fork(permissionFlow); + const flowTask: Task = yield fork(permissionFlow); yield take(PermissionTypes.PERMISSIONS_COMPLETE); if (flowTask) { @@ -44,3 +58,21 @@ export function* handlePermissions(): any { } } } + +export function* onPermissionsSet() { + const permissionsSet: boolean = yield call(getPermissionsSet); + if (permissionsSet) { + yield put(PermissionActionCreators.permissionsComplete()); + } +} + +export function* permissionSagas() { + yield createRestartableSaga( + takeLatest(PermissionTypes.SET, onPermissionsSet), + ); +} + +export const initPermissions = initSagas.bind({ + slice: 'permissions', + sagas: permissionSagas, +});
add permissions saga to dispatch permissions complete
add permissions saga to dispatch permissions complete
da7147018f4531e2acdf8dbfcf15616e3d3a7761
--- package.json @@ -154,7 +154,7 @@ "@walmart/time-clock-mini-app": "3.19.2", "@walmart/time-clock-mini-app-next": "3.0.0", "@walmart/topstock-mini-app": "1.23.4", - "@walmart/translator-mini-app": "1.4.5", + "@walmart/translator-mini-app": "1.6.4", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.23.1#~/.yarn/patches/@walmart-ui-components-npm-1.23.1-247996ccb0.patch", "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "1.0.12", --- yarn.lock @@ -8840,7 +8840,7 @@ __metadata: "@walmart/time-clock-mini-app": "npm:3.19.2" "@walmart/time-clock-mini-app-next": "npm:3.0.0" "@walmart/topstock-mini-app": "npm:1.23.4" - "@walmart/translator-mini-app": "npm:1.4.5" + "@walmart/translator-mini-app": "npm:1.6.4" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.23.1#~/.yarn/patches/@walmart-ui-components-npm-1.23.1-247996ccb0.patch" "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:1.0.12" @@ -9817,9 +9817,9 @@ __metadata: languageName: node linkType: hard -"@walmart/translator-mini-app@npm:1.4.5": - version: 1.4.5 - resolution: "@walmart/translator-mini-app@npm:1.4.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftranslator-mini-app%2F-%2F%40walmart%2Ftranslator-mini-app-1.4.5.tgz" +"@walmart/translator-mini-app@npm:1.6.4": + version: 1.6.4 + resolution: "@walmart/translator-mini-app@npm:1.6.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftranslator-mini-app%2F-%2F%40walmart%2Ftranslator-mini-app-1.6.4.tgz" peerDependencies: "@react-native-async-storage/async-storage": ^2.0.0 "@react-native-clipboard/clipboard": ^1.14.2 @@ -9832,9 +9832,9 @@ __metadata: react-native-inappbrowser-reborn: ^3.7.0 react-native-render-html: ^6.1.1 react-native-svg: ">=14.0.0" - react-native-wm-voice-text: ^1.1.2 + react-native-wm-voice-text: ">=1.1.2" uuid: ">=3.0.0" - checksum: 10c0/0a65494c5c235f60073790ae4f6ce74b4f69ca0a5f6313f893df8dbe24899a18f5955a4623024d830a380e5edd3197aef94b9f3c9081901c6fc2bc0897bcb6c5 + checksum: 10c0/e0c357315176ba35275d936cf83e4a94a3a7b71e9e781215b2ebedc3ff8b1782004631f5af65eefc3d3b2c639e22ff57519de665c9de54c048e011294d389e43 languageName: node linkType: hard
feat(ui): ADEDS-18955 Adding Male/Female voice option for the text to speech feature (#4294)
feat(ui): ADEDS-18955 Adding Male/Female voice option for the text to speech feature (#4294) * feat: ADEDS-18955 Voice optionality and new language support * feat: ADEDS-18955 review fixes * fix: review updates * fix: configuring ccm --------- Co-authored-by: Sushrut Palatkar - s0p0fos <Sushrut.Palatkar@walmart.com> Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com>
1a3c82c9a35379876625eb7ae5b2522501de31b7
--- src/config/configurationManager.ts
feat(ui): update celebration widget
feat(ui): update celebration widget
a671b40a45079aa010c066aa2bd60177ed634a17
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.19.18](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.19.17...@walmart/allspark-foundation-hub@1.19.18) (2025-10-30) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.19.17](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.19.16...@walmart/allspark-foundation-hub@1.19.17) (2025-10-29) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.19.17", + "version": "1.19.18", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.8.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.8.0...@walmart/allspark-foundation@7.8.1) (2025-10-30) + +**Note:** Version bump only for package @walmart/allspark-foundation + # [7.8.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.7.1...@walmart/allspark-foundation@7.8.0) (2025-10-29) ### Features --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.8.0", + "version": "7.8.1", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/me-at-walmart-geolocation/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.3.17](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-geolocation@1.3.16...@walmart/me-at-walmart-geolocation@1.3.17) (2025-10-30) + +**Note:** Version bump only for package @walmart/me-at-walmart-geolocation + ## [1.3.16](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-geolocation@1.3.15...@walmart/me-at-walmart-geolocation@1.3.16) (2025-10-29) **Note:** Version bump only for package @walmart/me-at-walmart-geolocation --- packages/me-at-walmart-geolocation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-geolocation", - "version": "1.3.16", + "version": "1.3.17", "description": "Geofencing, location tracking and location services for me@ apps", "author": "m0n09mr <maksym.novakh@walmart.com>", "main": "./lib/cjs/index.js",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation@7.8.1 - @walmart/allspark-foundation-hub@1.19.18 - @walmart/me-at-walmart-geolocation@1.3.17
8b0f6c822a1093742ed9b180ac8aaac496e72491
--- package-lock.json @@ -9348,33 +9348,6 @@ "eslint": ">=3.14.1" } }, - "node_modules/@react-native-community/eslint-config/node_modules/eslint-plugin-jest": { - "version": "22.4.1", - "resolved": "https://npme.walmart.com/eslint-plugin-jest/-/eslint-plugin-jest-22.4.1.tgz", - "integrity": "sha512-gcLfn6P2PrFAVx3AobaOzlIEevpAEf9chTpFZz7bYfc7pz8XRv7vuKTIE4hxPKZSha6XWKKplDQ0x9Pq8xX2mg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "peerDependencies": { - "eslint": ">=5" - } - }, - "node_modules/@react-native-community/eslint-config/node_modules/eslint-plugin-react-native": { - "version": "3.11.0", - "resolved": "https://npme.walmart.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.11.0.tgz", - "integrity": "sha512-7F3OTwrtQPfPFd+VygqKA2VZ0f2fz0M4gJmry/TRE18JBb94/OtMxwbL7Oqwu7FGyrdeIOWnXQbBAveMcSTZIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/traverse": "^7.7.4", - "eslint-plugin-react-native-globals": "^0.1.1" - }, - "peerDependencies": { - "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7" - } - }, "node_modules/@react-native-community/eslint-config/node_modules/eslint-visitor-keys": { "version": "1.3.0", "resolved": "https://npme.walmart.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", --- package.json @@ -12,9 +12,9 @@ "description": "", "private": true, "scripts": { - "init": "npm i", + "init": "npm i --workspaces ", "test": "npm run test --workspaces --if-present", - "lint": "npm run lint --workspaces", + "lint": "npm run lint --workspaces --if-present", "clean": "npm run clean --workspaces", "commit": "commit", "build": "npm run build --workspaces", @@ -79,7 +79,10 @@ }, "react": "^18.2.0", "react-native": "~0.72.5", + "eslint": "8.19.0", + "eslint-plugin-jest": "27.6.0", "eslint-plugin-prettier": "5.1.3", + "eslint-plugin-react-native": "4.1.0", "@testing-library/react-hooks": "8.0.1", "@types/react": "^18.0.27", "react-test-renderer": "18.2.0",
fix: package update
fix: package update
05915436737022a828b175e45a4e0d887ad42ce5
--- src/navigation/AssociateHallwayNav/Banners.tsx @@ -9,7 +9,6 @@ import { } from '@walmart/ui-components'; import {UserSelectors} from '@walmart/redux-store'; import {useTranslation} from '@walmart/core-services/Translations'; -import {NetworkGlobalSelectors} from '@walmart/core-services/Network'; import {AllScreenBanner} from '@walmart/emergency-mini-app'; import { NavigationBannerRegistry, @@ -17,10 +16,7 @@ import { useNavigationBanners, } from '@walmart/core-widget-registry'; import {ChangeStoreBanner} from '../../changeStore/ChangeStoreBanner'; -import { - getShowConnectivityWarning, - getShowDataSaverWarning, -} from '../../settings'; +import {getShowConnectivityWarning} from '../../settings'; export const ImpersonationBanner = (props: NavigationBannerProps) => { const {route} = props;
fix: lint fix
fix: lint fix
3ac95937521db9da66ce4b7d65b7cac53ed8fbb1
--- __tests__/startup/StartupFlowTest.ts @@ -59,6 +59,10 @@ jest.mock('../../src/impersonation', () => ({ checkPreviousImpersonation: jest.fn(), })); +jest.mock('../../src/appReview/sagas', () => ({ + handleAppReviewPrompt: jest.fn(), +})); + describe('candidateStartupFlow', () => { it('calls expected sagas', () => { const iterator = candidateStartupFlow(); --- src/appReview/sagas.ts --- src/startup/StartupFlow.ts @@ -12,9 +12,9 @@ import {handlePermissions} from '../permissions/PermissionsSaga'; import {handlePinCode} from '../PinAccess/PinCodeSagas'; import {WhastNewActionCreators, WhatsNewTypes} from '../whatsNew/WhatsNewRedux'; import {checkAvailableSurveys} from '../survey/SurveySaga'; +import {handleAppReviewPrompt} from '../appReview/sagas'; import {handleSiteIdPrompt} from './UserFlow'; import {Auth} from '../core/Auth'; -import {handleAppReviewPrompt} from '../appReview'; export function* candidateStartupFlow() { // Terms of Use
update file name
update file name
7b942a64035779aab4d4798bf153c5af383f2778
--- packages/allspark-foundation-hub/__tests__/HubFeature/TeamOnboarding/TeamSelection.test.tsx @@ -14,7 +14,6 @@ jest.mock('react-redux', () => ({ })); jest.mock('@walmart/me-at-walmart-athena-queries'); -jest.mock('@walmart/allspark-foundation/Site'); //TODO: Add more tests for TeamSelectionList Component describe('TeamSelectionList Component Tests', () => {
feat(ui): update tests
feat(ui): update tests
f672a865d387bc807eb67aa4542b13cb501b2037
--- .looper.yml @@ -21,4 +21,4 @@ flows: - npm install - npm run lint - npm run build - - npm run coverage + # - npm run coverage --- jest.config.js @@ -17,10 +17,10 @@ module.exports = { ], coverageThreshold: { global: { - statements: 80, - branches: 70, - functions: 80, - lines: 80, + statements: 75, + branches: 50, + functions: 75, + lines: 70, }, }, transformIgnorePatterns: [
Update new fields for feature flag
Update new fields for feature flag
b71f2ec3b91d0ee18843e4b796c317c7ffe189a6
--- packages/allspark-foundation-hub/src/SupplyChain/Hooks/useSupplyChainShifts.tsx @@ -14,7 +14,7 @@ export type SupplyChainShifts = { export const useGetSupplyChainShifts = () => { const [error, setError] = useState<any>(undefined); - const [allShifts, setAllShifts] = useState<SupplyChainShifts[]>(); +const [allShifts, setAllShifts] = useState<SupplyChainShifts[]>([]); const logger = LoggerService.getContainerInstance(); const appVersion = useSelector(DeviceSelectors.getAppVersion); const countryCode: string | undefined = useSelector(
Update packages/allspark-foundation-hub/src/SupplyChain/Hooks/useSupplyChainShifts.tsx
Update packages/allspark-foundation-hub/src/SupplyChain/Hooks/useSupplyChainShifts.tsx Co-authored-by: AI Code Assistant <AI-Code-Assistant@email.wal-mart.com>
ceb6a926335f500670674be04d40fdd1f8d17c64
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 69 + versionCode 70 versionName "1.0.5" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>69</string> + <string>70</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>69</string> + <string>70</string> </dict> </plist>
Incrementing build number
Incrementing build number
31193bdae13b66d5f9e46df669051a9c15720ffd
--- package-lock.json @@ -5542,9 +5542,9 @@ "integrity": "sha512-0Aemva6snk2LgySyY2NRuF9xKBS7DpGs1oPcDlaOjeXU3NRL7+DzbhY2VZhRIYxQKLz/MOC6NF81SzdgxlVimg==" }, "@walmart/taskit-mini-app": { - "version": "0.34.1", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.34.1.tgz", - "integrity": "sha512-yqsY+ZKJP+6XYfsbZ27+lGBqCJOLgbgrnPBGo5QfxOU8kQUHJfGYGGVQp3LYD2QvMx1b9/PWazqZqloJLDIX7A==" + "version": "0.34.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.34.3.tgz", + "integrity": "sha512-nwQi/cpifbTblJCVPZKXbSbUxeeIPufqsyHMmcdBaXE6BNngn8lDVdH8U+924f6mjjNTEbLuFROiSSmJZAf2iQ==" }, "@walmart/time-clock-mini-app": { "version": "0.13.1", --- package.json @@ -116,7 +116,7 @@ "@walmart/schedule-mini-app": "0.24.0", "@walmart/settings-mini-app": "1.8.0", "@walmart/shelfavailability-mini-app": "1.2.3", - "@walmart/taskit-mini-app": "0.34.1", + "@walmart/taskit-mini-app": "0.34.3", "@walmart/time-clock-mini-app": "0.13.1", "@walmart/ui-components": "1.4.0", "@walmart/welcomeme-mini-app": "0.70.0",
taskit version update
taskit version update
821f32bd8b46109b8d3db984ce6fa8aa282ab857
--- packages/allspark-foundation-hub/__mocks__/@react-native/LogBox.js @@ -0,0 +1,3 @@ +module.exports = { + LogBox: jest.fn(), +}; --- packages/allspark-foundation-hub/__tests__/HubFeature/HubOnboardingImage.test.tsx @@ -1,6 +1,24 @@ import React from 'react'; import HubOnboardingImage from '../../src/HubFeature/BottomSheet/HubOnboardingImage/OnboardingImage'; import { render } from '../utils'; +import { LoggerService } from '@walmart/allspark-foundation/Logger'; +import TelemetryService from '@walmart/allspark-foundation/Telemetry'; + +jest.mock('@walmart/allspark-foundation/Logger', () => ({ + ...jest.requireActual('@walmart/allspark-foundation/Logger'), + LoggerService: { + getContainerInstance: jest.fn().mockImplementationOnce(() => ({ + error: jest.fn(), + })), + }, +})); + +jest.mock('@walmart/allspark-foundation/Telemetry', () => ({ + ...jest.requireActual('@walmart/allspark-foundation/Telemetry'), + useTelemetryService: jest.fn().mockImplementationOnce(() => ({ + logEvent: jest.fn(), + })), +})); describe('HubOnboardingImage', () => { it('renders HubOnboardingImage Component', () => { @@ -16,4 +34,33 @@ describe('HubOnboardingImage', () => { ); expect(toJSON()).toMatchSnapshot(); }); + + it('logs telemetry on Error', () => { + (LoggerService.getContainerInstance as jest.Mock).mockImplementationOnce( + () => ({ + error: jest.fn, + }) + ); + (TelemetryService.useTelemetryService as jest.Mock).mockImplementationOnce( + () => ({ + logEvent: jest.fn, + }) + ); + + const { getByTestId } = render( + <HubOnboardingImage + description='test description' + source={{ + uri: '', + placeholder: 'test placeholder', + }} + title='Test title' + /> + ); + const container = getByTestId('HubOnboardingImage.Container'); + container.props.onError(); + + expect(LoggerService.getContainerInstance).toHaveBeenCalled(); + expect(TelemetryService.useTelemetryService).toHaveBeenCalled(); + }); }); --- packages/allspark-foundation-hub/__tests__/HubFeature/HubWidget.test.tsx @@ -4,6 +4,24 @@ import { render, fireEvent } from '@testing-library/react-native'; import { HubWidget } from '../../src/HubFeature/Hub/HubWidget/index'; import { Icons } from '@walmart/gtp-shared-components'; import { HubWidgetTypes } from '../../src/HubFeature/Hub/HubWidget/types'; +import { LoggerService } from '@walmart/allspark-foundation/Logger'; +import TelemetryService from '@walmart/allspark-foundation/Telemetry'; + +jest.mock('@walmart/allspark-foundation/Logger', () => ({ + ...jest.requireActual('@walmart/allspark-foundation/Logger'), + LoggerService: { + getContainerInstance: jest.fn().mockImplementationOnce(() => ({ + info: jest.fn(), + })), + }, +})); + +jest.mock('@walmart/allspark-foundation/Telemetry', () => ({ + ...jest.requireActual('@walmart/allspark-foundation/Telemetry'), + useTelemetryService: jest.fn().mockImplementationOnce(() => ({ + logEvent: jest.fn(), + })), +})); const defaultProps: HubWidgetTypes = { iconName: 'ArticleIcon' as keyof typeof Icons, @@ -96,4 +114,34 @@ describe('HubWidget', () => { expect(queryByTestId('actionTxt')).toBeNull(); expect(queryByTestId('action-btn')).toBeNull(); }); + + test('Test 8: renders hubSkeleton when refresh in progress', () => { + const { getByTestId } = renderComponent({ + refresh: true, + }); + const skeleton = getByTestId('LoadingSkeleton.Container'); + expect(skeleton.props.children).toBeDefined(); + }); + + test('Test 9: renders hubWidget and handle onPress events', () => { + (LoggerService.getContainerInstance as jest.Mock).mockImplementationOnce( + () => ({ + info: jest.fn, + }) + ); + (TelemetryService.useTelemetryService as jest.Mock).mockImplementationOnce( + () => ({ + logEvent: jest.fn, + }) + ); + + const { getByTestId } = renderComponent({ + refresh: false, + }); + const container = getByTestId('HubWidget.Container'); + container.props.onClick(); + expect(container.props.children).toBeDefined(); + expect(LoggerService.getContainerInstance).toHaveBeenCalled(); + expect(TelemetryService.useTelemetryService).toHaveBeenCalled(); + }); }); --- packages/allspark-foundation-hub/__tests__/HubFeature/__snapshots__/HubOnboardingImage.test.tsx.snap @@ -19,6 +19,7 @@ exports[`HubOnboardingImage renders HubOnboardingImage Component 1`] = ` "width": 300, } } + testID="HubOnboardingImage.Container" />, <View style={ --- packages/allspark-foundation-hub/__tests__/src/Core/index.test.ts @@ -0,0 +1,13 @@ +import { render } from '../../utils'; +import * as index from '../../../src/Core/index'; + +describe('index.ts', () => { + it('initialized logbox', () => { + const rn = require('react-native').LogBox; + const mockLogbox = jest.fn(); + jest.spyOn(rn, 'ignoreLogs').mockImplementationOnce(() => mockLogbox()); + render(index); + mockLogbox(); + expect(mockLogbox).toBeCalled(); + }); +}); --- packages/allspark-foundation-hub/src/HubFeature/BottomSheet/HubOnboardingImage/OnboardingImage.tsx @@ -18,6 +18,7 @@ const HubOnboardingImage = ({ return ( <> <TeamImage + testID='HubOnboardingImage.Container' source={{ uri: source.uri, }} --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/index.tsx @@ -43,7 +43,7 @@ export const HubWidget = ({ const renderHubWidgetSkeleton = useCallback( () => ( - <View style={styles.skeletonContainer}> + <View testID='LoadingSkeleton.Container' style={styles.skeletonContainer}> <Skeleton variant='rectangle' height={scale(20)} width={scale(300)} /> <Skeleton variant='rectangle' @@ -77,6 +77,7 @@ export const HubWidget = ({ <View style={[hubWidgetStyle, styles.container]}> {/* HEADER */} <TouchableOpacity + testID='HubWidget.Container' onPress={() => { logger.info('Widget navigation', { message: `Navigated to ${routeName}`,
feat(ui): added more unit tests
feat(ui): added more unit tests
c815170c076677cb15cdcc4e3f80d113638a532b
--- __tests__/screens/MessagesScreen/OneToOneChatTest.tsx @@ -121,7 +121,7 @@ describe('1-1 chat', () => { /** * Test steps to send image message: * 1. Click Button - * 2.sen Select Image (Mock the launchImageLibrary response for this test) + * 2. Select Image (Mock the launchImageLibrary response for this test) * 3. Expect image landed in the chat input field * 4. Click Send button * 5. Expect image message landed in firestore --- bck.json --- __tests__/screens/MessagesScreen/OneToOneChatTest.tsx @@ -121,7 +121,7 @@ describe('1-1 chat', () => { /** * Test steps to send image message: * 1. Click Button - * 2.sen Select Image (Mock the launchImageLibrary response for this test) + * 2. Select Image (Mock the launchImageLibrary response for this test) * 3. Expect image landed in the chat input field * 4. Click Send button * 5. Expect image message landed in firestore --- bck.json
cleaning unused file
cleaning unused file
281a227f47bea020c593271741d5c069c063caa3
--- lerna.json @@ -14,7 +14,7 @@ "allowBranch": [ "main", "develop", - "feature/*" + "drop/*" ], "conventionalCommits": true, "conventionalPrerelease": false
fix: enable lerna publish from drop branch pattern
fix: enable lerna publish from drop branch pattern
0a64dc46ec1d59eb06bb9d220825c8f81bb0c5d1
--- targets/US/package.json @@ -87,8 +87,8 @@ "@walmart/ask-sam-mini-app": "patch:@walmart/ask-sam-mini-app@npm%3A1.23.5#~/.yarn/patches/@walmart-ask-sam-mini-app-npm-1.23.5-99c0a3589b.patch", "@walmart/associate-listening-mini-app": "1.2.7", "@walmart/attendance-mini-app": "3.44.0", - "@walmart/avp-feature-app": "0.7.2", - "@walmart/avp-shared-library": "0.7.3", + "@walmart/avp-feature-app": "0.8.7", + "@walmart/avp-shared-library": "0.8.9", "@walmart/backroom-mini-app": "1.2.6", "@walmart/calling-mini-app": "0.3.5", "@walmart/checkout-mini-app": "3.22.0", @@ -104,7 +104,7 @@ "@walmart/exception-mini-app": "1.8.4", "@walmart/facilities-management-miniapp": "0.11.15", "@walmart/feedback-all-spark-miniapp": "0.9.66", - "@walmart/financial-wellbeing-feature-app": "1.23.4", + "@walmart/financial-wellbeing-feature-app": "1.26.0", "@walmart/functional-components": "~6.3.20", "@walmart/gta-react-native-calendars": "0.7.0", "@walmart/gtp-shared-components": "2.2.4", --- yarn.lock @@ -6086,9 +6086,9 @@ __metadata: languageName: node linkType: hard -"@walmart/avp-feature-app@npm:0.7.2": - version: 0.7.2 - resolution: "@walmart/avp-feature-app@npm:0.7.2" +"@walmart/avp-feature-app@npm:0.8.7": + version: 0.8.7 + resolution: "@walmart/avp-feature-app@npm:0.8.7" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6097,13 +6097,13 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/a4c2e578d9225d9f0d0c57d47b82f7ee5821dbd0a9cbd1e273488d029f29d865b7accaceaf71a64f923e03edf6df28749cc893ba21964dc461a45cd3a36c46d5 + checksum: 10c0/22d635118c7dd18fb389369915748472b632109e3f731e90608da2ef10a71a319edb9c09ad036c57f44c51ecf346676b3d40a3e8a52828d4a072309283248e6b languageName: node linkType: hard -"@walmart/avp-shared-library@npm:0.7.3": - version: 0.7.3 - resolution: "@walmart/avp-shared-library@npm:0.7.3" +"@walmart/avp-shared-library@npm:0.8.9": + version: 0.8.9 + resolution: "@walmart/avp-shared-library@npm:0.8.9" peerDependencies: axios: ^1.3.4 immer: ^9.0.16 @@ -6113,7 +6113,7 @@ __metadata: redux-saga: ^1.1.3 reduxsauce: ^1.2.0 reselect: ^4.1.7 - checksum: 10c0/0ea6aa1ccc36e803747c2f79779b6009f1e1a597bb27daa7e3bf9ba677ec3b0e87a327153045848a569cf3564686fee51a7fe64bff7a1d1e53e20f15bd53fa77 + checksum: 10c0/05ee80e162f585b0427ccf37be01edd6bafa12d4481a33438b2e8389760334809f80e529b2ed6b5356da237f6de4f9e41cbb7d91f14a57a179c0bd4aca3a7c66 languageName: node linkType: hard @@ -6464,9 +6464,9 @@ __metadata: languageName: node linkType: hard -"@walmart/financial-wellbeing-feature-app@npm:1.23.4": - version: 1.23.4 - resolution: "@walmart/financial-wellbeing-feature-app@npm:1.23.4" +"@walmart/financial-wellbeing-feature-app@npm:1.26.0": + version: 1.26.0 + resolution: "@walmart/financial-wellbeing-feature-app@npm:1.26.0" peerDependencies: "@react-navigation/native": ">=6.0.8" "@react-navigation/stack": ">=6.1.1" @@ -6475,7 +6475,7 @@ __metadata: react-native: ">=0.72.10" react-redux: ">=8.0.4" redux: ">=4.2.1" - checksum: 10c0/a4d6a05d81804b939166df95d03496437c5e3ac843868730f92fd03a084fa9a2cd2650b0061ef354dc1b7201530fd55aa7e42c7a02af59bba4c4dd69520a507c + checksum: 10c0/b5ac04f8ef991554aff5e83b766dd551a137cb1c8b541d21226cf4deee86ced74f7f8848f39c785245fef8505ea1a736cf25276710a1f389aeed2f0fc628b09e languageName: node linkType: hard @@ -7065,8 +7065,8 @@ __metadata: "@walmart/ask-sam-mini-app": "patch:@walmart/ask-sam-mini-app@npm%3A1.23.5#~/.yarn/patches/@walmart-ask-sam-mini-app-npm-1.23.5-99c0a3589b.patch" "@walmart/associate-listening-mini-app": "npm:1.2.7" "@walmart/attendance-mini-app": "npm:3.44.0" - "@walmart/avp-feature-app": "npm:0.7.2" - "@walmart/avp-shared-library": "npm:0.7.3" + "@walmart/avp-feature-app": "npm:0.8.7" + "@walmart/avp-shared-library": "npm:0.8.9" "@walmart/backroom-mini-app": "npm:1.2.6" "@walmart/calling-mini-app": "npm:0.3.5" "@walmart/checkout-mini-app": "npm:3.22.0" @@ -7082,7 +7082,7 @@ __metadata: "@walmart/exception-mini-app": "npm:1.8.4" "@walmart/facilities-management-miniapp": "npm:0.11.15" "@walmart/feedback-all-spark-miniapp": "npm:0.9.66" - "@walmart/financial-wellbeing-feature-app": "npm:1.23.4" + "@walmart/financial-wellbeing-feature-app": "npm:1.26.0" "@walmart/functional-components": "npm:~6.3.20" "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.4"
bumped tpb fwb
bumped tpb fwb
2f33d68d0dee2f9864b58fe70e7673d65bab4dd4
--- packages/allspark-foundation-hub/src/SupplyChain/Modals/UpdateTeamsModal/UpdateTeamsModal.tsx @@ -111,12 +111,12 @@ export const UpdateTeamsModal = ({ (searchInput: string) => { if (searchInput.length > 2) { const searchApplied = filterTeamsBySearchInput( - allSiteTeamsSections, + sectionListData, searchInput ); setSearchedSections(searchApplied); } else { - setSearchedSections(allSiteTeamsSections); + setSearchedSections(sectionListData); } }, [allSiteTeamsSections]
feat(ui): update on search
feat(ui): update on search
13a063c9332ad23af9401f7f50192d0c7f4bb50e
--- targets/US/src/navigation/AssociateHallwayNav/Tabs/index.tsx @@ -12,7 +12,6 @@ import CopilotMiniApp, {useWorkBadgeCount} from '@walmart/copilot-mini-app'; import InboxMiniApp, { getIsAnyUnreadMessageInInbox, } from '@walmart/inbox-mini-app'; -import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; import {MainStackScreenProps, MainTabsMap} from '../types'; import {HomeStackNav} from './HomeStackNav';
chore: double import fix
chore: double import fix
6678f41461e707d9233cb8258bdee655a9d735f7
--- .looper.multibranch.yml @@ -4,7 +4,7 @@ inherit: "job:///metropolis/metroloop/metroloop-parent" ## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES ## -node: stable_osx&&!!dualcore +node: ((osx||stable_osx)&&!!dualcore) tools: android: @@ -47,7 +47,7 @@ envs: global: variables: CI: true - LOOPER_NODES: "stable_osx&&!!dualcore" + LOOPER_NODES: "((osx||stable_osx)&&!!dualcore)" GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}" TMPDIR: /tmp
Looper fix
Looper fix
4107088525f264931c2de5fce7dce9f54ef23518
--- packages/allspark-graphql-client/codegen/generate.js @@ -57,7 +57,7 @@ const codegenConfig = { overwrite: true, schema: config.schema || [ { - 'https://athena-gateway.dev.us.walmart.net/graphql': { + 'https://athena-gateway.sdev.us.walmart.net/graphql': { headers: { 'WM_CONSUMER.ID': 'fa576333-db22-47c4-afe1-6d7ec0f69c39', 'WM_SVC.NAME': 'ATHENA-GATEWAY', @@ -66,7 +66,7 @@ const codegenConfig = { }, }, ], - documents: `${queryPath}/*.graphql`, + documents: `${queryPath}/!(schema).graphql`, }; cli
fix: update athena codegen url and query path glob
fix: update athena codegen url and query path glob
d988433a0ba5d33e94458b1feb17d5ba5a885cb7
--- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx @@ -677,6 +677,9 @@ export class AllsparkFeatureModule< this._disconnectRedux(); } } + + // Run onDisconnect event for this feature + this._events.runEvent('onDisconnect', capability); }; // --- Feature Enable / Disable --- // --- packages/allspark-foundation/src/Feature/types.ts @@ -236,9 +236,9 @@ export type FeatureEventTypeMap = { */ onConnect: ConnectCapabilities | undefined; /** - * @deprecated Features are no longer disconnected + * description Called when the feature capability is disconnected */ - onDisconnect: undefined; + onDisconnect: DisconnectCapabilities | undefined; /** * @description Called when the feature capability is disconnected */ @@ -247,8 +247,6 @@ export type FeatureEventTypeMap = { export const FEATURE_EVENTS_TYPES = [ 'onConnect', - // TODO - remove once EventManager can handled undefined events. Removing breaks feature event - // manager if mini apps define onDisconnect listener. 'onDisconnect', 'onEnableChange', ] as const;
fix: feature disconnect listener handling was partially removed but needed for new use cases
fix: feature disconnect listener handling was partially removed but needed for new use cases
718001f65bc218ca589af79cb2daac6f3fc6facc
--- ios/Podfile.lock @@ -538,7 +538,7 @@ PODS: - RCTTypeSafety - React - ReactCommon/turbomodule/core - - react-native-scanner-3.0 (0.2.1): + - react-native-scanner-3.0 (0.1.32): - Firebase/Analytics - React - ScanditBarcodeCapture (= 6.14.0) @@ -1225,7 +1225,7 @@ SPEC CHECKSUMS: react-native-ptt-module: 47e1b73551afa3830155cc92f4809d06c38e5eca react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de - react-native-scanner-3.0: 357a5d88bc757579087ef0d2ce2001b17b6e323b + react-native-scanner-3.0: a0549e6f451262c91e545d3b69a6b9d8cf2ac1eb react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 792829857bbb23a9c8acdad9a640554bdee397a3 --- package-lock.json @@ -42,7 +42,7 @@ "@walmart/core-services-allspark": "~2.10.8", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.2", - "@walmart/counts-component-miniapp": "0.1.4", + "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.23.2", "@walmart/exception-mini-app": "1.2.4", "@walmart/facilities-management-miniapp": "0.6.7", @@ -69,7 +69,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.2.1", + "@walmart/react-native-scanner-3.0": "0.1.32", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", @@ -5012,16 +5012,18 @@ } }, "node_modules/@walmart/counts-component-miniapp": { - "version": "0.1.4", - "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.4.tgz", - "integrity": "sha512-1lN+t45r6BIdJTQgBmIWDGcUN+N/hKQM22YHiGmRzOxX9MPd58zZ0n42QehBFxyE5TQVpPR3NsVWAaYCO17Mvg==", + "version": "0.1.2", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.2.tgz", + "integrity": "sha512-/MvR5ACBMHVTgVtBgQ8lYQAQc1dMgfvNQ2n4XdgbXSyi9PLVNJjr89WTh1h9YBJxtihmwMMhx66cP3TVqZal6A==", "hasInstallScript": true, "peerDependencies": { + "@react-native-community/async-storage": "^1.12.1", + "@react-native-community/netinfo": "9.3.6", "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", "@walmart/core-services-allspark": "~1.10.11", "@walmart/core-utils": "~1.3.0", - "@walmart/gtp-shared-components": "2.0.2", + "@walmart/gtp-shared-components": "^2.0.0", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/redux-store": "^3.1.3", "i18next": "^22.0.1", @@ -5766,9 +5768,9 @@ } }, "node_modules/@walmart/react-native-scanner-3.0": { - "version": "0.2.1", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz", - "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg==", + "version": "0.1.32", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", + "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==", "license": "ISC", "peerDependencies": { "react-native": ">=0.47.1" @@ -25146,9 +25148,9 @@ } }, "@walmart/counts-component-miniapp": { - "version": "0.1.4", - "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.4.tgz", - "integrity": "sha512-1lN+t45r6BIdJTQgBmIWDGcUN+N/hKQM22YHiGmRzOxX9MPd58zZ0n42QehBFxyE5TQVpPR3NsVWAaYCO17Mvg==" + "version": "0.1.2", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.2.tgz", + "integrity": "sha512-/MvR5ACBMHVTgVtBgQ8lYQAQc1dMgfvNQ2n4XdgbXSyi9PLVNJjr89WTh1h9YBJxtihmwMMhx66cP3TVqZal6A==" }, "@walmart/emergency-mini-app": { "version": "1.23.2", @@ -25305,9 +25307,9 @@ "version": "1.33.0" }, "@walmart/react-native-scanner-3.0": { - "version": "0.2.1", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz", - "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg==" + "version": "0.1.32", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", + "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==" }, "@walmart/react-native-shared-navigation": { "version": "1.0.2", --- package.json @@ -84,7 +84,7 @@ "@walmart/core-services-allspark": "~2.10.8", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.2", - "@walmart/counts-component-miniapp": "0.1.4", + "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.23.2", "@walmart/exception-mini-app": "1.2.4", "@walmart/facilities-management-miniapp": "0.6.7", @@ -111,7 +111,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.2.1", + "@walmart/react-native-scanner-3.0": "0.1.32", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1",
build(version): removed the updated scanner & count widget version
build(version): removed the updated scanner & count widget version
a063fae533f4badc8402fcb786943d0d924d0d9b
--- Gemfile.lock @@ -5,34 +5,34 @@ GEM base64 nkf rexml - activesupport (6.1.7.7) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.919.0) - aws-sdk-core (3.192.1) + aws-partitions (1.1000.0) + aws-sdk-core (3.211.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.79.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.147.0) - aws-sdk-core (~> 3, >= 3.192.0) + aws-sdk-kms (1.95.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.169.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sigv4 (1.8.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -78,7 +78,7 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) declarative (0.0.20) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) @@ -90,7 +90,7 @@ GEM ethon (0.16.0) ffi (>= 1.15.0) excon (0.109.0) - faraday (1.10.3) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -111,15 +111,15 @@ GEM faraday-httpclient (1.0.1) faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.3.1) - fastlane (2.220.0) + fastlane (2.225.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -135,6 +135,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -161,10 +162,13 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-appcenter (2.1.2) - fastlane-plugin-json (1.1.0) + fastlane-plugin-json (1.1.7) fastlane-plugin-versioning_android (0.1.1) fastlane-plugin-versioning_ios (0.1.0) - ffi (1.16.3) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -205,22 +209,22 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.4) + i18n (1.14.6) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.2) - jwt (2.8.1) + json (2.7.5) + jwt (2.9.3) base64 - mini_magick (4.12.0) + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.25.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + nanaimo (0.4.0) nap (1.1.0) naturally (2.2.1) netrc (0.11.0) @@ -235,7 +239,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) + rexml (3.3.9) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -249,6 +253,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -262,23 +267,21 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) - unicode-display_width (2.5.0) + unf (0.2.0) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.24.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) - zeitwerk (2.6.13) + zeitwerk (2.6.18) PLATFORMS universal-darwin-20 @@ -292,6 +295,7 @@ DEPENDENCIES fastlane-plugin-json fastlane-plugin-versioning_android fastlane-plugin-versioning_ios + xcodeproj (= 1.27.0) BUNDLED WITH 2.2.11
update Gemfile.lock
update Gemfile.lock
b9e267e5567a578613022d19a04b40fa7fafacdb
--- __tests__/rbacConfig/RbacSagasTest.tsx @@ -1,5 +1,6 @@ import {takeLatest, select, put, all} from 'redux-saga/effects'; import {rbacDataSelector} from '../../src/rbacConfig/DataSelector'; +import {getRbacEnabledApps} from '../../src/redux'; import {MeganavSelector} from '../../src/rbacConfig/DataSelector'; import {NavConfigActionCreators} from '../../src/navConfig/NavConfigRedux'; import { @@ -72,6 +73,7 @@ describe('onRbacRequest', () => { it('success case', () => { const iterator = onRbacRequest(); + expect(iterator.next().value).toEqual(select(getRbacEnabledApps)); expect(iterator.next().value).toEqual(select(rbacDataSelector)); expect(iterator.next(rbacData).value).toEqual(select(MeganavSelector)); meganavData.data.data[1].navs[0].enabled = false; @@ -83,6 +85,7 @@ describe('onRbacRequest', () => { it('failure case', () => { const iterator = onRbacRequest(); + expect(iterator.next().value).toEqual(select(getRbacEnabledApps)); expect(iterator.next().value).toEqual(select(rbacDataSelector)); expect(iterator.next().value).toEqual(select(MeganavSelector)); expect(iterator.next().value).toBe(undefined); --- __tests__/rbacConfig/utility/updateMeganavDataTest.tsx @@ -199,11 +199,46 @@ const rbacData = { policyExpired: false, }; +const rbacDataError = { + data: {}, + loaded: true, + error: true, + fetchingPolicy: false, + policyExpired: false, +}; + +const rbacDataNoPolicy = { + data: {}, + loaded: true, + error: false, + fetchingPolicy: false, + policyExpired: false, +}; +const rbacEnabledApps = ['sidenav/refrigerationAlarm', 'sidenav/me']; + describe('updateMeganavData', () => { it('testing updateMeganavData function for all cases', () => { - const result = updateMeganavData(rbacData, meganavData); + const result = updateMeganavData(rbacData, meganavData, rbacEnabledApps); expect(result.data.data[1].navs[0].enabled).toEqual(false); expect(result.data.data[2].navs[0].enabled).toEqual(false); }); + + it('testing when rbacData is not there', () => { + const result = updateMeganavData( + rbacDataError, + meganavData, + rbacEnabledApps, + ); + expect(result.data.data[1].navs[0].enabled).toEqual(true); + }); + + it('testing when no data is there', () => { + const result = updateMeganavData( + rbacDataNoPolicy, + meganavData, + rbacEnabledApps, + ); + expect(result.data.data[1].navs[0].enabled).toEqual(true); + }); }); --- src/core/RootContainer.tsx @@ -38,6 +38,7 @@ import {initCellularDataSaverSaga} from './dataSaverInit'; import {initRbac} from '../rbacConfig/RbacSagas'; export const onImport = async () => { + initRbac(); addSSOListeners(); initEnv(); initDeviceInfo(); @@ -61,7 +62,6 @@ export const onImport = async () => { initCellularDataSaverSaga(); initKgraphApi(); initTranslations(); - initRbac(); }; onImport(); --- src/rbacConfig/RbacSagas.tsx @@ -4,10 +4,12 @@ import {rbacDataSelector} from './DataSelector'; import {MeganavSelector} from './DataSelector'; import {NavConfigActionCreators} from '../navConfig/NavConfigRedux'; import updateMeganavData from './utility/updateMeganavData'; -import {createRestartableSagas} from '../redux'; +import {createRestartableSagas, getRbacEnabledApps} from '../redux'; export function* onRbacRequest(): any { try { + const rbacEnabledApps = yield select(getRbacEnabledApps); + //rbac data from rma const rbacData = yield select(rbacDataSelector); @@ -15,7 +17,11 @@ export function* onRbacRequest(): any { const meganavData = yield select(MeganavSelector); //Calling updateMeganavData for the updated data - const updatedMeganavData = updateMeganavData(rbacData, meganavData); + const updatedMeganavData = updateMeganavData( + rbacData, + meganavData, + rbacEnabledApps, + ); //updating the meganav data yield put(NavConfigActionCreators.fetchSuccess(updatedMeganavData.data)); --- src/rbacConfig/utility/updateMeganavData.tsx @@ -13,6 +13,14 @@ const RbacPolicyLength: any = { SIDENAV: 3, //Ex: if splitRbacPolicy is : | Sidenav| Availability| ManagerApproval| }; +export const checkRbacEnabledApps = (app: any, rbacPermissions: any) => { + return rbacPermissions.some( + (policy: string) => + // @ts-ignore + policy?.rn?.toUpperCase() === app.toUpperCase(), + ); +}; + export const sanitize = (value: string) => { return value?.replace(/[-_' ']/g, '')?.toUpperCase(); }; @@ -77,18 +85,25 @@ export const compareData = ( ------------------------------------------------------------------------------ enabled flag(from ccm) | action flag(from rma) | final result/Visibility -------------------------------------------------------------------------------- - true ALLOW true - true DENY false - false ALLOW false - false DENY false + false * DON'T SHOW + TRUE ALLOW SHOW + TRUE DENY DON'T SHOW + TRUE NO POLICY FOUND DON'T SHOW + TRUE RBAC API ERROR SHOW BY DEFAULT -----------------------------------------------------------------------------------*/ -const updateMeganavData = (rbacData: RbacConfigState, meganavData: any) => { +const updateMeganavData = ( + rbacData: RbacConfigState, + meganavData: any, + rbacEnabledApps: string[], +) => { + if (rbacData.error || !rbacData) { + return meganavData; + } /* For deep cloning of object Lodash cloneDeep is used -------------------------------------------------------------------*/ const rbacClonedData = _.cloneDeep(rbacData); let meganavClonedData = _.cloneDeep(meganavData); - /* rbacPermissions here describes the set of policies along with the actions which we get from RMA via BFF ,ex:[ { @@ -100,6 +115,20 @@ const updateMeganavData = (rbacData: RbacConfigState, meganavData: any) => { const rbacPermissions = rbacClonedData?.data[Config.RMA_MEGA_NAV_ID]?.permissions || []; + /* we will check if policy exists for rbacEnabledApps or not, if not then we are + going to add them in our policies with Deny action + -----------------------------------------------------------------------------------*/ + if (rbacEnabledApps) { + rbacEnabledApps.forEach((app) => { + if (checkRbacEnabledApps(app, rbacPermissions) === false) { + const rbacEnabledAppPolicy: any = {}; + rbacEnabledAppPolicy.a = 'DENY'; + rbacEnabledAppPolicy.rn = app; + rbacPermissions.push(rbacEnabledAppPolicy); + } + }); + } + rbacPermissions.forEach((policy) => { const action = policy.a; const RbacPolicy = policy.rn; --- src/redux/SharedSelectors.ts @@ -14,6 +14,8 @@ export const getCoreAppConfig = createSelector( export const getCoreAppConfigValue = (key: string, defaultValue?: any) => createSelector([getCoreAppConfig], (config) => config?.[key] || defaultValue); +export const getRbacEnabledApps = getCoreAppConfigValue('rbacEnabledApps'); + export const getChangeStoreBannerEnabled = getCoreAppConfigValue( 'changeStoreBannerEnabled', );
Case when ccm is false and no policy is there is handeled
Case when ccm is false and no policy is there is handeled
88aee19f298f4b4ff69930fc5e9e88ba30a0cffb
--- ios/Podfile.lock @@ -1169,9 +1169,9 @@ SPEC CHECKSUMS: libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - Permission-Camera: 4c0b610b46391c85d2d50f1446d98b4103b14b5a - Permission-LocationWhenInUse: 667dfff996a63375d7f2ba3522ae841aa1f7aaf3 - Permission-Notifications: 49cae9775ac1e37c0e6cc28adca1d703527f1875 + Permission-Camera: bf6791b17c7f614b6826019fcfdcc286d3a107f6 + Permission-LocationWhenInUse: 3ba99e45c852763f730eabecec2870c2382b7bd4 + Permission-Notifications: 150484ae586eb9be4e32217582a78350a9bb31c3 PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb PTT: ea5f9187d0be3094633434cbed7e227f50a7a061 RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda @@ -1189,33 +1189,33 @@ SPEC CHECKSUMS: React-jsiexecutor: 31564fa6912459921568e8b0e49024285a4d584b React-jsinspector: badd81696361249893a80477983e697aab3c1a34 React-logger: fdda34dd285bdb0232e059b19d9606fa0ec3bb9c - react-native-app-auth: bd3be305a5cbac5baa8574253480d90b5c5522e7 - react-native-background-timer: 117fffdc9b0d6f144444bb49029f94275a45fdb5 + react-native-app-auth: fd1eaa667c0bc014199456d14a6440cb74de814e + react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc react-native-blob-util: 4ec16cc21bfc8de8f0ddfd2c81ada00f8c34b646 - react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060 - react-native-encrypted-storage: e907c76d2b9f0a30edd989d92f1bb8a9198fdb82 + react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866 + react-native-encrypted-storage: 632e8eac25dff0b6cac14e6e0c76498c4a39e24e react-native-flipper: 43ecd19174184c24aba5e1ef75ae13106af871e3 react-native-geolocation-service: 608e1da71a1ac31b4de64d9ef2815f697978c55b react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a - react-native-image-picker: 35834940bc572ba914707c39b60e043a06f88178 - react-native-image-resizer: 506412a2bdd70dde64a61e13505ce10f61a04369 + react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8 + react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f react-native-logger: 23f2b2ed3622b45613a887bf3bdeaa7e5dec4976 - react-native-loudness: fe12785700887bcfdb07abcf455c5df40e89183b - react-native-maps: ed6470f754c140c75aabff757e154cf52a1636a8 - react-native-netinfo: 51b6a79a6f1729d853aa0bd5085e441f7ef32aa1 - react-native-pager-view: f7238ec88a1e808f4ba09447d46e9bc8aef32aa4 + react-native-loudness: 38527e7e42c3be3e4ea3d8aace2621a8eb9cafda + react-native-maps: 085f614cf14d3637b2048bb9752da5b1c27c2886 + react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461 + react-native-pager-view: 592421df0259bf7a7a4fe85b74c24f3f39905605 react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa react-native-ptt-module: 7cfc1a324de0fec9d48a43abfc8970550116f188 - react-native-render-html: 5af9f6852f5e0cf9b74127537da3370984da51ee - react-native-safe-area-context: d768fdafd416b4c0bdc7bef4240c9ee53909baf3 - react-native-scanner-3.0: 0d35c6ca8f7f530cc892e068270221a457f19165 + react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe + react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de + react-native-scanner-3.0: a2229bd1d328860358cb69d581c12f57f47db0c9 react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 - react-native-video: 79a186e378d327b6c08bc3982c17ef455c6bd75c - react-native-view-shot: ef3ebacaacaefffcfd953d04b4304962fbe1fae2 - react-native-webview: a192040320142d8f10d652a745c46e4f43e37f8c - react-native-wm-app-review: f3539e622411158d5f25926bcb505cfad87ea7a8 - react-native-wm-voice-text: d8a943f8881568e5a66e03091c8cd571576fa110 + react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 + react-native-view-shot: 792829857bbb23a9c8acdad9a640554bdee397a3 + react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581 + react-native-wm-app-review: 57721f27f0321514250f4a604fe8f2d960a0bbb0 + react-native-wm-voice-text: ff635684cb0aa6845784a24bcfb1564fefebc037 React-perflogger: e68d3795cf5d247a0379735cbac7309adf2fb931 React-RCTActionSheet: 05452c3b281edb27850253db13ecd4c5a65bc247 React-RCTAnimation: 578eebac706428e68466118e84aeacf3a282b4da @@ -1228,15 +1228,15 @@ SPEC CHECKSUMS: React-RCTVibration: 8e5c8c5d17af641f306d7380d8d0fe9b3c142c48 React-runtimeexecutor: 7401c4a40f8728fd89df4a56104541b760876117 ReactCommon: c9246996e73bf75a2c6c3ff15f1e16707cdc2da9 - ReactNativeART: f003b07dfa7098aa419ed95b69560923440b1eee + ReactNativeART: 78edc68dd4a1e675338cd0cd113319cf3a65f2ab Realm: fdf6732924dc5e69e30e0db2c11e869f92b53f3d RealmJS: d0e94d35363a3a9ebd27981d9ac0aa4b63f66c85 RealmSwift: 7c181da8fa1c2fe613656a77c198d6a3dc3879a1 - RNCAsyncStorage: cb9a623793918c6699586281f0b51cbc38f046f9 - RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3 + RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398 + RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495 RNCPicker: 0bf8ef8f7800524f32d2bb2a8bcadd53eda0ecd1 - RNDateTimePicker: cad741dac386f8178bf76e86f0a3c4b22173e0e4 - RNDeviceInfo: e5dbe9fc01590f4bc5b9dda77e39ff6a39859224 + RNDateTimePicker: 1dd15d7ed1ab7d999056bc77879a42920d139c12 + RNDeviceInfo: 4701f0bf2a06b34654745053db0ce4cb0c53ada7 RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8 RNFBAnalytics: 1aff53fe7ebd26405ac5e4c99011ccd0a473bf77 RNFBApp: e3e4af6906a891d46af60340b4313b63eb082de9 @@ -1246,12 +1246,12 @@ SPEC CHECKSUMS: RNFBRemoteConfig: 0e5306c3cc8a6d59d1544d5691ea31ab69d14603 RNFS: 4ac0f0ea233904cb798630b3c077808c06931688 RNGestureHandler: 62232ba8f562f7dea5ba1b3383494eb5bf97a4d3 - RNPermissions: 79d0c889562fd792329821bea3155fe6eb54d359 + RNPermissions: dcdb7b99796bbeda6975a6e79ad519c41b251b1c RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c RNReanimated: 2a91e85fcd343f8af3c58d3425b99fdd285590a5 RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 - RNSha256: 03d70c81d84084560180c1858dbf2c980a01c1b1 - RNSketchCanvas: ee9e3d4bd7dbe46d309827bf2252817a0345ea1d + RNSha256: 80bea5b2e7005f813f6438cb41e573b3d531146c + RNSketchCanvas: 124a2a11b9bce418ef6e34262fc163d00b5f714b RNSoundPlayer: 369105c565b8fe6ea0a43fc882dc81eba444e842 RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17 RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8 @@ -1266,9 +1266,9 @@ SPEC CHECKSUMS: SumoSDK: 0151813702cc25cf3fd6fca7b03d4b46f1e014ac SwiftProtobuf: b02b5075dcf60c9f5f403000b3b0c202a11b6ae1 TextServiceProto: 8af27cc52ab3421f79c94e7c7fdcd6f3579b5fdc - VisionCamera: 8ad07dd68a6fb006be185e79ef82402064ec13ec - walmart-react-native-sumo-sdk: 7167433bfcb8c836ca273adbf47ad2cbe41de27d - wifi-store-locator: f74b112c804b9a2c6e856d2f49a91923d953af1d + VisionCamera: 4cfd685b1e671fea4aa0400905ab397f0e972210 + walmart-react-native-sumo-sdk: feaec91b81f185addbfacc80a21815ace682f8f1 + wifi-store-locator: ec624772f74b5b568dff3d63c10ba88a217c6495 Yoga: eca980a5771bf114c41a754098cd85e6e0d90ed7 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
chore: update podfile lock
chore: update podfile lock
2468a61436162e7b7f41b81f10e69776dc7a3a5e
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/Screens/HubDashboard.tsx @@ -187,10 +187,16 @@ export const HubDashboard = ({ /** Bottom sheet update */ const navigation = useNavigation(); - const resetTo = (screen: string) => { - navigation.reset({ - index: 0, - routes: [{ name: screen }], + const resetNavigation = () => { + hideOnboardingBottomSheet(); + hideTeamUpdatedBottomSheet(); + hideErrorBottomSheet(); + hideOnboardingFlow(); + navigation.setParams({ + teamSelectionComplete: false, + teamOnboardingComplete: false, + teamSelectionError: false, + teamOnboardingError: false, }); }; @@ -226,11 +232,7 @@ export const HubDashboard = ({ } return () => { - hideOnboardingBottomSheet(); - hideTeamUpdatedBottomSheet(); - hideErrorBottomSheet(); - hideOnboardingFlow(); - resetTo(hubScreeName); + resetNavigation(); }; // eslint-disable-next-line react-hooks/exhaustive-deps }, [
update the navigation for onboarding
update the navigation for onboarding
c9f46401f1f31bb4d245e10a66812b8e6e723e78
--- ios/Podfile.lock @@ -538,7 +538,7 @@ PODS: - RCTTypeSafety - React - ReactCommon/turbomodule/core - - react-native-scanner-3.0 (0.1.29): + - react-native-scanner-3.0 (0.1.30-rc.2): - Firebase/Analytics - React - ScanditBarcodeCapture (= 6.14.0) @@ -1220,7 +1220,7 @@ SPEC CHECKSUMS: react-native-ptt-module: 47e1b73551afa3830155cc92f4809d06c38e5eca react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de - react-native-scanner-3.0: ffac5712e0199936171392acbd2dfaf4f33ed890 + react-native-scanner-3.0: cd15ba9cec1949bc84b8eee9790b565c3760202a react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 792829857bbb23a9c8acdad9a640554bdee397a3
Update scanner in ios pod
Update scanner in ios pod
83e323948b38e9f538bff6bbc4712fe43dfaf3f1
--- package.json @@ -104,7 +104,7 @@ "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "6.1.4", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.12.2", + "@walmart/wmconnect-mini-app": "2.12.3", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- yarn.lock @@ -6579,7 +6579,7 @@ __metadata: "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:6.1.4" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.12.2" + "@walmart/wmconnect-mini-app": "npm:2.12.3" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6712,9 +6712,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.12.2": - version: 2.12.2 - resolution: "@walmart/wmconnect-mini-app@npm:2.12.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.12.2.tgz" +"@walmart/wmconnect-mini-app@npm:2.12.3": + version: 2.12.3 + resolution: "@walmart/wmconnect-mini-app@npm:2.12.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.12.3.tgz" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6754,7 +6754,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/35f5a714736049c888f57375e4f8af2dc58867a685936f89e6b5d35f8778cb5aa695f9c29ed8ddbf6f84f57c315e4869684612ca8dec8714837fa66868240974 + checksum: 10c0/1b502d03c3a694c92ccd3ad94d5ab60cab0186cf862b0dfbe9bcf7a38d99e7b03e0505c828571490dbd966cbbd02f7bf955d73a651359f0cc842984ae2e86f0e languageName: node linkType: hard
fix(ui): update roster version smdv-9999
fix(ui): update roster version smdv-9999
df170f1a28579135643b24b3adcf006e24894016
--- __tests__/auth/__snapshots__/AuthenticatorViewTest.tsx.snap @@ -160,7 +160,7 @@ exports[`AuthenticatorView renders error 1`] = ` } > App Version - 0.0.1 + 0.0.2 </Text> </View> `; @@ -317,7 +317,7 @@ exports[`AuthenticatorView renders error 2`] = ` } > App Version - 0.0.1 + 0.0.2 </Text> </View> `; --- android/app/build.gradle @@ -134,8 +134,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "0.0.1" + versionCode 2 + versionName "0.0.2" } splits { abi { --- ios/AllSpark/Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.0.1</string> + <string>0.0.2</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1</string> + <string>2</string> <key>LSApplicationQueriesSchemes</key> <array> <string>invmgmt</string> @@ -42,28 +42,28 @@ <string>awbs</string> </array> <key>LSRequiresIPhoneOS</key> - <true/> + <true /> <key>NSAppTransportSecurity</key> <dict> <key>NSAllowsArbitraryLoads</key> - <true/> + <true /> <key>NSExceptionDomains</key> <dict> <key>NSExceptionRequiresForwardSecrecy</key> - <false/> + <false /> <key>localhost</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true/> + <true /> </dict> <key>mobileservices.wal-mart.com</key> - <dict/> + <dict /> </dict> </dict> <key>NSCameraUsageDescription</key> <string>We use your camera for scanning images of barcodes</string> <key>NSLocationWhenInUseUsageDescription</key> - <string></string> + <string /> <key>NSMicrophoneUsageDescription</key> <string>We record your voice when you want to do a voice search</string> <key>NSSpeechRecognitionUsageDescription</key> @@ -107,6 +107,6 @@ <key>UIUserInterfaceStyle</key> <string>Light</string> <key>UIViewControllerBasedStatusBarAppearance</key> - <false/> + <false /> </dict> </plist> --- ios/AllSparkTests/Info.plist @@ -15,10 +15,10 @@ <key>CFBundlePackageType</key> <string>BNDL</string> <key>CFBundleShortVersionString</key> - <string>0.0.1</string> + <string>0.0.2</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1</string> + <string>2</string> </dict> </plist> --- package-lock.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "0.0.1", + "version": "0.0.2", "private": true, "scripts": { "firebase:dev": "cp ./ios/GoogleService-Info-Dev.plist ./ios/GoogleService-Info.plist && cp ./android/app/google-services-dev.json ./android/app/google-services.json",
updating version to 0.0.2 (#200)
updating version to 0.0.2 (#200) * updating version to 0.0.2 * updating snapshots Co-authored-by: Hitesh Arora <>
3c1c19bec276a390993fafa3c22fdfdb1fe146fa
--- 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": "1.3.3", + "@walmart/ax-components": "@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 @@ -139,7 +139,7 @@ export default function TabsNavigation() { } }} options={{ - tabBarIcon: (props) => <Icon {...props} name='teams' size='medium' accessible={false} />, + tabBarIcon: (props) => <Icon {...props} name='your-team' size='medium' accessible={false} />, tabBarAccessibilityLabel: translate('yourTeam.tabAccessibilityLabel'), title: translate('yourTeam.tabTitle') }}
fix(ui): tabbar icon update
fix(ui): tabbar icon update
117a5d156d1951dee2e2253c85900beb2fc87fe4
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.30.0", + "version": "2.31.0", "main": "dist/index.js", "files": [ "dist" --- src/components/AssociateList/AssociateListItem.tsx @@ -24,13 +24,13 @@ import { useRbacConfigWithJobCode, useUserIsInRoster, useIsImpersonatedOnDev, + useSalariedOrTeamLeadOrHomeOffice, } from '../../hooks'; import {translationClient, WFMSchedule} from '../../common'; import {AssociateAvatar} from './AssociateAvatar'; import {AllsparkSharedComponents} from '@walmart/allspark-foundation/Components'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import {SiteSelectors} from '@walmart/allspark-foundation/Site'; -import {UserDomain} from '@walmart/me-at-walmart-common'; export const AssociateListItem = ({ associate, @@ -65,14 +65,7 @@ export const AssociateListItem = ({ const userIsImpersonatedOnDev = useIsImpersonatedOnDev(); const currentUserAssociateId = useSelector(UserSelectors.getWin); const siteIsDC = useSelector(SiteSelectors.getWorkingSiteIsDC); - const isPeopleLead: boolean = useSelector(UserSelectors.getIsUserPeopleLead); - const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead); - const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried); - const userDomain: string | undefined = useSelector(UserSelectors.getDomain); - const isHomeOffice: boolean = - userDomain?.toLowerCase() === UserDomain.homeoffice; - const isSalariedOrLead = - isTeamLead || isSalaried || isPeopleLead || isHomeOffice; + const isSalariedOrLead = useSalariedOrTeamLeadOrHomeOffice(); const shouldShowMessageButton = associate?.associateId !== currentUserAssociateId?.toString(); const isWfmScheduleValid = --- src/components/RosterFiltersAndInfo/RosterFiltersAndInfo.tsx @@ -4,7 +4,10 @@ import {RosterFiltersHeader} from '../RosterFiltersHeader'; import {FilterChipGroup} from '../FilterChipGroup'; import {Link} from '@walmart/gtp-shared-components'; import {RosterFiltersAndInfoStyles as styles} from './style'; -import {useRbacConfigWithJobCode} from '../../hooks'; +import { + useRbacConfigWithJobCode, + useSalariedOrTeamLeadOrHomeOffice, +} from '../../hooks'; import {goToWeeklySchedule} from '../../navigation/utils'; import {translationClient} from '../../common/translation'; import {RosterFiltersAndInfoProps} from './types'; @@ -12,8 +15,6 @@ import {RosterFiltersAndInfoLoading} from './RosterFiltersAndInfoLoading'; import {displayFilterChips} from '../../redux/selectors'; import {useSelector} from 'react-redux'; import {SiteSelectors} from '@walmart/allspark-foundation/Site'; -import {UserSelectors} from '@walmart/allspark-foundation/User'; -import {UserDomain} from '@walmart/me-at-walmart-common'; export const RosterFiltersAndInfo = ({ totalScheduleCount, @@ -30,14 +31,7 @@ export const RosterFiltersAndInfo = ({ const isWeeklyScheduleVisible: boolean | undefined = useRbacConfigWithJobCode(); const siteIsDC = useSelector(SiteSelectors.getWorkingSiteIsDC); - const isPeopleLead: boolean = useSelector(UserSelectors.getIsUserPeopleLead); - const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead); - const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried); - const userDomain: string | undefined = useSelector(UserSelectors.getDomain); - const isHomeOffice: boolean = - userDomain?.toLowerCase() === UserDomain.homeoffice; - const isSalariedOrLead = - isTeamLead || isSalaried || isPeopleLead || isHomeOffice; + const isSalariedOrLead = useSalariedOrTeamLeadOrHomeOffice(); const isScheduleVisible = siteIsDC ? isSalariedOrLead --- src/hooks/roster.ts @@ -15,6 +15,7 @@ import {useEnvironment} from '@walmart/allspark-foundation/Environment'; import {getGraphQLConfig} from '../services/config'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import {useGetSupplyChainShiftsQuery} from '../queries/getSupplyChainShifts'; +import {UserDomain} from '@walmart/me-at-walmart-common'; export const useSupplyChainShifts = () => { const [error, setError] = useState<any>(undefined); @@ -137,3 +138,14 @@ export const useRbacConfigWithJobCode = (): boolean | undefined => { }); } }; + +export const useSalariedOrTeamLeadOrHomeOffice = () => { + const isPeopleLead: boolean = useSelector(UserSelectors.getIsUserPeopleLead); + const isTeamLead: boolean = useSelector(UserSelectors.getIsUserTeamLead); + const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried); + const userDomain: string | undefined = useSelector(UserSelectors.getDomain); + const isHomeOffice: boolean = + userDomain?.toLowerCase() === UserDomain.homeoffice; + + return isTeamLead || isSalaried || isPeopleLead || isHomeOffice; +};
Update the query to include the query params
Update the query to include the query params
ee0015e4aa85c1d9d498388aaa787de8db5b6be2
--- src/presence/components/PresenceIndicator.tsx @@ -56,7 +56,7 @@ export const PresenceIndicator = ({ )} {showText && ( <Body UNSAFE_style={textStyle}> - {isClockedIn ? t('userHeader.clockedIn') : ''} + {isClockedIn ? t('userHeader.clockedIn') : t('userHeader.clockedOut')} </Body> )} </View> --- src/translations/en-US.ts @@ -7,6 +7,7 @@ export const enUS = { offlinePresence: 'Offline', clockedIn: 'Clocked in', dndPresence: 'Do not disturb', + clockedOut: 'Clocked out', }, tabsScreen: { rosterTab: 'Roster', --- src/translations/es-MX.ts @@ -7,6 +7,7 @@ export const esMX = { offlinePresence: 'Desconectado', clockedIn: 'Dentro de horario', dndPresence: 'No molestar', + clockedOut: 'Fuera de turno', }, tabsScreen: { rosterTab: 'Lista', --- src/presence/components/PresenceIndicator.tsx @@ -56,7 +56,7 @@ export const PresenceIndicator = ({ )} {showText && ( <Body UNSAFE_style={textStyle}> - {isClockedIn ? t('userHeader.clockedIn') : ''} + {isClockedIn ? t('userHeader.clockedIn') : t('userHeader.clockedOut')} </Body> )} </View> --- src/translations/en-US.ts @@ -7,6 +7,7 @@ export const enUS = { offlinePresence: 'Offline', clockedIn: 'Clocked in', dndPresence: 'Do not disturb', + clockedOut: 'Clocked out', }, tabsScreen: { rosterTab: 'Roster', --- src/translations/es-MX.ts @@ -7,6 +7,7 @@ export const esMX = { offlinePresence: 'Desconectado', clockedIn: 'Dentro de horario', dndPresence: 'No molestar', + clockedOut: 'Fuera de turno', }, tabsScreen: { rosterTab: 'Lista',
add clocked out status
add clocked out status
397ad7d7551fc1dd12526e3cddc3d081957d1b49
--- core/src/navigation/index.tsx @@ -1,6 +1,6 @@ import React, {ComponentType, useEffect} from 'react'; import {useSelector} from 'react-redux'; -import {TransitionPresets} from '@react-navigation/stack'; +import {TransitionPresets, createStackNavigator} from '@react-navigation/stack'; import {AuthService} from '@walmart/allspark-foundation/Auth'; import {ActiveAllsparkContainer} from '@walmart/allspark-foundation/Container/ActiveContainerManager'; @@ -8,14 +8,12 @@ import { RootComponentContainer, ScreenTags, } from '@walmart/me-at-walmart-common'; -import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; import {getIsAppAccessible} from '../appBlock/redux'; import {RootStackMap} from './types'; -const RootStack = - AllsparkNavigationClient.createAllsparkStackNavigator<RootStackMap>(); +const RootStack = createStackNavigator<RootStackMap>(); export const RootStackNavigation = (props: { UserRootScreen: ComponentType<any>; --- targets/US/src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -1,15 +1,12 @@ import React, {useEffect} from 'react'; import {useDispatch} from 'react-redux'; -import {TransitionPresets} from '@react-navigation/stack'; +import {TransitionPresets, createStackNavigator} from '@react-navigation/stack'; import { ActiveAllsparkContainer, ContainerActionCreators, } from '@walmart/allspark-foundation/Container'; -import { - AllsparkNavigationClient, - ModalTransitionOptions, -} from '@walmart/allspark-foundation/Navigation'; +import {ModalTransitionOptions} from '@walmart/allspark-foundation/Navigation'; import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; import {ScreenTags} from '@walmart/me-at-walmart-common'; import {CreateGuardedScreens} from '@walmart/me-at-walmart-core'; @@ -75,8 +72,7 @@ import {MyTeamStackNav} from './Tabs/MyTeamStackNav'; //--- Main Stack --- // -const MainStack = - AllsparkNavigationClient.createAllsparkStackNavigator<MainStackMap>(); +const MainStack = createStackNavigator<MainStackMap>(); const WorkAppModals = CreateGuardedScreens(MainStack, [ { --- targets/US/src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -1,9 +1,9 @@ import React from 'react'; import {useSelector} from 'react-redux'; import {View} from 'react-native'; +import {createStackNavigator} from '@react-navigation/stack'; import {ActiveAllsparkContainer} from '@walmart/allspark-foundation/Container'; -import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; import {UserSelectors} from '@walmart/allspark-foundation/User'; import {ScreenTags} from '@walmart/me-at-walmart-common'; @@ -18,8 +18,7 @@ import {getInboxHeaderEnabled} from '../../../features/associate/inbox'; import {HomeStackMap, MainStackMap, MainTabsScreenProps} from '../types'; import {styles} from './config'; -const HomeStack = - AllsparkNavigationClient.createAllsparkStackNavigator<HomeStackMap>(); +const HomeStack = createStackNavigator<HomeStackMap>(); const exportedScreensFromMetrics = metricsNavigationScreens.map( ({component, name, options = {}}) => ({ --- targets/US/src/navigation/AssociateHallwayNav/Tabs/MeStackNav.tsx @@ -1,10 +1,8 @@ import React from 'react'; +import {createStackNavigator} from '@react-navigation/stack'; import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; -import { - AllsparkNavigationClient, - renderDrawerButton, -} from '@walmart/allspark-foundation/Navigation'; +import {renderDrawerButton} from '@walmart/allspark-foundation/Navigation'; import {Header} from '@walmart/ui-components'; import {MeMiniApp} from '@walmart/profile-feature-app'; @@ -16,8 +14,7 @@ const ProtectedMeMiniApp = withSensitiveView(MeMiniApp); // --- Me Stack Navigator --- // // TODO: Determine why this stack is needed? Can we just use the MeMiniApp directly in the tab navigator? -const MeStack = - AllsparkNavigationClient.createAllsparkStackNavigator<MeStackMap>(); +const MeStack = createStackNavigator<MeStackMap>(); export const MeStackNav = () => { const [t] = useAllsparkTranslation(); --- targets/US/src/navigation/AssociateHallwayNav/Tabs/MyTeamStackNav.tsx @@ -1,10 +1,8 @@ import React, {useEffect} from 'react'; +import {createStackNavigator} from '@react-navigation/stack'; import {useAllsparkTranslation} from '@walmart/allspark-foundation/Translation'; -import { - AllsparkNavigationClient, - renderDrawerButton, -} from '@walmart/allspark-foundation/Navigation'; +import {renderDrawerButton} from '@walmart/allspark-foundation/Navigation'; import {Header} from '@walmart/ui-components'; import {TextingMiniApp} from '@walmart/myteam-mini-app'; @@ -12,8 +10,7 @@ import {MyTeamHooks} from '@walmart/wmconnect-mini-app'; import {MainTabsScreenProps, MyTeamStackMap} from '../types'; -const MyTeamStack = - AllsparkNavigationClient.createAllsparkStackNavigator<MyTeamStackMap>(); +const MyTeamStack = createStackNavigator<MyTeamStackMap>(); export const MyTeamStackNav = (props: MainTabsScreenProps<'myTeam'>) => { const {navigation} = props;
fix: remove allspark navigator until further tested
fix: remove allspark navigator until further tested
f07bded1791087cb1049722d1d3ed7ec645f683a
--- .looper-pr.yml @@ -16,4 +16,3 @@ envs: MONO_REPO_BASE_BRANCH: develop AUTHOR: temp SLACK_CHANNEL: "smdv-miniapp" -
chore(ui): looper test SMDV-5648
chore(ui): looper test SMDV-5648
8079b5346cdeb63e45290d1c410fac77d43ae9cc
--- package.json @@ -135,7 +135,7 @@ "@walmart/me-at-walmart-container": "workspace:^", "@walmart/me-at-walmart-location": "^1.2.20", "@walmart/metrics-mini-app": "1.34.9", - "@walmart/mod-flex-mini-app": "1.31.5", + "@walmart/mod-flex-mini-app": "1.31.6", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "2.4.3", "@walmart/my-walmart-hub": "1.8.0", --- yarn.lock @@ -8520,7 +8520,7 @@ __metadata: "@walmart/me-at-walmart-container": "workspace:^" "@walmart/me-at-walmart-location": "npm:^1.2.20" "@walmart/metrics-mini-app": "npm:1.34.9" - "@walmart/mod-flex-mini-app": "npm:1.31.5" + "@walmart/mod-flex-mini-app": "npm:1.31.6" "@walmart/moment-walmart": "npm:1.0.4" "@walmart/money-auth-shared-components": "npm:2.4.3" "@walmart/my-walmart-hub": "npm:1.8.0" @@ -8801,9 +8801,9 @@ __metadata: languageName: node linkType: hard -"@walmart/mod-flex-mini-app@npm:1.31.5": - version: 1.31.5 - resolution: "@walmart/mod-flex-mini-app@npm:1.31.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmod-flex-mini-app%2F-%2F%40walmart%2Fmod-flex-mini-app-1.31.5.tgz" +"@walmart/mod-flex-mini-app@npm:1.31.6": + version: 1.31.6 + resolution: "@walmart/mod-flex-mini-app@npm:1.31.6::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmod-flex-mini-app%2F-%2F%40walmart%2Fmod-flex-mini-app-1.31.6.tgz" peerDependencies: "@react-native-segmented-control/segmented-control": ^2.5.7 "@react-navigation/drawer": ">=7" @@ -8836,7 +8836,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 uuid: ^3.3.2 - checksum: 10c0/36a57092a74b8cf4a309e3732b47ee5807fa7adc044d804f99ad6ca4caa86a03ccb4a46dd6e7f3260089070e15e5d53d1083e849a1bd1a4ba083848fde26c480 + checksum: 10c0/bbd743491ecd1087124ae1f74b3bd9a5e3df592926a914327f4c0251df9e59fa581c8a09658f38c2d2a5a644170f2e55099f78467a27b21329fb940c9aca58f4 languageName: node linkType: hard
feat(mod-flex-mini-app): ModFlex drop 35 version bump
feat(mod-flex-mini-app): ModFlex drop 35 version bump
d93e04dd68f17d9652b05b378fabc4fffd0164c7
--- packages/me-at-walmart-container/src/features/biometrics/index.ts @@ -16,7 +16,6 @@ export default new AllsparkFeature<MeAtWalmartFeatureConfig>(FEATURE_ID, { name: 'Core.BiometricModal', getComponent: () => require('./containers/BiometricPrompt').BiometricPrompt, - // locations: ['STACK.ROOT'], options: { presentation: 'transparentModal', ...ModalTransitionOptions, --- packages/me-at-walmart-container/src/navigation/UserRootNav.tsx @@ -7,33 +7,28 @@ import { import { ErrorLogBoundary } from './components/ErrorLogBoundary'; import { FallbackScreen } from './components/FallbackScreen'; -const LazyAssociateHallway = lazy(() => import('./AssociateHallway')); +const AssociateHallway = lazy(() => import('./AssociateHallway')); -export const AssociateHallway = () => ( - <ErrorLogBoundary> - <Suspense fallback={FallbackScreen}> - <LazyAssociateHallway /> - </Suspense> - </ErrorLogBoundary> -); - -const LazyCandidateStack = lazy(() => import('./CandidateHallway')); - -export const CandidateHallway = () => ( - <ErrorLogBoundary> - <Suspense fallback={FallbackScreen}> - <LazyCandidateStack /> - </Suspense> - </ErrorLogBoundary> -); +const CandidateHallway = lazy(() => import('./CandidateHallway')); export const UserRootNav = () => { const userType = useSelector(UserSelectors.getUserType); - switch (userType) { - case UserEmployeeType.prehire: - return <CandidateHallway />; - default: - return <AssociateHallway />; - } + const Hallway = React.useMemo( + () => () => + userType === UserEmployeeType.prehire ? ( + <CandidateHallway /> + ) : ( + <AssociateHallway /> + ), + [userType] + ); + + return ( + <ErrorLogBoundary> + <Suspense fallback={FallbackScreen}> + <Hallway /> + </Suspense> + </ErrorLogBoundary> + ); };
fix: user root refactor
fix: user root refactor
7935078f36d444d6a00cebcd7a776f6444433127
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/TeamShiftSwitcher/TeamShiftSwitcher.tsx @@ -61,7 +61,8 @@ export const TeamShiftSwitcher = ({ const savedTeamsText = allSavedTeams && showSubtext ? allSavedTeams.join(', ') : ''; const shiftText = - generateShiftText(selectedShifts, numTotalShifts, t) ?? 'Total Site'; + generateShiftText(selectedShifts, numTotalShifts, t) ?? + t('teamShiftSwitcher.defaultTeam'); const accessibilityLabel = `${t( 'teamShiftSwitcher.viewingDataFor' )} ${teamName}${
feat(ui): add label to translation
feat(ui): add label to translation
ac32ee03f7f41fa703708bf12afbc51ad77bd558
--- targets/US/ios/Podfile.lock @@ -2139,9 +2139,9 @@ PODS: - React-perflogger (= 0.73.7) - ReactNativeART (1.2.0): - React - - Realm (20.0.0): - - Realm/Headers (= 20.0.0) - - Realm/Headers (20.0.0) + - Realm (10.51.0): + - Realm/Headers (= 10.51.0) + - Realm/Headers (10.51.0) - RealmJS (12.8.1): - React - RNCallKeep (4.3.13): @@ -2910,7 +2910,7 @@ SPEC CHECKSUMS: React-utils: ef6ed9a5748c207f067ebc9929327d0f3937f671 ReactCommon: a55ba7975ea32f1a5f808f3e2782e674c439cbf0 ReactNativeART: b0ebceda8689ce026fff56b2f820664029480a4e - Realm: a799b5f9145623fb0bfe149fe81422863631dd0f + Realm: 7e75a684c16aca7c6a5db9c70caebf37f07dcee5 RealmJS: caff99dc8e863a8a993ee85ca15061561442c4e8 RNCallKeep: 31a5c11e1f42d47df598fd9f292788f662aea9d7 RNCAsyncStorage: b6410dead2732b5c72a7fdb1ecb5651bbcf4674b
reverting relm version update
reverting relm version update
ddbd137edd06a0114b19cba5cc5945c5e7d0ea87
--- scripts/teamsFailureTemplate.json --- scripts/teamsSuccessTemplate.json --- targets/US/scripts/sendToTeams.js @@ -1,72 +0,0 @@ -process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; -const yargs = require('yargs/yargs'); -const {hideBin} = require('yargs/helpers'); -const ACData = require('adaptivecards-templating'); -const axios = require('axios'); - -const args = yargs(hideBin(process.argv)) - .option('file') - .option('webhookUrl') - .option('success') - .option('title') - .option('failureMessage') - .option('ver') - .option('buildNumber') - .option('os') - .option('osIcon') - .option('buildType') - .option('env') - .option('envIcon') - .option('releaseType') - .option('releaseTypeDesc') - .option('releaseTypeIcon') - .option('commitMessage') - .option('commitAuthor') - .option('commitDate') - .option('commitUrl') - .option('jobBranch') - .option('jobNbr') - .option('jobUrl') - .option('downloadUrl') - .option('downloadPassword') - .help().argv; - -console.log('args are', args); - -const {file, success} = args; - -const templateFile = - success === 'true' - ? './teamsSuccessTemplate.json' - : './teamsFailureTemplate.json'; - -const templatePayload = require(templateFile); - -const template = new ACData.Template(templatePayload); - -const cardData = file ? require(file) : args; -const webhookUrl = file ? cardData.webhookUrl : args.webhookUrl; - -const card = template.expand({$root: cardData}); - -const postPayload = { - type: 'message', - attachments: [ - { - contentType: 'application/vnd.microsoft.card.adaptive', - contentUrl: null, - content: card, - }, - ], -}; - -console.log('post payload', JSON.stringify(postPayload)); - -axios.default - .post(webhookUrl, postPayload) - .then((resp) => { - console.log('response data', resp.data); - }) - .catch((err) => { - console.log('error occcurred', err); - });
chore: move required looper script files up to top level scripts folder
chore: move required looper script files up to top level scripts folder
c2827ecb0a61f207fb227c09239663d2ba546368
--- graphql.yml @@ -103,24 +103,3 @@ applications: # queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql" # tags: # - "v1" - - name: "allspark-core-intl" - applicationKey: "ALLSPARK_APP_INTL" - description: "Core application for Me@Walmart International" - environments: - - name: "stg" - persistedQueries: - - name: "businessUnitByCountryAndNumber" - hash: "dc5adc0197a2bfd29b0ecc4ec5a255f44f8e0700a8a6916a834ec745574ab54d" - queryTemplate: "packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql" - tags: - - "v1" - - name: "getAssociateById" - hash: "0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociateById.graphql" - tags: - - "v1" - - name: "getLoggedInUser" - hash: "0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd" - queryTemplate: "packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql" - tags: - - "v1"
Revert "fix: adding back international queries that were somehow changed here"
Revert "fix: adding back international queries that were somehow changed here" This reverts commit 55f1cd46a8fdc31930a97840d0015bcef11c8d28.
2b8d60c96702d148498fb28806b3d7f687d402f7
--- package-lock.json @@ -46,8 +46,8 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.19.5", "@walmart/attendance-mini-app": "3.24.0", - "@walmart/avp-feature-app": "0.2.9", - "@walmart/avp-shared-library": "0.2.10", + "@walmart/avp-feature-app": "0.2.10", + "@walmart/avp-shared-library": "0.2.11", "@walmart/calling-mini-app": "0.1.13", "@walmart/compass-sdk-rn": "5.18.19", "@walmart/config-components": "4.2.17", @@ -10978,9 +10978,9 @@ } }, "node_modules/@walmart/avp-feature-app": { - "version": "0.2.9", - "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.2.9.tgz", - "integrity": "sha512-sotnbrmiOD34bQly3QGsmlf8f4jbK4iCC/XOO/OW9ud8JJbjWXdU7W5OQKRB2/IM6QlfGeUMawkDqrpJRgp0gg==", + "version": "0.2.10", + "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.2.10.tgz", + "integrity": "sha512-XhOnb/AhxZjV06BhW8WUBN/20ho2jtJXVfuB8APGTZxWCe20jod+lUD0NTurqxy+io8/Cvj3IG/TmD1kxT7pow==", "hasInstallScript": true, "engines": { "node": ">=16" @@ -10996,10 +10996,9 @@ } }, "node_modules/@walmart/avp-shared-library": { - "version": "0.2.10", - "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.2.10.tgz", - "integrity": "sha512-+aO3zD1zRwpqX5jeBW/6792S/xzDPEW0KziAaAx7Zsl4w9DyW0vHz08Qr7r0o89jgvbcBi72Y8JOJfRgcHoQzg==", - "license": "ISC", + "version": "0.2.11", + "resolved": "https://npme.walmart.com/@walmart/avp-shared-library/-/avp-shared-library-0.2.11.tgz", + "integrity": "sha512-WeR54deNGvB/7ZkW4ZwA9x0BEg15oOuHtjRIgqoHh92rKog1CSJ73pkfGrNmSGFB3WFdiyS//Xr79RxlTWWgyw==", "peerDependencies": { "axios": "^1.3.4", "immer": "^9.0.16", --- package.json @@ -87,8 +87,8 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.19.5", "@walmart/attendance-mini-app": "3.24.0", - "@walmart/avp-feature-app": "0.2.9", - "@walmart/avp-shared-library": "0.2.10", + "@walmart/avp-feature-app": "0.2.10", + "@walmart/avp-shared-library": "0.2.11", "@walmart/calling-mini-app": "0.1.13", "@walmart/compass-sdk-rn": "5.18.19", "@walmart/config-components": "4.2.17", @@ -347,8 +347,8 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.19.5", "@walmart/attendance-mini-app": "3.24.0", - "@walmart/avp-feature-app": "0.2.9", - "@walmart/avp-shared-library": "0.2.10", + "@walmart/avp-feature-app": "0.2.10", + "@walmart/avp-shared-library": "0.2.11", "@walmart/calling-mini-app": "0.1.13", "@walmart/compass-sdk-rn": "5.18.19", "@walmart/config-components": "4.2.17",
bump avp feature app and shared lib versions
bump avp feature app and shared lib versions
55003f76b111f6a58e52fba9a3c4d6e2ac5b99ea
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.33.0", + "version": "1.34.0", "main": "dist/index.js", "files": [ "dist" @@ -81,7 +81,7 @@ "@typescript-eslint/parser": "^5.37.0", "@walmart/allspark-authentication": "6.1.4", "@walmart/allspark-foundation": "6.20.0", - "@walmart/allspark-foundation-hub": "1.3.5", + "@walmart/allspark-foundation-hub": "1.3.6", "@walmart/allspark-graphql-client": "^1.4.6", "@walmart/allspark-http-client": "6.1.4", "@walmart/config-components": "4.4.0", @@ -99,7 +99,7 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.33.0", + "@walmart/roster-mini-app": "2.35.0", "@walmart/ui-components": "1.15.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", --- yarn.lock @@ -5992,9 +5992,9 @@ __metadata: languageName: node linkType: hard -"@walmart/allspark-foundation-hub@npm:1.3.5": - version: 1.3.5 - resolution: "@walmart/allspark-foundation-hub@npm:1.3.5" +"@walmart/allspark-foundation-hub@npm:1.3.6": + version: 1.3.6 + resolution: "@walmart/allspark-foundation-hub@npm:1.3.6" dependencies: "@reduxjs/toolkit": "npm:^1.9.7" "@shopify/flash-list": "npm:~1.6.4" @@ -6010,7 +6010,7 @@ __metadata: react: "*" react-native: "*" react-native-safe-area-context: 4.x - checksum: 10c0/8d916b2196e6c1131d183f3e008a9f490a4aba2f827198082b056d6f33f8fc86fd1e1405b2f9f4b452e8e924cd4401d636431cd7ee4a536d911f1cfb196f2b2e + checksum: 10c0/96953b39a79eb5c8678198a22497ad0c207c1bfba6017bbbb12bc3c7c166e2b07ce37c4df6a0be5a769449bf3b6a34b33107d309248b7fd1f4245962c0f5dbda languageName: node linkType: hard @@ -6398,7 +6398,7 @@ __metadata: "@typescript-eslint/parser": "npm:^5.37.0" "@walmart/allspark-authentication": "npm:6.1.4" "@walmart/allspark-foundation": "npm:6.20.0" - "@walmart/allspark-foundation-hub": "npm:1.3.5" + "@walmart/allspark-foundation-hub": "npm:1.3.6" "@walmart/allspark-graphql-client": "npm:^1.4.6" "@walmart/allspark-http-client": "npm:6.1.4" "@walmart/config-components": "npm:4.4.0" @@ -6416,7 +6416,7 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.33.0" + "@walmart/roster-mini-app": "npm:2.35.0" "@walmart/ui-components": "npm:1.15.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" @@ -6597,9 +6597,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.33.0": - version: 2.33.0 - resolution: "@walmart/roster-mini-app@npm:2.33.0" +"@walmart/roster-mini-app@npm:2.35.0": + version: 2.35.0 + resolution: "@walmart/roster-mini-app@npm:2.35.0" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6641,7 +6641,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/eef5d61567d1ba4a50a8ef54e38664d47c24f1df73611e1c0a8e89ca619f6c83dcf3ce085550dfe51dd7697d8da118ef4d06b5916bb2b2fd8f58815de622e6ed + checksum: 10c0/4784a9f17355d6399b4bbf8c2bd5131e5be3db85d4f16cc37f638895eb5093836ba301fb012d3ce02e21cf7ede5d82ea32181528c88eb6219f098402dc012f09 languageName: node linkType: hard
Update my team mini app version
Update my team mini app version
294ccc1dff54f2b969a65ba0042b21ab056eb29f
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 42 + versionCode 43 versionName "1.0.2" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>42</string> + <string>43</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>42</string> + <string>43</string> </dict> </plist>
Incrementing build number
Incrementing build number
97b0d990d65fd61af6f0e778ff3e099a36d6360e
--- .github/pull_request_template.md @@ -0,0 +1,12 @@ +## Links to JIRA tickets: + +## Acceptance Criteria + +## Screenshots (if any): + +# Checklist +- [ ] Have you written unit tests for this? If so, add the screenshots for the test coverage +- [ ] Has this been tested in the core app? +- [ ] Telemetry Covered? If so, list events (splunk, firebase etc...) +- [ ] Tested on iOS? +- [ ] Tested on Android? \ No newline at end of file --- src/queries/getTeamById.ts @@ -38,7 +38,6 @@ export interface TeamAssociateMembership { } export interface Membership { - [x: string]: any; membership?: Array<TeamAssociateMembership | null> | null; }
fix: resolve comments
fix: resolve comments
bbff2ef17ae96977ad0a345dc8865d1b68ff61a2
--- src/ccmFallbacks.ts @@ -7,4 +7,5 @@ export const CCMFallbacks = { shouldDisplayWarningBanner: false, warningMessageContent: 'All users must be on the most recent version of Me@ to send and receive messages.', + showViewTimeClock: false, }; --- src/components/ClockedOutScreenGuard.tsx @@ -14,6 +14,8 @@ import {TextingNavParamsMap} from '../navigation'; import {DrawerButton, Header} from '@walmart/ui-components'; import {TEXTING_I18N_NAMESPACE} from '../translations'; import {navigate} from '@walmart/react-native-shared-navigation'; +import {showViewTimeClock} from '../redux/selectors'; +import {useIsHourly, useUserIsInRoster} from '../hooks'; const styles = StyleSheet.create({ warning: { @@ -29,6 +31,11 @@ const ClockedOutStack = createStackNavigator<TextingNavParamsMap>(); export const ClockedOutScreen = () => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const shouldShowViewTimeClock: boolean = useSelector(showViewTimeClock); + const isHourly = useIsHourly(); + const userIsInRoster = useUserIsInRoster(); + const shouldShowViewTimeLink = + shouldShowViewTimeClock && isHourly && userIsInRoster; analytics('roster', {message: 'clocked out roster access'}, 10); return ( <> @@ -37,10 +44,14 @@ export const ClockedOutScreen = () => { variant='warning' children={t('clockedOutScreenGuard.clockedOutMessage')} UNSAFE_style={styles.warning} - actionButtonProps={{ - children: t('clockedOutScreenGuard.viewTimeClock'), - onPress: () => navigate('timeClock'), - }} + actionButtonProps={ + shouldShowViewTimeLink + ? { + children: t('clockedOutScreenGuard.viewTimeClock'), + onPress: () => navigate('timeClock'), + } + : undefined + } /> </> ); --- src/hooks/user.ts @@ -19,6 +19,12 @@ export const useIsSalariedOrTeamLead = () => { return payType === payTypes.SALARIED || hasTeamLeadJobDescription; }; +export const useIsHourly = () => { + const user: User = useSelector(UserSelectors.getUser); + const payType = user.employeeType as 'H' | 'S'; + return payType.toString().toUpperCase() === payTypes.HOURLY; +}; + export const useUserIsInRoster = () => { const workingSite: string = useSelector(UserSelectors.getUserWorkingSite); const homeSite: string = useSelector(UserSelectors.getUserHomeSite); --- src/redux/selectors.ts @@ -76,5 +76,14 @@ export const shouldDisplayWarningBanner = createSelector( export const warningMessageContent = createSelector( [getTextingAppConfigData], - (state) => state?.warningMessageContent ?? CCMFallbacks.warningMessageContent, + (state) => + state?.warningMessageContent?.toString()?.toLowerCase() === 'true' ?? + CCMFallbacks.warningMessageContent, +); + +export const showViewTimeClock = createSelector( + [getTextingAppConfigData], + (state) => + state?.showViewTimeClock?.toString()?.toLowerCase() === 'true' ?? + CCMFallbacks.showViewTimeClock, ); --- src/translations/en-US.ts @@ -16,7 +16,7 @@ export const enUS = { }, clockedOutScreenGuard: { clockedOutMessage: - 'You are currently clocked out. This feature is only available when you are clocked in', + 'You are currently clocked out. This feature is only available when you are clocked in.', viewTimeClock: 'View time clock', }, rosterScreen: { --- src/translations/es-MX.ts @@ -16,7 +16,7 @@ export const esMX = { }, clockedOutScreenGuard: { clockedOutMessage: - 'Actualmente estás fuera de horario. Esta función solo está disponible cuando estás dentro de horario', + 'Actualmente estás fuera de horario. Esta función solo está disponible cuando estás dentro de horario.', viewTimeClock: 'Ver Timeclock', }, rosterScreen: { --- src/ccmFallbacks.ts @@ -7,4 +7,5 @@ export const CCMFallbacks = { shouldDisplayWarningBanner: false, warningMessageContent: 'All users must be on the most recent version of Me@ to send and receive messages.', + showViewTimeClock: false, }; --- src/components/ClockedOutScreenGuard.tsx @@ -14,6 +14,8 @@ import {TextingNavParamsMap} from '../navigation'; import {DrawerButton, Header} from '@walmart/ui-components'; import {TEXTING_I18N_NAMESPACE} from '../translations'; import {navigate} from '@walmart/react-native-shared-navigation'; +import {showViewTimeClock} from '../redux/selectors'; +import {useIsHourly, useUserIsInRoster} from '../hooks'; const styles = StyleSheet.create({ warning: { @@ -29,6 +31,11 @@ const ClockedOutStack = createStackNavigator<TextingNavParamsMap>(); export const ClockedOutScreen = () => { const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const shouldShowViewTimeClock: boolean = useSelector(showViewTimeClock); + const isHourly = useIsHourly(); + const userIsInRoster = useUserIsInRoster(); + const shouldShowViewTimeLink = + shouldShowViewTimeClock && isHourly && userIsInRoster; analytics('roster', {message: 'clocked out roster access'}, 10); return ( <> @@ -37,10 +44,14 @@ export const ClockedOutScreen = () => { variant='warning' children={t('clockedOutScreenGuard.clockedOutMessage')} UNSAFE_style={styles.warning} - actionButtonProps={{ - children: t('clockedOutScreenGuard.viewTimeClock'), - onPress: () => navigate('timeClock'), - }} + actionButtonProps={ + shouldShowViewTimeLink + ? { + children: t('clockedOutScreenGuard.viewTimeClock'), + onPress: () => navigate('timeClock'), + } + : undefined + } /> </> ); --- src/hooks/user.ts @@ -19,6 +19,12 @@ export const useIsSalariedOrTeamLead = () => { return payType === payTypes.SALARIED || hasTeamLeadJobDescription; }; +export const useIsHourly = () => { + const user: User = useSelector(UserSelectors.getUser); + const payType = user.employeeType as 'H' | 'S'; + return payType.toString().toUpperCase() === payTypes.HOURLY; +}; + export const useUserIsInRoster = () => { const workingSite: string = useSelector(UserSelectors.getUserWorkingSite); const homeSite: string = useSelector(UserSelectors.getUserHomeSite); --- src/redux/selectors.ts @@ -76,5 +76,14 @@ export const shouldDisplayWarningBanner = createSelector( export const warningMessageContent = createSelector( [getTextingAppConfigData], - (state) => state?.warningMessageContent ?? CCMFallbacks.warningMessageContent, + (state) => + state?.warningMessageContent?.toString()?.toLowerCase() === 'true' ?? + CCMFallbacks.warningMessageContent, +); + +export const showViewTimeClock = createSelector( + [getTextingAppConfigData], + (state) => + state?.showViewTimeClock?.toString()?.toLowerCase() === 'true' ?? + CCMFallbacks.showViewTimeClock, ); --- src/translations/en-US.ts @@ -16,7 +16,7 @@ export const enUS = { }, clockedOutScreenGuard: { clockedOutMessage: - 'You are currently clocked out. This feature is only available when you are clocked in', + 'You are currently clocked out. This feature is only available when you are clocked in.', viewTimeClock: 'View time clock', }, rosterScreen: { --- src/translations/es-MX.ts @@ -16,7 +16,7 @@ export const esMX = { }, clockedOutScreenGuard: { clockedOutMessage: - 'Actualmente estás fuera de horario. Esta función solo está disponible cuando estás dentro de horario', + 'Actualmente estás fuera de horario. Esta función solo está disponible cuando estás dentro de horario.', viewTimeClock: 'Ver Timeclock', }, rosterScreen: {
update view time clock link
update view time clock link
6fded70f52d70a728d2cbd24adbabe017cc83761
--- .looper.multibranch.yml @@ -103,7 +103,7 @@ envs: releaseType: "test" releaseTypeDesc: "build from a feature branch; test feature in isolation" slackIcon: ":firecracker:" - slackChannel: "allspark-builds-developer" + slackChannel: "allspark-builds-test" buildType: "SNAPSHOT" buildGABuilds: false @@ -248,10 +248,10 @@ flows: - ls -l "${WORKSPACE}/ios/Podfile.lock" - call: pr # - call: auto-version - - node(label=$LOOPER_NODES, ws="exclusive"): - - parallel(failsafe): - - call: build-native(ios) - - call: build-native(android) + # - node(label=$LOOPER_NODES, ws="exclusive"): + # - parallel(failsafe): + - call: build-native(ios) + # - call: build-native(android) - call: run-sonar-analysis - call: publish-to-hygieia @@ -365,6 +365,7 @@ flows: catch: - echo "calling slack-failure(${version}, ${flowErrorMessage})" - call: slack-failure(version = ${version}, flowErrorMessage = ${flowErrorMessage}) + - call: msteams-failure(version = ${version}, flowErrorMessage = ${flowErrorMessage}) - fail('Failed to generate build with flowErrorMessage - $flowErrorMessage') ruby-configuration: @@ -579,21 +580,47 @@ flows: - msteams.sendMessage: webhookUrl: https://walmart.webhook.office.com/webhookb2/f0470775-130f-4a42-9531-d0511cf632aa@3cbcc3d3-094d-4006-9849-0d11d61f484d/IncomingWebhook/16391a60331c4d4999f112e40a0b2db1/f02e8323-deff-42c4-85df-613f84ca35ff type: "MessageCard" - themeColor: "eeeeff" + themeColor: "EFEFEF" title: "${MESSAGE_TITLE}" text: "*${env}* ${releaseTypeDesc}" sections: - facts: - Download: "<${betacrash.url}|Link>" - Password: ${betacrash.pin} - - Version: ${Version} + - Version: ${version} + - Build Number: ${BUILD_NUMBER} + - OS Type: ${os} + - Branch: ${GITHUB_BRANCH_NAME} + - Author: ${GIT_COMMIT_AUTHOR} + - Commit Message: ${GIT_COMMIT_MESSAGE} + - Commit Date: ${GIT_COMMIT_DATE} + - Commit: "<${GIT_COMMIT_URL}|Commit URL>" + - Looper Job: "<${BUILD_URL}|${BUILD_NUMBER}>" + - Github Repo: "<${GITHUB_BRANCH_URL}|URL>" + + msteams-failure: + - var(BUILD_NUMBER): + sh scripts/getIOSAppBundleNumber.sh ios/AllSpark/Info.plist + - var(MESSAGE_TITLE): + | + echo "${os} ${releaseType} BUILD FAILED" + - msteams.sendMessage: + webhookUrl: https://walmart.webhook.office.com/webhookb2/f0470775-130f-4a42-9531-d0511cf632aa@3cbcc3d3-094d-4006-9849-0d11d61f484d/IncomingWebhook/16391a60331c4d4999f112e40a0b2db1/f02e8323-deff-42c4-85df-613f84ca35ff + type: "MessageCard" + themeColor: "FFE7E2" + title: "${MESSAGE_TITLE}" + text: "*${env}* ${releaseTypeDesc}" + sections: + - text: "Error - ${flowErrorMessage}" + facts: + - Version: ${version} - Build Number: ${BUILD_NUMBER} - OS Type: ${os} - Branch: ${GITHUB_BRANCH_NAME} - Author: ${GIT_COMMIT_AUTHOR} - Commit Message: ${GIT_COMMIT_MESSAGE} - Commit Date: ${GIT_COMMIT_DATE} - - Commit: "<${GIT_COMMIT_URL}| Github URL>" + - Commit: "<${GIT_COMMIT_URL}|Commit URL>" - Looper Job: "<${BUILD_URL}|${BUILD_NUMBER}>" - Github Repo: "<${GITHUB_BRANCH_URL}|URL>"
about to try it out
about to try it out
667dea1efe7283f217b21ffb1e03c3d9e5955d89
--- __tests__/components/TeamSearchInput.test.tsx @@ -13,16 +13,6 @@ describe('TeamSearchInput', () => { expect(toJSON()).toMatchSnapshot(); }); - // TODO: mock showMicrophoneIcon to be true - // it('should render correctly with right icon', () => { - // const {getByTestId, toJSON} = renderWithProviders( - // <TeamSearchInput handleChange={() => {}} />, - // ); - - // expect(getByTestId('search-input')).toBeTruthy(); - // expect(toJSON()).toMatchSnapshot(); - // }); - it('should call handleChange when text changes', () => { const handleChangeMock = jest.fn(); const {getByTestId, toJSON} = renderWithProviders( --- jest.config.js @@ -11,9 +11,6 @@ module.exports = { collectCoverageFrom: [ '<rootDir>/src/**/*.{js,jsx,ts,tsx}', '!<rootDir>/src/queries/*', - '!<rootDir>/src/mocks/*', - '!<rootDir>/src/screens/PushToTalkScreen.tsx', //TODO: Remove ignore when we enable this feature. <Make JIRA for this> - '!<rootDir>/src/channels/pushToTalkProvider.tsx', //TODO: Remove ignore when we enable this feature. <Make JIRA for this> ], coverageReporters: ['lcov', 'text'], coverageThreshold: {
feat: removed unused code
feat: removed unused code
766d92e6130954ec742bd6a2ccb60ca43aeb56c4
--- __tests__/navigation/utils.test.ts @@ -28,7 +28,7 @@ describe('Navigation Utils', () => { '100', 'testDisplayName', 'H', - '12345', + 12345, 'US', ); expect(navigate).toBeCalledWith('scheduleScreen', {
Update version
Update version
99c005045016326ff15c6f3f42d9a0ff7048d7b9
--- packages/allspark-foundation/src/Navigation/components/Header.tsx @@ -1,5 +1,5 @@ import React, { PropsWithChildren } from 'react'; -import { StyleSheet } from 'react-native'; +import { Platform, StyleSheet } from 'react-native'; import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { Header as RNStackHeader, @@ -21,11 +21,17 @@ export const styles = StyleSheet.create({ shadowOffset: { width: 0, height: 0 }, elevation: 0, }, - headerTitle: { - fontWeight: 'bold', - fontFamily: 'Bogle-Bold', - fontSize: 18, - }, + headerTitle: Platform.select({ + ios: { + fontFamily: 'Bogle', + fontWeight: 'bold', + fontSize: 18, + }, + default: { + fontFamily: 'Bogle-Bold', + fontSize: 18, + }, + }), headerLeftStyle: { paddingLeft: 8, },
fix: header component had incorrect styling for android
fix: header component had incorrect styling for android
809b96091aa82e196c0e3311d0ddc7388316e7b2
--- jest.config.js @@ -6,16 +6,16 @@ module.exports = { collectCoverageFrom: ['**/*.{ts,tsx}', '!**/*.d.ts'], coverageThreshold: { 'global': { - statements: 60, - branches: 60, - functions: 55, - lines: 60, + statements: 70, + branches: 70, + functions: 62, + lines: 70, }, './packages/allspark-foundation': { - statements: 5, - branches: 5, - functions: 5, - lines: 5, + statements: 85, + branches: 70, + functions: 80, + lines: 85, }, }, };
test: updated coverage threshold
test: updated coverage threshold
274ad6bf22fc2bd75d192f6468172cf5d5d0d950
--- package-lock.json @@ -3154,9 +3154,9 @@ } }, "@walmart/push-to-talk-mini-app": { - "version": "0.5.12", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.12.tgz", - "integrity": "sha512-kz11mbjaOHc7gidjVGQBNczLCafVr4GP83+UvcoNkRtkr+VYW0ZyTXkh9fUI1nqa9oFW5m74fiEr7Imf2HyO6Q==" + "version": "0.5.21", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.21.tgz", + "integrity": "sha512-byTE/rzy8h4p7zIFRwvjJ6C/emtj2VdKA9Rt5MucyvDINTxOpQ9vpBTdOX/8oNalSE7E2Ns1ttKJi5gBqiFByQ==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", --- package.json @@ -74,7 +74,7 @@ "@walmart/impersonation-mini-app": "1.0.15", "@walmart/inbox-mini-app": "0.0.94", "@walmart/moment-walmart": "1.0.4", - "@walmart/push-to-talk-mini-app": "0.5.12", + "@walmart/push-to-talk-mini-app": "0.5.21", "@walmart/react-native-env": "^0.1.0", "@walmart/react-native-logger": "^1.25.0", "@walmart/react-native-shared-navigation": "^0.4.0",
PTT Hotfix for Drop 2.5
PTT Hotfix for Drop 2.5
d59c8cfea192f78867d204ebc38554986f36756c
--- packages/core-widget-registry/src/ScMetrics.ts @@ -6,7 +6,7 @@ import MeAtCommon, {ScMetricsContainer} from '@walmart/me-at-walmart-common'; * @example * import {ScMetricsWidgetProps} from '@walmart/me-at-walmart-common'; */ -export type ScMetricsWidgetProps = MeAtCommon.ScMetricsWidgetProps; +export type ScMetricsWidgetProps = MeAtCommon.ScMetricsComponentProps; /** * @deprecated - Use `ScMetricsContainer` from "@walmart/me-at-walmart-common" instead
type: updated metrics container types and documentation
type: updated metrics container types and documentation
0a3128876d1e52e3baa6da8638e8e628a5e67f70
--- package.json @@ -155,7 +155,7 @@ "@walmart/taskit-mini-app": "5.38.2", "@walmart/time-clock-mini-app": "3.19.2", "@walmart/time-clock-mini-app-next": "3.0.0", - "@walmart/topstock-mini-app": "1.24.2", + "@walmart/topstock-mini-app": "1.25.4", "@walmart/translator-mini-app": "1.6.4", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.24.4#~/.yarn/patches/@walmart-ui-components-npm-1.24.4-247996ccb0.patch", "@walmart/walmart-fiscal-week": "^0.3.6", --- yarn.lock @@ -7663,7 +7663,7 @@ __metadata: "@walmart/taskit-mini-app": "npm:5.38.2" "@walmart/time-clock-mini-app": "npm:3.19.2" "@walmart/time-clock-mini-app-next": "npm:3.0.0" - "@walmart/topstock-mini-app": "npm:1.24.2" + "@walmart/topstock-mini-app": "npm:1.25.4" "@walmart/translator-mini-app": "npm:1.6.4" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.24.4#~/.yarn/patches/@walmart-ui-components-npm-1.24.4-247996ccb0.patch" "@walmart/walmart-fiscal-week": "npm:^0.3.6" @@ -8611,9 +8611,9 @@ __metadata: languageName: node linkType: hard -"@walmart/topstock-mini-app@npm:1.24.2": - version: 1.24.2 - resolution: "@walmart/topstock-mini-app@npm:1.24.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.24.2.tgz" +"@walmart/topstock-mini-app@npm:1.25.4": + version: 1.25.4 + resolution: "@walmart/topstock-mini-app@npm:1.25.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftopstock-mini-app%2F-%2F%40walmart%2Ftopstock-mini-app-1.25.4.tgz" peerDependencies: "@react-navigation/native": ">=5.8.10" "@react-navigation/stack": ">=5.12.8" @@ -8623,10 +8623,9 @@ __metadata: "@walmart/ui-components": ">=1.0.79" i18next: ">=19.5.1" react-i18next: ">=11.7.3" - react-native-haptic-feedback: ">=1.13.0" react-native-vector-icons: ">=6.6.0" react-redux: ">=7.2.0" - checksum: 10c0/38bce24db1ab61e8576411c4522706563b766b66674e7fe82fcd454bfa2a0d847b86cec65f3c2dc8f52186c3adc38ebb5f41bbba61046124725b7a34d86efab2 + checksum: 10c0/00a516c1b6ace5dc08e8f3a97dffd7e547fcd7e1df7973fdbb97eec2942a78c0ef6802dad8c771d8453ac91eae84023586abd51af0080e9b3679e5e8c3f350b0 languageName: node linkType: hard
fix(topstock): topstock drop32 (#4342)
fix(topstock): topstock drop32 (#4342) * fix(topstock): topstock drop32 * trigger build * fix(topstock):trigger build * fix(topstock):trigger build * fix(topstock):trigger build * fix: trigger build * fix: lock file reverted * fix(topstock): version bump * fix(topstock): version bump * fix(topstock): version upgrade --------- Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
41f287040b18a40ee77cc86f11aef3a8473591e0
--- .looper.multibranch.yml @@ -608,15 +608,15 @@ branches: flows: native-ios: - - exposeVars("${market}-market") + - expose("${market}-market") - node(label=${NODES}): - call: build-ios(ios) native-android: - - exposeVars("${market}-market") + - expose("${market}-market") - call: build-android(android) native-both: - - exposeVars("${market}-market") + - expose("${market}-market") - node(label=${NODES}): - call: initialize - call: metadata
Update .looper.multibranch.yml
Update .looper.multibranch.yml
ffae6b2d26d582202f111470dfc785852aa2c74c
--- src/managerExperience/components/RosterDetailPageHeader/style.ts @@ -13,6 +13,7 @@ export const getRosterDetailPageHeaderStyles = (subText?: string) => { justifyContent: 'space-between', borderBottomWidth: 8, borderBottomColor: colors.gray['5'], + backgroundColor: colors.white, }, contentWrapper: { width: 214, --- src/managerExperience/components/RosterFiltersAndInfo/style.ts @@ -6,6 +6,7 @@ export const RosterFiltersAndInfoStyles = StyleSheet.create({ width: '100%', paddingHorizontal: 16, paddingVertical: 10, + backgroundColor: colors.white, }, headerContainer: { flexDirection: 'row', --- src/managerExperience/components/TeamSearchInput/style.ts @@ -9,6 +9,7 @@ export const TeamSearchInputStyles = StyleSheet.create({ borderBottomWidth: 1, borderColor: colors.separator['100'], width: '100%', + backgroundColor: colors.white, }, iconRight: { position: 'absolute', --- src/managerExperience/screens/RosterDetailScreen/styles.tsx @@ -7,6 +7,7 @@ export const rosterDetailScreenStyles = StyleSheet.create({ }, associateListContainer: { paddingHorizontal: 16, + backgroundColor: colors.white, }, footerSpacing: { height: 104,
Update mini app version
Update mini app version
393dd3dce70bf3c87c9ae457dcae5f4b1f2cec02
--- .looper.multibranch.yml @@ -25,9 +25,9 @@ cache: configs: - type: generic checksum: - - './targets/US/ios/Podfile.lock' + - './targets/${market}/ios/Podfile.lock' includes: - - './targets/US/ios/Pods' + - './targets/${market}/ios/Pods' docker: - name: 'mdc-agent' image: 'docker.ci.artifacts.walmart.com/store-systems-associate-tech-platform-docker/mdc-builder-agent-mini:latest'
Update .looper.multibranch.yml
Update .looper.multibranch.yml