commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
bead7c81ca254d1d356d39a8c91d5d8f656f0118
--- package-lock.json @@ -5340,9 +5340,9 @@ "integrity": "sha512-/2CjaIpac1s3kOUHVYvfzDOXW0AJp96tuKT1TNj3GDYX68HUOztjrYsOlZz1/WEG55iNMAJrfENcnTNguf5s9w==" }, "@walmart/push-to-talk-mini-app": { - "version": "1.7.23", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.7.23.tgz", - "integrity": "sha512-1PAiozkvSlXGd6LYVtv0+kmXuINulBu+DSvFddyuOrEBQ5ZNIxb4SjIqSQo0700ugLCxqXNfMqeHnl6mIAxEcg==" + "version": "1.8.1", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-1.8.1.tgz", + "integrity": "sha512-Ti8wOe6Jh3cWye1DfNj9aLQHdsmwrO5Jzlk8Tm2N6iTXXovmNj6cNPMZ5QE+UZOZx2GkDMeoT7k6VQIc1AEdFA==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", --- package.json @@ -96,7 +96,7 @@ "@walmart/payrollsolution_miniapp": "^0.123.2", "@walmart/price-changes-mini-app": "1.2.3", "@walmart/profile-feature-app": "0.0.39", - "@walmart/push-to-talk-mini-app": "1.7.23", + "@walmart/push-to-talk-mini-app": "1.8.1", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.29.0", "@walmart/react-native-shared-navigation": "1.0.2",
refine change listener for performance issue and change store fix
refine change listener for performance issue and change store fix
98b76adb3d814598b7c3a78fc429b8b460b0a4b5
--- .looper.yml @@ -14,6 +14,9 @@ triggers: - manual: name: Publish Changed call: publishFromChanges + - manual: + name: Publish From Package + call: publishFromPackage # - manual: # name: Publish All # call: publishAll --- packages/me-at-walmart-athena-queries/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-athena-queries", - "version": "6.5.0", + "version": "6.24.0-alpha.0", "description": "> TODO: description", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "",
chore: add publish from package command to align athena queries library with drop 24 version
chore: add publish from package command to align athena queries library with drop 24 version
00b05ae350333f7e2088c37837fbb9de662b87a6
--- src/containers/Message/MessageOptionsModal.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import {Modal, Button} from '@walmart/gtp-shared-components-3'; -import {GestureResponderEvent, StyleSheet, View} from 'react-native'; +import {Modal, Button, CloseIcon} from '@walmart/gtp-shared-components-3'; +import {GestureResponderEvent, StyleSheet, View, Text, TouchableOpacity} from 'react-native'; import {DeleteConfirmationContent} from './DeleteConfirmationContent'; import {FirebaseFirestoreTypes} from '@react-native-firebase/firestore'; import {translationClient} from '../../common/translation'; @@ -23,7 +23,32 @@ const styles = StyleSheet.create({ marginVertical: 4, }, deleteModal: { + padding: 0, + margin: 0, + backgroundColor: 'transparent', + justifyContent: 'center', + alignItems: 'center', + }, + deleteContentWrapper: { + backgroundColor: 'white', + borderRadius: 12, padding: 24, + maxWidth: 400, + width: '90%', + alignSelf: 'center', + position: 'relative', + }, + deleteTitle: { + fontSize: 20, + fontWeight: '600', + marginBottom: 16, + paddingRight: 32, + }, + closeButton: { + position: 'absolute', + top: 24, + right: 24, + zIndex: 1, }, }); export const MessageOptionsModal = (props: { @@ -71,20 +96,27 @@ export const MessageOptionsModal = (props: { <Modal isOpen={isLongPressed} //@ts-ignore - style={!isConfirmationModalVisible && styles.mainModal} - UNSAFE_style={[ - !isConfirmationModalVisible ? styles.modal : styles.deleteModal, - ]} - title={ - !isConfirmationModalVisible - ? '' - : t('messageScreen.deleteConfirmationTitle') + style={styles.mainModal} + UNSAFE_style={ + !isConfirmationModalVisible ? styles.modal : styles.deleteModal } + title={''} onClose={handleLongPressModalOnClose} - hideCloseIcon={!isConfirmationModalVisible}> + hideCloseIcon={true}> <> {isConfirmationModalVisible ? ( - <View> + <View style={styles.deleteContentWrapper}> + <TouchableOpacity + onPress={handleLongPressModalOnClose} + style={styles.closeButton} + testID='closeDeleteModal' + accessibilityRole='button' + accessibilityLabel='Close'> + <CloseIcon size='small' /> + </TouchableOpacity> + <Text style={styles.deleteTitle}> + {t('messageScreen.deleteConfirmationTitle')} + </Text> <DeleteConfirmationContent messagePath={messagePath} modalOnCloseCallback={handleLongPressModalOnClose}
fix(ui): delete options pop up
fix(ui): delete options pop up
db5c02e9af20879a24ecf2efacbdd0660c23b109
--- package.json @@ -96,7 +96,7 @@ "@walmart/react-native-sumo-sdk": "2.8.0", "@walmart/redux-store": "6.3.29", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.42.0", + "@walmart/wmconnect-mini-app": "3.1.1", "babel-jest": "^29.6.3", "chance": "^1.1.11", "crypto-js": "~4.2.0", --- yarn.lock @@ -6421,7 +6421,7 @@ __metadata: "@walmart/react-native-sumo-sdk": "npm:2.8.0" "@walmart/redux-store": "npm:6.3.29" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.42.0" + "@walmart/wmconnect-mini-app": "npm:3.1.1" babel-jest: "npm:^29.6.3" chance: "npm:^1.1.11" crypto-js: "npm:~4.2.0" @@ -6504,20 +6504,20 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.42.0": - version: 2.42.0 - resolution: "@walmart/wmconnect-mini-app@npm:2.42.0::__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.42.0.tgz" +"@walmart/wmconnect-mini-app@npm:3.1.1": + version: 3.1.1 + resolution: "@walmart/wmconnect-mini-app@npm:3.1.1::__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-3.1.1.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.32.0" - expo: ^51.0.0 - expo-image: ~1.13.0 + expo: ~52.0.46 + expo-image: ~2.0.7 react: "*" react-native: "*" react-native-wm-config: 0.1.1 dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/1964dcc6fd212228e1236dcfb69868711d282ca21709d301ddf9fa370a146d431d04dfa67c8455fa703e15144780717fe51b25d37dd337e441642da8dcba3117 + checksum: 10c0/02d52dbec11b2444054acfc6cda5fc26fcbeb4bc33948216abb071e43786cc4fb53314b2c654835a7d5fd22cb432159b9dd624f563e63e9ae4a243d77c539108 languageName: node linkType: hard
fix(ui): update wmconnect version
fix(ui): update wmconnect version
46e039742a33112d90756ae21943958040950216
--- .looper.yml @@ -18,7 +18,7 @@ flows: pr: - (name Corepack enable) corepack enable - - (name Yarn Set Version) yarn set version 4.1.1 + - (name Yarn Set Version) yarn set version 4.6.0 - (name Yarn Version) yarn --version - yarn install - yarn run lint
feat(ui): update looper
feat(ui): update looper
a75bcecaa0e16c96f2c4f57606b5f392f5a3db5e
--- core/src/manifest.ts @@ -54,6 +54,7 @@ export const getAssociateFeatures = (): AllsparkFeatureModule[] => { require('./storeInfo').StoreInfoFeature, require('./features/timeclock').default, require('./whatsNew').WhatsNewFeature, + require('@walmart/checkout-mini-app').CheckoutMiniApp, ]; // Me@Walmart US Only Associate Features --- core/src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -13,7 +13,6 @@ import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; import {AvailableSurveysNav} from '@walmart/associate-listening-mini-app'; import {AVPNav, AVP_NAV_SCREEN_NAME} from '@walmart/avp-feature-app'; import BackroomMiniApp from '@walmart/backroom-mini-app'; -import {CheckoutMiniApp} from '@walmart/checkout-mini-app'; import {EmergencyBannerScreen} from '@walmart/emergency-mini-app'; import {ExceptionMiniApp as PinpointMiniApp} from '@walmart/exception-mini-app'; import {FacilitiesMaintainanceStack} from '@walmart/facilities-management-miniapp'; @@ -79,7 +78,7 @@ import SideKeyFeature from '../../../sideKey'; import {StoreInfoFeature} from '../../../storeInfo'; import {TermsOfUseFeature} from '../../../termsOfUse'; import {WhatsNewFeature} from '../../../whatsNew'; - +import {CheckoutMiniApp} from '@walmart/checkout-mini-app'; import {MainTabsNav} from './Tabs'; import {MyTeamStackNav} from './Tabs/MyTeamStackNav'; import {MainStackMap} from './types'; @@ -180,15 +179,6 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ }, clockCheckEnabled: true, }, - { - featureId: MINI_APPS.CHECKOUT, - name: 'Checkout', - component: CheckoutMiniApp, - options: { - headerShown: false, - }, - clockCheckEnabled: true, - }, { featureId: 'backroom', name: 'Backroom', @@ -548,7 +538,7 @@ const MiniAppScreens = createMiniAppScreens(MainStack, [ export const MainStackNav = () => { const dispatch = useDispatch(); - + console.log('######### Inside MainStackNav!! ##########'); useEffect(() => { // Signals the completion of startup. This is used to resume the startup flow saga that runs startup side effects dispatch(ContainerActionCreators.STARTUP_COMPLETE()); @@ -628,6 +618,10 @@ export const MainStackNav = () => { {ManagerApprovalsFeature.buildAllScreens({ Navigator: MainStack as any, })} + + {CheckoutMiniApp.buildAllScreens({ + Navigator: MainStack as any, + })} </MainStack.Navigator> </> ); --- core/src/navigation/USHallway/AssociateHallwayNav/SideMenuContent.tsx @@ -56,6 +56,7 @@ export const SCREEN_RENAME_MAP = { FeatureRestrictions: 'Core.FeatureRestrictions', WhatsNewModal: 'Core.WhatsNewModal', ManagerApprovals: 'ma.startManagerApprovals', + Checkout: 'Checkout.Root', }; export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( @@ -119,7 +120,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( return; } } - + console.log('$$$$$$ Route Name ', route, params); setImmediate(() => // Look to rename mapping for new route name, if none found, use route name navigation.navigate(SCREEN_RENAME_MAP[route] || route, { --- core/src/navigation/USHallway/AssociateHallwayNav/types.ts @@ -85,7 +85,7 @@ export type MainStackMap = CoreAssociateStackMap & { taskItQuickActions: undefined; timeClock: undefined; Topstock: undefined; - Checkout: undefined; + 'Checkout.Root': undefined; Receiving: undefined; };
Checkout phase 5 changes
Checkout phase 5 changes
e242784a5816bf2aeb6f57c5d380adb52033c332
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.0.2](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.0.1...v2.0.2) (2024-04-23) + + +### Bug Fixes + +* **ui:** sonar property update SMDV-5648 ([a841b3d](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/a841b3d67a12425200de9c82876e54b539dbc887)) + ## [2.0.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.0.0...v2.0.1) (2024-04-23) --- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/roster-mini-app", - "version": "2.0.1", + "version": "2.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/roster-mini-app", - "version": "2.0.1", + "version": "2.0.2", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.0.1", + "version": "2.0.2", "private": false, "main": "dist/index.js", "files": [
chore(release): 2.0.2 [skip ci]
chore(release): 2.0.2 [skip ci] ## [2.0.2](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.0.1...v2.0.2) (2024-04-23) ### Bug Fixes * **ui:** sonar property update SMDV-5648 ([a841b3d](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/a841b3d67a12425200de9c82876e54b539dbc887))
fe6e3700d83df6496f3743a811813dac9ae1b18b
--- package.json @@ -128,7 +128,7 @@ "@walmart/pay-stub-miniapp": "0.21.4", "@walmart/payrollsolution_miniapp": "0.147.26", "@walmart/price-changes-mini-app": "1.12.7", - "@walmart/profile-feature-app": "1.138.5", + "@walmart/profile-feature-app": "1.138.8", "@walmart/react-native-cookies": "1.0.1", "@walmart/react-native-encrypted-storage": "~1.1.3", "@walmart/react-native-env": "~6.3.28", --- yarn.lock @@ -8302,7 +8302,7 @@ __metadata: "@walmart/pay-stub-miniapp": "npm:0.21.4" "@walmart/payrollsolution_miniapp": "npm:0.147.26" "@walmart/price-changes-mini-app": "npm:1.12.7" - "@walmart/profile-feature-app": "npm:1.138.5" + "@walmart/profile-feature-app": "npm:1.138.8" "@walmart/react-native-cookies": "npm:1.0.1" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" "@walmart/react-native-env": "npm:~6.3.28" @@ -8736,9 +8736,9 @@ __metadata: languageName: node linkType: hard -"@walmart/profile-feature-app@npm:1.138.5": - version: 1.138.5 - resolution: "@walmart/profile-feature-app@npm:1.138.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fprofile-feature-app%2F-%2Fprofile-feature-app-1.138.5.tgz" +"@walmart/profile-feature-app@npm:1.138.8": + version: 1.138.8 + resolution: "@walmart/profile-feature-app@npm:1.138.8" peerDependencies: "@react-navigation/bottom-tabs": ^6.0.0 "@react-navigation/material-top-tabs": ^6.0.0 @@ -8775,7 +8775,7 @@ __metadata: react-redux: ^8.0.4 realm: ^11.2.0 redux: ^4.1.2 - checksum: 10c0/ff286142e5e13d124ebb3550d927012bb143d9f0d7a84f119cf34acbae6ad96f4fe9c5ff2f321a6874772399e027f798b59bc03e4a96de1c7de7f0c2ee97209d + checksum: 10c0/01c7e6af307dd7bb6e4d4c46692c2d27289ca219b7ec759bf664c41634b7262d8c82453dd49bc0cc3ff850ba46a15cf9ee3d1c913af4f2821dbd534f9d754c85 languageName: node linkType: hard
feat: profile-feature-app version bump for drop 30 (#4117)
feat: profile-feature-app version bump for drop 30 (#4117) Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com>
a33a1dfaa909e79cf85ea3166ac1cce9e18503a8
--- core/__tests__/deeplink/deeplinkTest.ts @@ -19,3 +19,15 @@ test('deeplinkSaga', () => { DEEPLINK_CONFIG, ); }); + +test('deeplinkSaga default case', () => { + const iterator = deeplinkSaga(); + expect(iterator.next().value).toEqual(take(UserActionTypes.FETCH_SUCCESS)); + expect(iterator.next().value).toEqual( + select(EnvironmentSelectors.getContainerName), + ); + expect(iterator.next('OTHER_CONTAINER').done).toBe(true); + expect(AllsparkNavigationClient.setLinkingOptions).toHaveBeenCalledWith( + DEEPLINK_CONFIG, + ); +});
added test case for deeplink file
added test case for deeplink file
35cf37d8e46ef47fa728d4278c0d5b83109d5b77
--- src/containers/Message/DeleteModalContent.tsx @@ -1,21 +1,21 @@ -import {useSelector} from 'react-redux'; -import {UserSelectors} from '@walmart/redux-store'; import firestore from '@react-native-firebase/firestore'; -import {Radio, Alert, Divider, Button} from '@walmart/gtp-shared-components'; +import {Alert, Button, Divider, Radio} from '@walmart/gtp-shared-components'; +import {UserSelectors} from '@walmart/redux-store'; +import React, {FC, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import {TEXTING_I18N_NAMESPACE} from '../../translations'; -import React, {useState} from 'react'; import {StyleSheet, View} from 'react-native'; +import {useSelector} from 'react-redux'; +import {TEXTING_I18N_NAMESPACE} from '../../translations'; type DeleteModalContentType = { messagePath: string; modalOnCloseCallback: () => void; }; -export const DeleteModalContent = ({ +export const DeleteModalContent: FC<DeleteModalContentType> = ({ messagePath, modalOnCloseCallback, -}: DeleteModalContentType) => { +}) => { const deletedReasons = [ 'Inappropriate content', 'Mention of self harm', @@ -29,7 +29,7 @@ export const DeleteModalContent = ({ const userId: string = useSelector(UserSelectors.getUserId); const messageDoc = firestore().doc(messagePath); - const handleDelete = () => { + const handleDeleteMessage = () => { messageDoc.update({ deleted: true, deletedBy: userId, @@ -54,10 +54,7 @@ export const DeleteModalContent = ({ <View> <View style={styles.radioList}>{renderList}</View> <View style={styles.alert}> - <Alert - variant='info' - children={'Deleting a message cannot be undone.'} - /> + <Alert variant='info' children={t('messageScreen.alertMessage')} /> </View> <View style={styles.divider}> <Divider /> @@ -69,9 +66,9 @@ export const DeleteModalContent = ({ <Button variant='destructive' size='small' - onPress={handleDelete} + onPress={handleDeleteMessage} disabled={selected === ''}> - Delete message + {t('messageScreen.deleteMessage')} </Button> </View> </View> --- src/translations/en-US.ts @@ -108,7 +108,9 @@ export const enUS = { readReadReceipt: 'Read', chatInputPlaceholder: 'Type a message', delete: 'Delete', + deleteMessage: 'Delete message', cancel: 'Cancel', + alertMessage: 'Deleting a message cannot be undone.', }, searchScreen: { searchInputPlaceholder: 'Search people or roles', --- src/containers/Message/DeleteModalContent.tsx @@ -1,21 +1,21 @@ -import {useSelector} from 'react-redux'; -import {UserSelectors} from '@walmart/redux-store'; import firestore from '@react-native-firebase/firestore'; -import {Radio, Alert, Divider, Button} from '@walmart/gtp-shared-components'; +import {Alert, Button, Divider, Radio} from '@walmart/gtp-shared-components'; +import {UserSelectors} from '@walmart/redux-store'; +import React, {FC, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import {TEXTING_I18N_NAMESPACE} from '../../translations'; -import React, {useState} from 'react'; import {StyleSheet, View} from 'react-native'; +import {useSelector} from 'react-redux'; +import {TEXTING_I18N_NAMESPACE} from '../../translations'; type DeleteModalContentType = { messagePath: string; modalOnCloseCallback: () => void; }; -export const DeleteModalContent = ({ +export const DeleteModalContent: FC<DeleteModalContentType> = ({ messagePath, modalOnCloseCallback, -}: DeleteModalContentType) => { +}) => { const deletedReasons = [ 'Inappropriate content', 'Mention of self harm', @@ -29,7 +29,7 @@ export const DeleteModalContent = ({ const userId: string = useSelector(UserSelectors.getUserId); const messageDoc = firestore().doc(messagePath); - const handleDelete = () => { + const handleDeleteMessage = () => { messageDoc.update({ deleted: true, deletedBy: userId, @@ -54,10 +54,7 @@ export const DeleteModalContent = ({ <View> <View style={styles.radioList}>{renderList}</View> <View style={styles.alert}> - <Alert - variant='info' - children={'Deleting a message cannot be undone.'} - /> + <Alert variant='info' children={t('messageScreen.alertMessage')} /> </View> <View style={styles.divider}> <Divider /> @@ -69,9 +66,9 @@ export const DeleteModalContent = ({ <Button variant='destructive' size='small' - onPress={handleDelete} + onPress={handleDeleteMessage} disabled={selected === ''}> - Delete message + {t('messageScreen.deleteMessage')} </Button> </View> </View> --- src/translations/en-US.ts @@ -108,7 +108,9 @@ export const enUS = { readReadReceipt: 'Read', chatInputPlaceholder: 'Type a message', delete: 'Delete', + deleteMessage: 'Delete message', cancel: 'Cancel', + alertMessage: 'Deleting a message cannot be undone.', }, searchScreen: { searchInputPlaceholder: 'Search people or roles',
fixin delete modal content
fixin delete modal content
3edfb106ce45d8472a99f2e05d7cd823d6b2a4e9
--- package.json @@ -83,7 +83,7 @@ "@walmart/allspark-utils": "6.5.3", "@walmart/amp-mini-app": "1.1.98", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.28.21", + "@walmart/ask-sam-mini-app": "1.29.3", "@walmart/associate-listening-mini-app": "1.2.14", "@walmart/attendance-mini-app": "3.155.0", "@walmart/avp-feature-app": "0.16.8", --- yarn.lock @@ -6301,9 +6301,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ask-sam-mini-app@npm:1.28.21": - version: 1.28.21 - resolution: "@walmart/ask-sam-mini-app@npm:1.28.21::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.28.21.tgz" +"@walmart/ask-sam-mini-app@npm:1.29.3": + version: 1.29.3 + resolution: "@walmart/ask-sam-mini-app@npm:1.29.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.29.3.tgz" dependencies: apisauce: "npm:^1.1.2" numeral: "npm:^2.0.6" @@ -6348,7 +6348,7 @@ __metadata: react-native-wm-voice-text: ">=0.3" reselect: ">=4" victory-native: ">=36.5" - checksum: 10c0/c6190d3a023559c46b56ce39ae07dbf0db6e8033b4018cc13606cac8783d4f84640e3b308ba8661e6db4b31891d189d666bd07c9c34c06e8a3541da093d77db7 + checksum: 10c0/965c9a2698b5bea208afcc4b1a6936440d293e3597ad8b729e6546cd20bcb5d65853c3b7da1627ae96929a93a2918bf6a50672b2234c4e351d180d1cd596a30e languageName: node linkType: hard @@ -7301,7 +7301,7 @@ __metadata: "@walmart/allspark-utils": "npm:6.5.3" "@walmart/amp-mini-app": "npm:1.1.98" "@walmart/ask-sam-chat-components": "npm:^0.2.7" - "@walmart/ask-sam-mini-app": "npm:1.28.21" + "@walmart/ask-sam-mini-app": "npm:1.29.3" "@walmart/associate-listening-mini-app": "npm:1.2.14" "@walmart/attendance-mini-app": "npm:3.155.0" "@walmart/avp-feature-app": "npm:0.16.8"
chore(component): SMBLV-8719 fixed the icon size of walmart plus QR code (#4046)
chore(component): SMBLV-8719 fixed the icon size of walmart plus QR code (#4046) * chore(component): SMBLV-8719 fixed the icon size of walmart plus QR cod * chore(scanner version bump inside asksam mini app): OPIF-183483 0.10.9 * revert(reverted the previous commit of scanner): SMBLV-8719 c0e084e34546 --------- Co-authored-by: s0m0p0a <sowmya.munaganuri@walmart.com> Co-authored-by: Talia Andrews - t0a07tn <Talia.Andrews@walmart.com> Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com>
7f89d9e626b5c5471dad696ae499c1bc9a852c44
--- __tests__/whatsNew/WhatsNewItemTest.tsx @@ -15,6 +15,7 @@ const logger = LoggerService.getContainerInstance(); const baseProps = { image: 'https://i5-me.walmartimages.com', + placeholder: 'KEHpGG0,035Ex@~S02?E~Q', title: 'My Team', text: 'This is what we added for my team!', }; --- __tests__/whatsNew/__snapshots__/WhatsNewItemTest.tsx.snap @@ -12,11 +12,7 @@ exports[`WhatsNewItem handles navigation link 1`] = ` <Image contentFit="cover" onError={[Function]} - placeholder={ - { - "testUri": "../../../src/images/assets/ask-sam-illustration.png", - } - } + placeholder="KEHpGG0,035Ex@~S02?E~Q" source={ { "uri": "https://i5-me.walmartimages.com", @@ -91,11 +87,7 @@ exports[`WhatsNewItem handles navigation link without screen 1`] = ` <Image contentFit="cover" onError={[Function]} - placeholder={ - { - "testUri": "../../../src/images/assets/ask-sam-illustration.png", - } - } + placeholder="KEHpGG0,035Ex@~S02?E~Q" source={ { "uri": "https://i5-me.walmartimages.com", @@ -170,11 +162,7 @@ exports[`WhatsNewItem matches snapshot 1`] = ` <Image contentFit="cover" onError={[Function]} - placeholder={ - { - "testUri": "../../../src/images/assets/ask-sam-illustration.png", - } - } + placeholder="KEHpGG0,035Ex@~S02?E~Q" source={ { "uri": "https://i5-me.walmartimages.com", --- src/whatsNew/WhatsNewItem.tsx @@ -11,7 +11,7 @@ import {WhatsNewConfig} from './types'; import {WhatsNewItemStyles as styles} from './styles'; export const WhatsNewItem = (props: WhatsNewConfig) => { - const {title, text, image, link} = props; + const {title, text, image, link, placeholder} = props; const navigation = useNavigation<MainStackNavigationProp>(); const onLinkPress = () => { @@ -31,7 +31,7 @@ export const WhatsNewItem = (props: WhatsNewConfig) => { source={{ uri: image, }} - placeholder={Images.AskSamIllustration as any} + placeholder={placeholder || (Images.AskSamIllustration as any)} onError={({error}) => { Logger.error('Error loading i5 image', { message: image, --- src/whatsNew/types.ts @@ -24,6 +24,7 @@ export interface FeatureRestriction { export interface WhatsNewConfig { image: string; + placeholder: string; title: RecordText; text: RecordText; link?: RecordLink;
update whatsnew placeholder
update whatsnew placeholder
e5c6b6e05a6181211c0dca7cdb96d25ec00c5dc2
--- android/app/build.gradle @@ -153,8 +153,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 882 - versionName "1.6.5" + versionCode 883 + versionName "1.7.0" } splits { abi { --- ios/AllSpark/Info.plist @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>1.6.5</string> + <string>1.7.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -36,7 +36,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>882</string> + <string>883</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key> --- package-lock.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.6.5", + "version": "1.7.0", "lockfileVersion": 1, "requires": true, "dependencies": { --- package.json @@ -1,6 +1,6 @@ { "name": "allspark-main", - "version": "1.6.5", + "version": "1.7.0", "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",
Version increment
Version increment
f6cb575ca843329877c50ad3c45cdd3b56082593
--- packages/associate-exp-hub-mini-app/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. +# [1.7.0](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.6.0...@walmart/associate-exp-hub-mini-app@1.7.0) (2025-11-20) + +### Features + +- **ui:** fix the re rendering and crashing issue ([9902ead](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/commit/9902eade9d26df088dde1d736f1804fd88128da8)) + # [1.6.0](https://gecgithub01.walmart.com/smdv/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-mini-app@1.5.2...@walmart/associate-exp-hub-mini-app@1.6.0) (2025-11-20) ### Features --- packages/associate-exp-hub-mini-app/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-mini-app", - "version": "1.6.0", + "version": "1.7.0", "packageManager": "yarn@4.6.0", "engines": { "node": ">=18" --- packages/associate-exp-hub-team-switcher/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.16.0](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-team-switcher@2.15.0...@walmart/associate-exp-hub-team-switcher@2.16.0) (2025-11-20) + +### Features + +- **ui:** fix the re rendering and crashing issue ([9902ead](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/9902eade9d26df088dde1d736f1804fd88128da8)) + # [2.15.0](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-team-switcher@2.14.1...@walmart/associate-exp-hub-team-switcher@2.15.0) (2025-11-20) ### Features --- packages/associate-exp-hub-team-switcher/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/associate-exp-hub-team-switcher", - "version": "2.15.0", + "version": "2.16.0", "description": "Team Switcher module for Associate Experience Hub", "packageManager": "yarn@4.6.0", "engines": {
chore(version): updating package version
chore(version): updating package version - @walmart/associate-exp-hub-mini-app@1.7.0 - @walmart/associate-exp-hub-team-switcher@2.16.0
4537e7bf26229cd606b0a2fe7239185f1dc09b3a
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -216,21 +216,7 @@ Array [ /> <Screen component="FacilitiesMaintainanceStack" - initialParams={ - Object { - "routeName": "FacilitiesManagementStack.Landing", - } - } - name="FacilitiesManagementStack.Landing" - /> - <Screen - component="FacilitiesMaintainanceStack" - initialParams={ - Object { - "routeName": "FacilitiesManagementStack.ScheduleServices", - } - } - name="FacilitiesManagementStack.ScheduledServices" + name="FacilitiesManagementStack" /> </Group> </Navigator>,
Feedback comments resolution
Feedback comments resolution
1e542dc083769b03a7f4507fcad99ed47bbf634b
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/HubHeader/index.ts @@ -1,3 +1,3 @@ -export {RosterPageHeader} from './HubHeader'; -export {default as getHeaderStyles} from './style'; -export type {default as RosterHeaderProps} from './types'; +export { RosterPageHeader } from './HubHeader'; +export { default as getHeaderStyles } from './style'; +export type { default as RosterHeaderProps } from './types'; --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/HubHeader/style.ts @@ -1,11 +1,11 @@ -import {colors} from '@walmart/gtp-shared-components/dist'; -import {StyleSheet, Dimensions} from 'react-native'; -const {width} = Dimensions.get('window'); +import { colors } from '@walmart/gtp-shared-components/dist'; +import { StyleSheet, Dimensions } from 'react-native'; +const { width } = Dimensions.get('window'); export default ( subText?: string, hasImage?: boolean, - hasRightIcon?: boolean, + hasRightIcon?: boolean ) => { return StyleSheet.create({ container: { --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Components/HubHeader/types.ts @@ -1,7 +1,7 @@ export default interface RosterHeaderProps { title: string; subText?: string; - imageContent?: {uri: string; blurhash: string}; + imageContent?: { uri: string; blurhash: string }; links?: Array<{ label: string; onPress: () => void;
feat(ui): lint fixes
feat(ui): lint fixes
991d307d949566917403547c7c57bfc6542191c0
--- packages/allspark-foundation/package.json @@ -105,7 +105,6 @@ "react-native-apollo-devtools-client": "^1.0.4", "react-native-device-info": "~10.13.1", "react-native-drop-shadow": "^1.0.0", - "react-native-flipper": "^0.212.0", "react-native-gesture-handler": "^2.13.3", "react-native-permissions": "^3.10.1", "react-native-reanimated": "3.12.1", @@ -114,11 +113,9 @@ }, "peerDependencies": { "@react-native-async-storage/async-storage": "*", - "@react-native-community/datetimepicker": "*", "@react-native-community/netinfo": "11.x", "@react-native-firebase/analytics": "17.x", "@react-native-firebase/app": "17.x", - "@react-native-picker/picker": "*", "@react-navigation/drawer": "6.x", "@react-navigation/native": "6.x", "@react-navigation/stack": "6.x", @@ -138,14 +135,11 @@ "@walmart/redux-store": ">=6.3", "react": "*", "react-native": "*", - "react-native-apollo-devtools-client": "*", - "react-native-drop-shadow": "*", "react-native-flipper": "*", "react-native-gesture-handler": "2.x", "react-native-permissions": "3.x", "react-native-reanimated": "3.x", - "react-native-safe-area-context": "4.x", - "react-native-screens": "3.x" + "react-native-safe-area-context": "4.x" }, "peerDependenciesMeta": { "@walmart/allspark-graphql-client": { @@ -180,12 +174,6 @@ }, "@walmart/redux-store": { "optional": true - }, - "react-native-apollo-devtools-client": { - "optional": true - }, - "react-native-flipper": { - "optional": true } } -} +} \ No newline at end of file
fix(dependencies): remove old or indirect peer dependencies
fix(dependencies): remove old or indirect peer dependencies
955614ec0f6640685fdf2aad8107e7e0673ce190
--- __tests__/screens/TabsScreen/TabsScreenTest.tsx @@ -11,8 +11,8 @@ describe('TabScreenTest', () => { 'myTeam.tabs' >; - //TODO: This test case is incomplete - it('should render tabs screen with expected elements', () => { + //TODO: Extract test harness into external dependency and then re-enable this test + it.skip('should render tabs screen with expected elements', () => { const tabScreen = renderWithProviders( <TabsScreen navigation={mockNavigation} />, );
adding note to extract test harness
adding note to extract test harness
a05cfe7b0899664e1c088caa6d22a91793c52dfb
--- package.json @@ -123,7 +123,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "2.4.3", "@walmart/myteam-mini-app": "3.1.0", - "@walmart/native-rfid-scanner": "4.0.22", + "@walmart/native-rfid-scanner": "4.1.3", "@walmart/onewalmart-miniapp": "1.0.27", "@walmart/online-w4-mini-app": "0.8.1", "@walmart/pay-stub-miniapp": "0.24.3", @@ -143,7 +143,7 @@ "@walmart/receipt-check-miniapp": "1.32.4", "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.17.4", - "@walmart/rfid-scan-mini-app": "2.10.4", + "@walmart/rfid-scan-mini-app": "2.12.8", "@walmart/rn-mobile-sdk-pairing": "2.1.8", "@walmart/rn-receiving-mini-app": "2.4.101", "@walmart/roster-mini-app": "3.3.0", --- yarn.lock @@ -7635,7 +7635,7 @@ __metadata: "@walmart/moment-walmart": "npm:1.0.4" "@walmart/money-auth-shared-components": "npm:2.4.3" "@walmart/myteam-mini-app": "npm:3.1.0" - "@walmart/native-rfid-scanner": "npm:4.0.22" + "@walmart/native-rfid-scanner": "npm:4.1.3" "@walmart/onewalmart-miniapp": "npm:1.0.27" "@walmart/online-w4-mini-app": "npm:0.8.1" "@walmart/pay-stub-miniapp": "npm:0.24.3" @@ -7655,7 +7655,7 @@ __metadata: "@walmart/receipt-check-miniapp": "npm:1.32.4" "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.17.4" - "@walmart/rfid-scan-mini-app": "npm:2.10.4" + "@walmart/rfid-scan-mini-app": "npm:2.12.8" "@walmart/rn-mobile-sdk-pairing": "npm:2.1.8" "@walmart/rn-receiving-mini-app": "npm:2.4.101" "@walmart/roster-mini-app": "npm:3.3.0" @@ -7979,13 +7979,14 @@ __metadata: languageName: node linkType: hard -"@walmart/native-rfid-scanner@npm:4.0.22": - version: 4.0.22 - resolution: "@walmart/native-rfid-scanner@npm:4.0.22::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fnative-rfid-scanner%2F-%2F%40walmart%2Fnative-rfid-scanner-4.0.22.tgz" +"@walmart/native-rfid-scanner@npm:4.1.3": + version: 4.1.3 + resolution: "@walmart/native-rfid-scanner@npm:4.1.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fnative-rfid-scanner%2F-%2F%40walmart%2Fnative-rfid-scanner-4.1.3.tgz" peerDependencies: + expo: "*" react: "*" react-native: "*" - checksum: 10c0/9c5dae465130cebe7af23d316abfcf8a2709d96a44997814a2f312cda8990a1aa60ce638bdb9f1861dfac667a9dd61d73e8eae8770b44bad5b43979b94f80057 + checksum: 10c0/418106b6e3110e1ba1667e709565d07bd2db40007e85a1cfeabc0e1fa90c2702686d0180509c0781dac5cbf47236fa401218bf41d59625e02af90af16fe6e654 languageName: node linkType: hard @@ -8245,36 +8246,42 @@ __metadata: languageName: node linkType: hard -"@walmart/rfid-scan-mini-app@npm:2.10.4": - version: 2.10.4 - resolution: "@walmart/rfid-scan-mini-app@npm:2.10.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Frfid-scan-mini-app%2F-%2F%40walmart%2Frfid-scan-mini-app-2.10.4.tgz" +"@walmart/rfid-scan-mini-app@npm:2.12.8": + version: 2.12.8 + resolution: "@walmart/rfid-scan-mini-app@npm:2.12.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Frfid-scan-mini-app%2F-%2F%40walmart%2Frfid-scan-mini-app-2.12.8.tgz" peerDependencies: + "@react-navigation/elements": ">=1.0.0" "@react-navigation/native": ">=6.0.0" "@react-navigation/stack": ">=6.1.0" + "@reduxjs/toolkit": ">=1.9.7" "@shopify/flash-list": ">=1.6.4" - "@walmart/allspark-foundation": ">=6.19.1" + "@walmart/allspark-foundation": ">=6.45.2" "@walmart/allspark-utils": ">=6.5.0" "@walmart/gtp-shared-components": ">=2.2.6" "@walmart/ims-print-services-ui": ">=2.10.3" - "@walmart/native-rfid-scanner": ">=4.0.22" - "@walmart/react-native-scanner-3.0": ">=0.10.0" - "@walmart/ui-components": ">=1.20.4" + "@walmart/native-rfid-scanner": ">=4.1.3" + "@walmart/ui-components": ">=1.24.1" + axios: ">=1.0.0" + expo: "*" + expo-haptics: ">=14.0.0" expo-image: ">=1.10.0" expo-keep-awake: ">=13.0.0" + i18next: ">=20.0.0" + lodash: ">=4.0.0" luxon: ">=1.28.0" react: "*" - react-i18next: ">=13.3.1" react-native: "*" - react-native-ble-manager: ">=11.0.4" - react-native-haptic-feedback: ">=1.14.0" + react-native-ble-manager: ">=11.6.1" react-native-new-snap-carousel: ">=3.9.3" react-native-reanimated: ">=3.10.0" react-native-safe-area-context: ">=4.8.2" react-redux: ">=8.0.4" redux: ">=4.1.2" + redux-saga: ">=1.0.0" + reduxsauce: ">=1.0.0" reselect: ">=4.0.0" uuid: ">=3.3.2" - checksum: 10c0/24fc15a8169621c87803cd9add9333abdb6a35e31666a2efca25afc11b965fff4848fa231b7f5c2f19d9e2943cb315586a46146a85360885f9ece67c659436ba + checksum: 10c0/ef1367643cb3d98f8ff5f8153ed2381a07b3f5366700c3aece851fa66a46b7132c9bc8afe306688384f517f5026de4396c3b0a8a5d8fbdfc1e00ec8dc9c3bba0 languageName: node linkType: hard
feat(rfid): RFIDSI-2504 drop 32 package bumps (#4433)
feat(rfid): RFIDSI-2504 drop 32 package bumps (#4433) Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
af2a53b761ba8ef3c19d022f6cb9c256a5e82b3c
--- __tests__/screens/RosterDetailScreen.test.tsx @@ -92,9 +92,9 @@ const mockNavigation = jest.fn(); allTeamsOfStore: [], })); -(StoreManagerExperienceSelectors.getSelectedTeamIDs as jest.Mock).mockReturnValue([ - '1000333', -]); +( + StoreManagerExperienceSelectors.getSelectedTeamIDs as jest.Mock +).mockReturnValue(['1000333']); ( StoreManagerExperienceSelectors.getSelectedTeamPreference as jest.Mock ).mockReturnValue('Stocking ON'); --- src/screens/AllTeamsScreen/StoreAllTeamsScreen.tsx @@ -6,7 +6,7 @@ import { TOTAL_STORE_TEAM_ID, TOTAL_STORE_TEAM_LABEL, ErrorScreen, - TeamListItem + TeamListItem, } from '@walmart/allspark-foundation-hub'; import {allTeamsScreenStyles as styles} from './styles'; import {rosterDetailScreenStyles as borrowedStyles} from '../RosterDetailScreen/styles';
Update the test changes
Update the test changes
2704dbf1c3fed8e9667be4945ff71d8fd7ede282
--- package.json @@ -171,7 +171,7 @@ "@walmart/schedule-mini-app": "5.4.4", "@walmart/shelfavailability-mini-app": "1.7.2", "@walmart/shop-gnfr-mini-app": "1.0.454", - "@walmart/sidekick-mini-app": "patch:@walmart/sidekick-mini-app@npm%3A4.275.2%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Fsidekick-mini-app%252F-%252F%2540walmart%252Fsidekick-mini-app-4.275.2.tgz#~/.yarn/patches/@walmart-sidekick-mini-app-npm-4.275.2-ae9ff75ac4.patch", + "@walmart/sidekick-mini-app": "patch:@walmart/sidekick-mini-app@npm%3A4.275.2#~/.yarn/patches/@walmart-sidekick-mini-app-npm-4.275.2-ae9ff75ac4.patch", "@walmart/store-feature-orders": "1.35.6", "@walmart/talent-performance-mini-app": "1.2.7", "@walmart/talent-preboarding-mini-app": "1.0.63", --- yarn.lock @@ -8940,7 +8940,7 @@ __metadata: "@walmart/schedule-mini-app": "npm:5.4.4" "@walmart/shelfavailability-mini-app": "npm:1.7.2" "@walmart/shop-gnfr-mini-app": "npm:1.0.454" - "@walmart/sidekick-mini-app": "npm:4.275.2" + "@walmart/sidekick-mini-app": "patch:@walmart/sidekick-mini-app@npm%3A4.275.2#~/.yarn/patches/@walmart-sidekick-mini-app-npm-4.275.2-ae9ff75ac4.patch" "@walmart/store-feature-orders": "npm:1.35.6" "@walmart/talent-performance-mini-app": "npm:1.2.7" "@walmart/talent-preboarding-mini-app": "npm:1.0.63" @@ -9893,6 +9893,31 @@ __metadata: languageName: node linkType: hard +"@walmart/sidekick-mini-app@patch:@walmart/sidekick-mini-app@npm%3A4.275.2#~/.yarn/patches/@walmart-sidekick-mini-app-npm-4.275.2-ae9ff75ac4.patch": + version: 4.275.2 + resolution: "@walmart/sidekick-mini-app@patch:@walmart/sidekick-mini-app@npm%3A4.275.2%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Fsidekick-mini-app%252F-%252F%2540walmart%252Fsidekick-mini-app-4.275.2.tgz#~/.yarn/patches/@walmart-sidekick-mini-app-npm-4.275.2-ae9ff75ac4.patch::version=4.275.2&hash=6ce2d9" + peerDependencies: + "@apollo/client": "*" + "@react-navigation/native": ^6.0.0 + "@react-navigation/stack": ">=6" + "@walmart/allspark-foundation": ">=6.32.0" + "@walmart/allspark-utils": ">=6" + "@walmart/gtp-shared-components-3": "*" + expo: ~51.0.0 + expo-constants: ~16.0.0 + expo-image: ~1.13.0 + expo-linear-gradient: ~12.3.0 + react: "*" + react-native: "*" + react-native-wm-config: 0.1.1 + redux: "*" + dependenciesMeta: + "@walmart/me-at-walmart": + built: false + checksum: 10c0/10ebc3d11ea85fbd5a8ec7114249881dc8ce794d763f20ccc3c59d75b8cf993a0fbe0101ca03eb3e242bef2459cec44743d6d1da1b1c150bd8aac246c4d21f5d + languageName: node + linkType: hard + "@walmart/store-feature-orders@npm:1.35.6": version: 1.35.6 resolution: "@walmart/store-feature-orders@npm:1.35.6::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fstore-feature-orders%2F-%2F%40walmart%2Fstore-feature-orders-1.35.6.tgz"
feat(vqa): update package.json
feat(vqa): update package.json
a343d77b5eb5bab1f05f52b41239a76b31a4d646
--- src/screens/ImagePreviewScreen.tsx @@ -49,7 +49,7 @@ export const ImagePreviewScreen: FC<ImagePreviewScreenProps> = (props) => { <CloseIcon size={24} /> </TouchableOpacity> <FastImage - resizeMode='cover' + resizeMode='contain' source={imageSource} style={styles.itemImage} onLoadEnd={useCallback(() => setLoading(false), [])} --- src/screens/ImagePreviewScreen.tsx @@ -49,7 +49,7 @@ export const ImagePreviewScreen: FC<ImagePreviewScreenProps> = (props) => { <CloseIcon size={24} /> </TouchableOpacity> <FastImage - resizeMode='cover' + resizeMode='contain' source={imageSource} style={styles.itemImage} onLoadEnd={useCallback(() => setLoading(false), [])}
update image resize mode
update image resize mode
ec4fdd2dcab43a03071ad51cac25169234f1adbc
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/EditSavedTeamModal/EditSavedTeamsModal.tsx @@ -9,9 +9,12 @@ import { import { EditTeamSelectionListItem } from '../../../Shared/Components/EditTeamListItem/EditTeamListItem'; import { modalStyles } from './styles'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; -import { FEATURE_ID } from '../../constant'; +import { FEATURE_ID, PLATFORM_NAME } from '../../constant'; import { ActionButtonGroup } from '../../../Shared/Components/ActionButtonGroup'; import { useDispatch, useSelector } from 'react-redux'; +import { AllsparkEnvironment } from '@walmart/allspark-foundation/Environment'; +import { getVersion } from 'react-native-device-info'; +import { useUpsertSupplyChainAssociatePreferenceMutation } from '@walmart/me-at-walmart-athena-queries'; import { ManagerExperienceCreators, ManagerExperienceSelectors, @@ -19,6 +22,7 @@ import { import { useGetSupplyChainAllTeamsBySite } from '../../Hooks/useGetSupplyChainTeamsByStore'; import { AllTeamsSections } from './types'; import { useFocusEffect } from '@react-navigation/native'; +import { UserSelectors } from '@walmart/allspark-foundation/User'; export interface ModalProps { modal: { @@ -31,16 +35,33 @@ export const EditSavedTeamsModal = ({ modal }: ModalProps) => { const { t } = useAllsparkTranslation(FEATURE_ID); const { closeModal } = modal; const dispatch = useDispatch(); + const site = useSelector(UserSelectors.getWorkingSite); + const win = useSelector(UserSelectors.getWin); const [input, setInput] = useState(''); const { allSiteTeamsSections } = useGetSupplyChainAllTeamsBySite(); - + const [upsertSupplyChainAssociatePreferenceMutation] = + useUpsertSupplyChainAssociatePreferenceMutation({ + context: { + headers: { + 'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId, + 'x-o-platform': PLATFORM_NAME, + 'x-o-platform-version': getVersion(), + }, + }, + onCompleted: () => {}, + onError: () => {}, + }); const prevSelectedTeamIds = (useSelector(ManagerExperienceSelectors.getSelectedTeamIDs) as string[]) || []; + const prevSelectedShiftIds = + useSelector(ManagerExperienceSelectors.getSelectedShifts) || []; const [selectedTeams, setSelectedTeams] = useState<string[]>(prevSelectedTeamIds); + const [selectedShifts, setselectedShifts] = + useState<string[]>(prevSelectedShiftIds); const [sections, setSearchedsections] = useState<AllTeamsSections[]>([]); useFocusEffect( @@ -56,18 +77,18 @@ export const EditSavedTeamsModal = ({ modal }: ModalProps) => { ); const handleSearchInput = useCallback( - (input: string) => { - setInput(input); - if (input.length > 2) { + (inp: string) => { + setInput(inp); + if (inp.length > 2) { const searched = allSiteTeamsSections.filter((t: AllTeamsSections) => - t.title.toLowerCase().includes(input.toLowerCase()) + t.title.toLowerCase().includes(inp.toLowerCase()) ); setSearchedsections(searched); } else { setSearchedsections(allSiteTeamsSections); } }, - [allSiteTeamsSections, input] + [allSiteTeamsSections] ); const handleSelection = useCallback( @@ -86,8 +107,37 @@ export const EditSavedTeamsModal = ({ modal }: ModalProps) => { const handleSaveButton = useCallback(() => { dispatch(ManagerExperienceCreators.updateSelectedTeamIDs(selectedTeams)); + upsertSupplyChainAssociatePreferenceMutation({ + variables: { + associatePreferencesInput: { + walmartIdentificationNumber: String(win), + meAtWalmartPreferences: { + managerExperiencePreferences: { + mySupplyChainTeams: { + businessUnitNumber: Number(site), + // shiftCodePreference: selectedShifts, + supplyChainTeamPreference: selectedTeams.map((teamId) => ({ + businessUnitNumber: Number(site), + countryCode: 'US', + teamId: teamId, + })), + }, + }, + }, + }, + businessUnitNumber: Number(site), + }, + }); closeModal(); - }, [selectedTeams]); + }, [ + dispatch, + selectedTeams, + upsertSupplyChainAssociatePreferenceMutation, + win, + site, + closeModal, + selectedShifts, + ]); return ( <>
Adding EditSaveTeamsModal changes
Adding EditSaveTeamsModal changes
2b44f39a6c83cc750b85fde6c0abbd6e90ecf0ca
--- .looper.multibranch.yml @@ -176,7 +176,7 @@ envs: variables: env: "prod" teamsEnvIcon: "https://e7.pngegg.com/pngimages/136/244/png-clipart-super-mario-advance-4-super-mario-bros-3-super-mario-3d-land-raccoon-mammal-animals.png" - KEYCHAIN_PW: ENC[CzuQbFvci0/8hOPTitcu8w==] + KEYCHAIN_PW: "%{credentials.secret('app-store-keychain-pw')}" KEYCHAIN_NAME: "AppStore.keychain-db" PROVISIONING_PROFILE: ./BuildSupport/Squiggly_AppStore_Provision.mobileprovision ENTITLEMENTS: './BuildSupport/ExportOptionsProd.plist'
Update .looper.multibranch.yml
Update .looper.multibranch.yml
ceea2f13407b2f5bf8c7dea6743e76b8aa7996a2
--- package.json @@ -69,7 +69,7 @@ "@react-navigation/stack": "^6.2.0", "@reduxjs/toolkit": "^1.9.7", "@sharcoux/slider": "^6.1.1", - "@shopify/flash-list": "1.7.1", + "@shopify/flash-list": "1.7.3", "@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.4.1", "@walmart/allspark-cope-key-listener": "0.0.18", @@ -160,22 +160,22 @@ "axios-cache-interceptor": "patch:axios-cache-interceptor@npm%3A1.5.1#~/.yarn/patches/axios-cache-interceptor-npm-1.5.1-c84dd3f9ed.patch", "crypto-js": "~4.2.0", "dayjs": "^1.11.5", - "expo": "^52.0.0", + "expo": "~52.0.33", "expo-asset": "~11.0.3", "expo-av": "~15.0.2", "expo-build-properties": "~0.13.2", "expo-constants": "~17.0.5", "expo-font": "~13.0.3", - "expo-image": "~2.0.4", + "expo-image": "~2.0.5", "expo-linear-gradient": "~14.0.2", "expo-linking": "~7.0.5", "expo-local-authentication": "~15.0.2", - "expo-secure-store": "~13.0.2", + "expo-secure-store": "~14.0.1", "expo-sharing": "~13.0.1", "expo-splash-screen": "~0.29.21", "expo-status-bar": "~2.0.1", "expo-store-review": "~8.0.1", - "expo-system-ui": "~4.0.7", + "expo-system-ui": "~4.0.8", "graphql": "^16.8.1", "i18n-iso-countries": "^7.5.0", "i18next": "^23.6.0", @@ -193,7 +193,7 @@ "react-dom": "18.3.1", "react-hook-form": "^7.51.0", "react-i18next": "^13.3.1", - "react-native": "0.76.6", + "react-native": "0.76.7", "react-native-app-auth": "7.2.0", "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", @@ -219,8 +219,8 @@ "react-native-maps": "1.18.0", "react-native-mask-input": "^1.2.3", "react-native-new-snap-carousel": "^3.9.3", - "react-native-pager-view": "6.5.1", "react-native-nfc-manager": "3.16.1", + "react-native-pager-view": "6.5.1", "react-native-pdf": "^6.7.5", "react-native-permissions": "^3.10.1", "react-native-popup-menu": "^0.16.0", @@ -413,4 +413,4 @@ "react-native-calendars": "^1.1291.0", "react-native-modal@npm:^13.0.1": "patch:react-native-modal@npm%3A13.0.1#~/.yarn/patches/react-native-modal-npm-13.0.1-f1a75332f0.patch" } -} \ No newline at end of file +} --- tsconfig.json @@ -4,11 +4,13 @@ "strict": true, "baseUrl": ".", "paths": { - "@/*": ["src/*"] + "@/*": [ + "src/*" + ] } }, "include": [ "**/*.ts", "**/*.tsx" ] -} +} \ No newline at end of file
chore: update versions from expo install check
chore: update versions from expo install check
7764cbe38bffff70f3e9c9e674aea83952e2b01e
--- package.json @@ -177,7 +177,7 @@ "@walmart/talent-preboarding-mini-app": "1.0.63", "@walmart/talent-preboarding-shared-utils": "^0.1.114", "@walmart/taskit-mini-app": "5.52.12", - "@walmart/time-clock-feature-app": "1.0.1", + "@walmart/time-clock-feature-app": "1.0.2", "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.13#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.13-d3039974f6.patch", "@walmart/timesheet-feature-app": "0.2.0", "@walmart/topstock-mini-app": "1.28.19", --- yarn.lock @@ -8911,7 +8911,7 @@ __metadata: "@walmart/talent-preboarding-mini-app": "npm:1.0.63" "@walmart/talent-preboarding-shared-utils": "npm:^0.1.114" "@walmart/taskit-mini-app": "npm:5.52.12" - "@walmart/time-clock-feature-app": "npm:1.0.1" + "@walmart/time-clock-feature-app": "npm:1.0.2" "@walmart/time-clock-mini-app": "patch:@walmart/time-clock-mini-app@npm%3A3.19.13#~/.yarn/patches/@walmart-time-clock-mini-app-npm-3.19.13-d3039974f6.patch" "@walmart/timesheet-feature-app": "npm:0.2.0" "@walmart/topstock-mini-app": "npm:1.28.19" @@ -9995,9 +9995,9 @@ __metadata: languageName: node linkType: hard -"@walmart/time-clock-feature-app@npm:1.0.1": - version: 1.0.1 - resolution: "@walmart/time-clock-feature-app@npm:1.0.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftime-clock-feature-app%2F-%2F%40walmart%2Ftime-clock-feature-app-1.0.1.tgz" +"@walmart/time-clock-feature-app@npm:1.0.2": + version: 1.0.2 + resolution: "@walmart/time-clock-feature-app@npm:1.0.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Ftime-clock-feature-app%2F-%2F%40walmart%2Ftime-clock-feature-app-1.0.2.tgz" peerDependencies: "@react-native-community/datetimepicker": "*" "@walmart/allspark-foundation": ">=6.32.0" @@ -10014,7 +10014,7 @@ __metadata: react-native-wifi-reborn: "*" uuid: ^3.3.2 wfm-allspark-data-library: ">=7.0.0" - checksum: 10c0/48c4fa74a4750f25390e70f9d7dc4c6ffa12bc4580f25fa4641de9d0ae829934371a7ae26770b23898ccbf4a83d3a35eadefe1a9924b7fb9ae6388e5a9ba7e7f + checksum: 10c0/776e018301b490b3f646b3940724095abf270fc05ddc6edf997b585fc6726434565056b1871d4eeb4f3d80ed97e779078d27998f4e7087376153b1ac3ee9011a languageName: node linkType: hard
fix(GTA-168422): Bumped Version of Time clock feature app (#5394)
fix(GTA-168422): Bumped Version of Time clock feature app (#5394) Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com> Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com>
537653a5ea43330f2e235714478b76913b936d95
--- .looper.yml @@ -56,7 +56,7 @@ branches: flows: default: - - call: pr + - call: branch installDependencies: - (name Yarn Install) corepack enable @@ -82,8 +82,16 @@ flows: - call: installDependencies - (name Lint) npm run lint - call: testPackages + - call: coverage - call: sonar-fetch-remote-fix-ref - - call: sonar + - call: sonar-pr + + branch: + - call: installDependencies + - (name Lint) npm run lint + - call: testPackages + - call: coverage + - call: sonar-branch push: - call: publishFromChanges @@ -125,8 +133,10 @@ flows: - call: preparePublish - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --registry ${REPOSOLNS_NPM_REPO} --yes --conventional-graduate - sonar: - - call: coverage + sonar-branch: + - sonar("Sonar"): sonar-scanner -X -Dproject.settings=sonar-project.properties + + sonar-pr: - sonar("Sonar"): sonar-scanner -X -Dproject.settings=sonar-project.properties -Dsonar.pullrequest.github.repository=allspark/allspark -Dsonar.pullrequest.key=${GITHUB_PR_NUMBER} -Dsonar.pullrequest.branch=${GITHUB_PR_SOURCE_BRANCH} -Dsonar.pullrequest.base=${GITHUB_PR_TARGET_BRANCH} -Dsonar.scm.revision=${GITHUB_PR_HEAD_SHA} sonar-fetch-remote-fix-ref: @@ -137,5 +147,4 @@ flows: then git fetch --no-tags origin ${GITHUB_PR_TARGET_BRANCH}:refs/remotes/origin/${GITHUB_PR_TARGET_BRANCH} git checkout -b remotes/origin/pr/${GITHUB_PR_NUMBER} - git branch -D ${GITHUB_PR_TARGET_BRANCH} fi
chore(config): add sonar branch check (#236)
chore(config): add sonar branch check (#236) * chore(config): add sonar branch check * chore: fix remote ref
b49f09d1d94a7fe727f5fb51c0cf121a4379a5e7
--- .yarn/patches/@walmart-react-native-webex-sdk-npm-0.8.53-3638e0f32a.patch --- package.json @@ -141,7 +141,7 @@ "@walmart/react-native-shared-navigation": "~6.3.28", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.8.0", - "@walmart/react-native-webex-sdk": "0.8.53", + "@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.8.53#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.8.53-3638e0f32a.patch", "@walmart/receipt-check-miniapp": "1.32.4", "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.17.8", --- yarn.lock @@ -8588,7 +8588,7 @@ __metadata: "@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.8.0" - "@walmart/react-native-webex-sdk": "npm:0.8.53" + "@walmart/react-native-webex-sdk": "patch:@walmart/react-native-webex-sdk@npm%3A0.8.53#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.8.53-3638e0f32a.patch" "@walmart/receipt-check-miniapp": "npm:1.32.4" "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.17.8" @@ -9137,6 +9137,17 @@ __metadata: languageName: node linkType: hard +"@walmart/react-native-webex-sdk@patch:@walmart/react-native-webex-sdk@npm%3A0.8.53#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.8.53-3638e0f32a.patch": + version: 0.8.53 + resolution: "@walmart/react-native-webex-sdk@patch:@walmart/react-native-webex-sdk@npm%3A0.8.53%3A%3A__archiveUrl=https%253A%252F%252Fnpm.ci.artifacts.walmart.com%253A443%252Fartifactory%252Fapi%252Fnpm%252Fnpme-npm%252F%2540walmart%252Freact-native-webex-sdk%252F-%252F%2540walmart%252Freact-native-webex-sdk-0.8.53.tgz#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.8.53-3638e0f32a.patch::version=0.8.53&hash=f42a59" + peerDependencies: + react: "*" + react-native: "*" + react-native-logger: "*" + checksum: 10c0/b667310909b77b1f7f1e00206a06a929ffad22c4ff1be96692325b8b80ee7f5aece6183e0d0f883aad92f4b91f2cc5c953147a7c96c5f659d3641239b4f0d38e + languageName: node + linkType: hard + "@walmart/receipt-check-miniapp@npm:1.32.4": version: 1.32.4 resolution: "@walmart/receipt-check-miniapp@npm:1.32.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freceipt-check-miniapp%2F-%2F%40walmart%2Freceipt-check-miniapp-1.32.4.tgz"
fix: webex patch not getting applied (#4607)
fix: webex patch not getting applied (#4607)
cb74e270dcb656310ceecc44e510c07405a96eb0
--- src/components/Roster/Roster.tsx @@ -13,7 +13,11 @@ import { useUserIsInRoster, } from '../../hooks'; import {isNil} from 'lodash'; -import {sortedAssociateList} from '../../utils'; +import { + associateIsAbsent, + associateIsClockedIn, + sortedAssociateList, +} from '../../utils'; import {useSelector} from 'react-redux'; import {teamLeadJobDescriptions} from '../../redux/selectors'; import {logger} from '../../logger/Logger'; @@ -24,6 +28,7 @@ import {useTranslation} from 'react-i18next'; import {ROSTER_I18N_NAMESPACE} from '../../translations'; import {UserSelectors} from '@walmart/redux-store'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; +import {FilterValue, RosterFilters} from '../../containers/RosterFilters'; //TODO: States to verify: No Data, Loading, Error (identify all types of errors), Success export const Roster: React.FC<RosterProps> = (props) => { @@ -38,9 +43,19 @@ export const Roster: React.FC<RosterProps> = (props) => { const shouldSkipQuery = !isNil(rosterDataOverride); const [associates, setAssociates] = useState<AssociateRosterItem[]>([]); const [isRefreshing, setIsRefreshing] = useState(false); + const clockedInCount = associates.filter(associateIsClockedIn)?.length ?? 0; + const absentCount = associates.filter(associateIsAbsent)?.length ?? 0; const loaderOffset = 10; const currentUserSite: string = useSelector(UserSelectors.getUserSite); const userIsInRoster = useUserIsInRoster(); + const selectedFilter = useRef<FilterValue>(FilterValue.all); + const onFilter = ( + filteredAssociates: AssociateRosterItem[], + filterId: FilterValue, + ) => { + selectedFilter.current = filterId; + setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); + }; const {bottom: bottomInset} = useSafeAreaInsets(); const flashListRef: any = useRef(null); const { @@ -132,6 +147,12 @@ export const Roster: React.FC<RosterProps> = (props) => { <FlashList ListHeaderComponent={ <> + <RosterFilters + associates={associates} + clockedInCount={clockedInCount} + absentCount={absentCount} + onFilter={onFilter} + /> {!loadingDailyRoster && !userIsInRoster && ( <Alert variant='warning' UNSAFE_style={styles.error}> {t('rosterScreen.notInRoster', { --- src/containers/RosterFilters.tsx @@ -11,6 +11,7 @@ import { import {useTranslation} from 'react-i18next'; import {ROSTER_I18N_NAMESPACE} from '../translations'; import {useRbacConfigWithJobCode} from '../hooks'; +import {AssociateRosterItem} from '../components/Roster/types'; const styles = StyleSheet.create({ container: { @@ -27,7 +28,6 @@ export enum FilterValue { absent = 'absent', tardy = 'tardy', clockedIn = 'clockedIn', - online = 'online', } // ChipGroup emits index of selected chip rather than id, so mapping @@ -38,7 +38,6 @@ const filterMapSalaried = { '1': FilterValue.absent, '2': FilterValue.tardy, '3': FilterValue.clockedIn, - '4': FilterValue.online, }; const filterMapHourly = { @@ -49,92 +48,21 @@ const filterMapHourly = { //TODO: File setup for presence integration re-architecture export const RosterFilters = (props: { absentCount: number | null; - associates: Associate[]; - onFilter: (filteredAssociates: Associate[], filterId: FilterValue) => void; + associates: AssociateRosterItem[]; + onFilter: ( + filteredAssociates: AssociateRosterItem[], + filterId: FilterValue, + ) => void; clockedInCount: number | null; }) => { const {absentCount, associates, clockedInCount, onFilter} = props; const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); - // const offlineUserIds = useOfflineIds(); - // const viewerId = useSelector(getEncryptedUserId); const isAllFilterChipsVisible: boolean = useRbacConfigWithJobCode(); // Used for reference, does not need to trigger render const selectedFilter = useRef<FilterValue>(FilterValue.all); - /** - * Determine if associate is online, firestore ids are encrypted so have - * to encrypt user id to find a match - */ - // const isOnline = (associate: Associate) => { - // return ( - // associateIsClockedIn(associate) && - // !offlineUserIds.includes(encryptUserId(associate?.win?.toString() ?? '')) - // ); - // }; - - /** - * If online users change while is the filter, update the associate list - */ - // useEffect(() => { - // if (selectedFilter.current === FilterValue.online) { - // onFilter(associates.filter(isOnline), selectedFilter.current); - // } - // }, [offlineUserIds]); - - /** - * Count of associates statuses we use as filters, recalculated - * when the length of the list changes - */ - // const rosterCounts = useMemo( - // () => - // associates.reduce( - // (accm, associate) => { - // if (associateIsClockedIn(associate)) { - // accm.clockedIn++; - // } - // if (associateIsAbsent(associate)) { - // accm.absent++; - // } - // if (associateIsTardy(associate)) { - // accm.tardy++; - // } - // - // return accm; - // }, - // { - // [FilterValue.all]: associates.length, - // [FilterValue.absent]: 0, - // [FilterValue.tardy]: 0, - // [FilterValue.clockedIn]: 0, - // }, - // ), - // [associates.length], - // ); - - /** - * The filter counts we pass to our filter component, includes available count which - * is monitored through a firestore snapshot. Merging its values seperately from rosterCounts - * so that presence changes don't trigger recalculation of other statuses - */ - // const counts = useMemo(() => { - // const onlineForAssociates = associates.filter((associate) => { - // const encryptedId = encryptUserId(associate.associateId!); - // if (encryptedId === viewerId) { - // return false; - // } - // return ( - // associateIsClockedIn(associate) && !offlineUserIds.includes(encryptedId) - // ); - // }); - // - // return { - // ...rosterCounts, - // [FilterValue.online]: onlineForAssociates.length, - // }; - // }, [rosterCounts, offlineUserIds]); - /** * When filter is selected, filter the entire associates list and set matches * to be the current asssociates list @@ -163,9 +91,6 @@ export const RosterFilters = (props: { return associateIsTardy(associate); case FilterValue.clockedIn: return associateIsClockedIn(associate); - case FilterValue.online: - return true; - // return isOnline(associate); default: return true; } @@ -186,12 +111,6 @@ export const RosterFilters = (props: { {t('rosterScreen.filters.absent')} </Chip> )} - {/*{isAllFilterChipsVisible && (*/} - {/* <Chip id={FilterValue.tardy} testID='rosterScreenTardyChip'>*/} - {/* {counts.tardy ? counts.tardy + ' ' : ''}*/} - {/* {t('rosterScreen.filters.tardy')}*/} - {/* </Chip>*/} - {/*)}*/} <Chip id={FilterValue.clockedIn} testID='rosterScreenClockedInChip'> {clockedInCount ? clockedInCount + ' ' : ''} {t('rosterScreen.filters.clockedIn')}
updating roster
updating roster
6b1bd5cc0c2f364a9192c544445bd2de1759855e
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 119 + versionCode 120 versionName "1.0.9" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>119</string> + <string>120</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key>
Incrementing build number
Incrementing build number
b47cb340978f6e562365f88daa401d67560978da
--- package.json @@ -98,7 +98,7 @@ "@walmart/avp-feature-app": "0.28.42", "@walmart/avp-shared-library": "0.27.24", "@walmart/ax-components": "1.2.3", - "@walmart/backroom-mini-app": "1.17.9", + "@walmart/backroom-mini-app": "1.17.10", "@walmart/beneficiary-online-mini-app": "0.1.26", "@walmart/beneficiary-online-shared-library": "1.2.7", "@walmart/calling-mini-app": "0.8.32", --- yarn.lock @@ -7602,9 +7602,9 @@ __metadata: languageName: node linkType: hard -"@walmart/backroom-mini-app@npm:1.17.9": - version: 1.17.9 - resolution: "@walmart/backroom-mini-app@npm:1.17.9::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fbackroom-mini-app%2F-%2F%40walmart%2Fbackroom-mini-app-1.17.9.tgz" +"@walmart/backroom-mini-app@npm:1.17.10": + version: 1.17.10 + resolution: "@walmart/backroom-mini-app@npm:1.17.10::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fbackroom-mini-app%2F-%2F%40walmart%2Fbackroom-mini-app-1.17.10.tgz" peerDependencies: "@react-navigation/native": ^7.0.0 "@react-navigation/stack": ^7.1.0 @@ -7626,7 +7626,7 @@ __metadata: react-native-svg-transformer: ">=1.0.0" react-redux: ">=8.0.0" redux: ">=4.0.0" - checksum: 10c0/c09dc00534e37ca6cac28eb1812f5ac5bf3fce193233fe41af1fdb87344cc2dbb6b231c10f53d635f6bde9720902c4d3bf9b2b265f6ac947825ed8eb2935477e + checksum: 10c0/2cca156f52c4d3e549efbb31111b4934bc8716f5624cf5aecf7ce0a6198fb879ae289e3b236a3b7aad3bf0a2f5786c9a34a322ffe00bce5ff51098ce1f55ded5 languageName: node linkType: hard @@ -8468,7 +8468,7 @@ __metadata: "@walmart/avp-feature-app": "npm:0.28.42" "@walmart/avp-shared-library": "npm:0.27.24" "@walmart/ax-components": "npm:1.2.3" - "@walmart/backroom-mini-app": "npm:1.17.9" + "@walmart/backroom-mini-app": "npm:1.17.10" "@walmart/beneficiary-online-mini-app": "npm:0.1.26" "@walmart/beneficiary-online-shared-library": "npm:1.2.7" "@walmart/calling-mini-app": "npm:0.8.32"
feat: Upgrade backroom-mini-app to 1.17.10 (#5231)
feat: Upgrade backroom-mini-app to 1.17.10 (#5231) Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
b784a55b5b87c823be780dc7cc34a19397664627
--- __tests__/components/SearchHeaderTest.tsx @@ -1,12 +1,12 @@ import React from 'react'; -import {fireEvent, waitFor} from '@testing-library/react-native'; +import {fireEvent} from '@testing-library/react-native'; import { SearchHeaderBase, SearchHeaderRight, SearchIcon, } from '../../src/components/SearchHeader'; import {renderWithProviders, simulatedUser} from '../harness'; -import {useDispatch, useSelector} from 'react-redux'; +import {useDispatch} from 'react-redux'; jest.mock('react-redux', () => ({ ...jest.requireActual('react-redux'), @@ -71,25 +71,8 @@ describe('SearchHeader tests', () => { await simulatedUser.press(cancelButton); expect(searchInput.props.value).toBe(''); }); - - it('should call useEffect on text input change', async () => { - const mockDispatch = jest.fn(); - const mockSelector = jest.fn(); - (useDispatch as jest.Mock).mockReturnValue(mockDispatch); - (useSelector as jest.Mock).mockReturnValue(mockSelector); - const searchHeaderBase = renderWithProviders( - <SearchHeaderBase {...stackHeaderProps} />, - ); - const searchInput = searchHeaderBase.getByTestId('searchInput'); - fireEvent.changeText(searchInput, 'Test Input'); - expect(searchInput.props.value).toBe('Test Input'); - const effectSpy = jest.spyOn(React, 'useEffect'); - await waitFor(() => { - expect(effectSpy).toBeCalled(); - }); - }); }); -describe('SearchIcon, SearchHeaderRight tests', () => { +describe('SearchIcon, SearchHeaderRight component test coverage', () => { it('should render SearchIcon', () => { const searchIcon = renderWithProviders( <SearchIcon size='medium' color='red' onPress={onPressMock} />,
Removing unused imports
Removing unused imports
84c40ed81fda7b20dfe97f9041adf3a6ece4d688
--- graphql.yml @@ -83,11 +83,11 @@ applications: queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociateById.graphql' tags: - 'v1' - - name: 'getAssociatePreferences' - hash: '38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4' - queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql' - tags: - - 'v1' + # - name: "getAssociatePreferences" + # hash: "38e0530d669fff42cb1dc8e5814369c40c33f6d6a77ed734e039948a0c06e8f4" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getAssociatePreference.graphql" + # tags: + # - "v1" - name: 'getDailyRosterHome' hash: '3c492831585580bae535c3386ec48e90c2d1895450016f050653bd51ddf86c21' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getDailyRosterHome.graphql' @@ -103,18 +103,18 @@ applications: queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamByIdHome.graphql' tags: - 'v1' - - name: 'GetTeamsByStore' - hash: 'e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44' - queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql' - tags: - - 'v1' + # - name: "GetTeamsByStore" + # hash: "e500ff0792181beb5a6281effd5b5324834295856eaaa4c2af8336f6643a0a44" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/getTeamsbyStore.graphql" + # tags: + # - "v1" - name: 'upsertAssociatePreference' hash: '972c522c6ad0675f13587637cff2dd2ed46937a9878a48a66ad2bc2f7d51a036' queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateAssociatePrivacyPreference.graphql' tags: - 'v1' - - name: 'upsertManagerExperiencePreference' - hash: 'bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca' - queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql' - tags: - - 'v1' + # - name: "upsertManagerExperiencePreference" + # hash: "bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca" + # queryTemplate: "packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql" + # tags: + # - "v1"
fix: remove unwanted queries in graphql
fix: remove unwanted queries in graphql
f69e3b949c99c0afbec056dd5821efd764f4abdf
--- packages/core-services-allspark/src/appConfig/sagas.ts @@ -82,6 +82,7 @@ export function* getAppConfigScope(this: AppConfigSagaScope) { model, osVersion, employmentStatus, + isDCUser, ]: string[] = yield all([ select(SiteSelectors.getSiteCountry), select(SiteSelectors.getSiteDivisonCode), @@ -95,6 +96,7 @@ export function* getAppConfigScope(this: AppConfigSagaScope) { call(DeviceInfo.getModel), call(DeviceInfo.getSystemVersion), select(UserSelectors.getUserEmploymentStatus), + select(SiteSelectors.isSiteDistributionCenter), ]); return { @@ -112,6 +114,7 @@ export function* getAppConfigScope(this: AppConfigSagaScope) { deviceType, division: divisionNbr, employmentStatus: `${employmentStatus}`, + isDCUser, }, } as AppConfigFetchParams; }
fix: add is dc to app config scope
fix: add is dc to app config scope
a4fb9cab875bb78f0edbe849a8eaeab4035667a5
--- .looper.multibranch.yml @@ -686,25 +686,8 @@ flows: - call: prod(${branch}) otherwise: # when option 'all' is selected for env_selected - call: push(${branch}) - - native-ios: - - node(label=${NODES}): - - call: build-ios(ios) - native-android: - - call: build-android(android) - native-both: - - node(label=${NODES}): - - call: initialize - - call: metadata - - call: mini-pr - - call: incremental-build-number - - var(MULTI_BUILD=true) - # - savepoint # TBD - - parallel(failsafe): - - call: build-ios(ios) - - call: build-android(android) - +# env-wise caller flows dev: - call: native-both(dev) beta: @@ -713,6 +696,8 @@ flows: - call: native-both(teflon) prod: - call: native-both(prod) + +# os-wise & env-wise caller flows ios-dev: - call: native-ios(dev) android-dev: @@ -730,6 +715,24 @@ flows: android-prod: - call: native-android(prod) +# os-wise caller flows + native-ios: + - node(label=${NODES}): + - call: build-ios(ios) + native-android: + - call: build-android(android) + native-both: + - node(label=${NODES}): + - call: initialize + - call: metadata + - call: mini-pr + - call: incremental-build-number + - var(MULTI_BUILD=true) + # - savepoint # TBD + - parallel(failsafe): + - call: build-ios(ios) + - call: build-android(android) + initialize: - | (name Import Fastfile Template) @@ -753,8 +756,7 @@ flows: mini-pr: - (name Branch Check, silent) echo "TBD" - call: build-npm - # Seems to be removed with RN 73, overriding mini-pr flow to exclude it - # - (name Build JS Bundle) ./node_modules/.bin/react-native bundle --entry-file ./index.js --bundle-output ./bundle.js --reset-cache + - (name Build JS Bundle)./node_modules/.bin/react-native bundle --entry-file ./targets/${market}/index.js --bundle-output ./targets/${market}/bundle.js --reset-cache build-npm: - group(NPM Build): @@ -853,8 +855,7 @@ flows: (name Metadata) echo "Release Type : ${RELEASE_TYPE}" echo "Build Type : ${BUILD_TYPE}" - echo "OS : ${OS}" - echo "Proximity Repo : ${PROXIMITY_REPOSITORY}" + echo "Market : ${market}" echo "Artifactory Repo: ${ARTIFACTORY_REPOSITORY}" incremental-build-number: - | @@ -1064,7 +1065,6 @@ flows: catch: - call: appcenter-upload(appcenter) - proximity-upload: - var(artifactId = "${PROJECT}-${OS}-${ENV}") - declare(resource_not_present)
Update .looper.multibranch.yml
Update .looper.multibranch.yml
aaa315deac5cf5c59abdaa6746294db6ffbab43a
--- __tests__/__mocks__/@walmart/emergency-mini-app.js @@ -0,0 +1,3 @@ +module.exports = { + AllScreenBanner: 'AllScreenBanner', +}; --- __tests__/navigation/AssociateHallwayNav/__snapshots__/ComponentsTest.tsx.snap @@ -40,16 +40,29 @@ exports[`Badge matches snapshot when sign Off task is there 1`] = ` /> `; -exports[`Banners matches default snapshot 1`] = `null`; +exports[`Banners matches default snapshot 1`] = `<AllScreenBanner />`; exports[`Banners matches snapshot when impersonated 1`] = ` -<IndicatorBar - title="impersonation.mode" -/> +Array [ + <IndicatorBar + title="impersonation.mode" + />, + <AllScreenBanner />, +] `; -exports[`Banners matches snapshot when impersonated, but on myTeam tab 1`] = `null`; +exports[`Banners matches snapshot when impersonated, but on myTeam tab 1`] = `<AllScreenBanner />`; -exports[`Banners matches snapshot when network site mismatch 1`] = `<ChangeStoreBanner />`; +exports[`Banners matches snapshot when network site mismatch 1`] = ` +Array [ + <AllScreenBanner />, + <ChangeStoreBanner />, +] +`; -exports[`Banners matches snapshot when no connectivity 1`] = `<ConnectivityBanner />`; +exports[`Banners matches snapshot when no connectivity 1`] = ` +Array [ + <ConnectivityBanner />, + <AllScreenBanner />, +] +`;
unit test for all screen emrgency banner
unit test for all screen emrgency banner
1c5665f5f6b3ba25ce00228a236c9157a64c965a
--- ios/Podfile.lock @@ -526,14 +526,14 @@ PODS: - AppAuth - Starscream (3.0.6) - StructuredLogAssistantIOS (0.0.6) - - SumoSDK (2.0.0-beta-9): + - SumoSDK (2.0.0-rc.1): - Apollo (= 0.42.0) - Apollo/SQLite (= 0.42.0) - Firebase/Messaging (= 8.4.0) - StructuredLogAssistantIOS (= 0.0.6) - - walmart-react-native-sumo-sdk (2.0.0-beta-9): + - walmart-react-native-sumo-sdk (2.0.0-rc.1): - React - - SumoSDK (= 2.0.0-beta-9) + - SumoSDK (= 2.0.0-rc.1) - wifi-store-locator (1.0.0-alpha2): - React-Core - Yoga (1.14.0) @@ -902,8 +902,8 @@ SPEC CHECKSUMS: SSO: 6a7e963cb299184b6cf198991d232b1feb25bf04 Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5 StructuredLogAssistantIOS: 68c6fc083b10202a570f4a737359dcc7f81ec6e4 - SumoSDK: b55fab2048d0be5ddf9b369970266f51014a4fe2 - walmart-react-native-sumo-sdk: b265821589c85455fcd521f2b34bfc58bf2f8a5a + SumoSDK: 4578ca01baefa1facaaae670ef1cf1d1f1e8e30a + walmart-react-native-sumo-sdk: d9d01c4925dde7da7f8208ecba330a88a108c558 wifi-store-locator: 0f4d1e14ff9b98c559275105c655a5a6103ef427 Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 --- package-lock.json @@ -3499,9 +3499,9 @@ "integrity": "sha512-xXCe5sJeytOO9HAKLaTiQQMzomfUS2wUP6ICLYv9BGtdJUDmoKNT7aFYeRDGPgvPvkc1A8oFrqJIrOshjLnxSg==" }, "@walmart/react-native-sumo-sdk": { - "version": "2.0.0-beta-9", - "resolved": "https://npme.walmart.com/@walmart/react-native-sumo-sdk/-/react-native-sumo-sdk-2.0.0-beta-9.tgz", - "integrity": "sha512-GZMZYWVsO/Ts3BIOUZKmDSWvgNznED4fKuTrZEvz5MRJNGXcAkUEQn92F2T87IAnS76igW3MiJ0i7rj+k1glFg==" + "version": "2.0.0-rc.1", + "resolved": "https://npme.walmart.com/@walmart/react-native-sumo-sdk/-/react-native-sumo-sdk-2.0.0-rc.1.tgz", + "integrity": "sha512-41jA/uqskb6AdoB++6dM4TdYZ0sm0AEFNA8gOfw/s7L0hlh44cHjR8wvM5tcpPkKhZadlWyC3TUsGHZV1cxN2Q==" }, "@walmart/redux-store": { "version": "1.0.15", --- package.json @@ -92,7 +92,7 @@ "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.27.0", "@walmart/react-native-shared-navigation": "^0.4.0", - "@walmart/react-native-sumo-sdk": "^2.0.0-beta-9", + "@walmart/react-native-sumo-sdk": "^2.0.0-rc.1", "@walmart/redux-store": "^1.0.15", "@walmart/schedule-mini-app": "0.3.1", "@walmart/settings-mini-app": "1.3.7",
adding new version of sumo sdk
adding new version of sumo sdk
2b8113779527daf8d320357ccc7894eb918afffd
--- __tests__/whatsNew/__snapshots__/WhatsNewScreenTest.tsx.snap @@ -101,6 +101,7 @@ exports[`WhatsNewScreen handles undefined config 1`] = ` "justifyContent": "center", "padding": 24, "paddingBottom": 8, + "width": "100%", } } > @@ -246,6 +247,7 @@ exports[`WhatsNewScreen handles v2 data with section list 1`] = ` "justifyContent": "center", "padding": 24, "paddingBottom": 8, + "width": "100%", } } > @@ -409,8 +411,10 @@ exports[`WhatsNewScreen handles v2 data with section list 1`] = ` "justifyContent": "center", "padding": 24, "paddingBottom": 8, + "width": "100%", } } + testID="what-new-card-view" > <RCTScrollView ListEmptyComponent={[Function]} @@ -618,6 +622,7 @@ exports[`WhatsNewScreen renders correctly 1`] = ` "justifyContent": "center", "padding": 24, "paddingBottom": 8, + "width": "100%", } } > @@ -773,8 +778,10 @@ exports[`WhatsNewScreen renders correctly 1`] = ` "justifyContent": "center", "padding": 24, "paddingBottom": 8, + "width": "100%", } } + testID="what-new-card-view" > <Text style={ --- src/whatsNew/WhatsNewScreen.tsx @@ -123,7 +123,7 @@ export const WhatsNewScreen = ( {whatsNext.length > 0 && ( <Card UNSAFE_style={styles.card}> - <View style={styles.cardContent}> + <View testID='what-new-card-view' style={styles.cardContent}> {renderSectionList ? ( <SectionList sections={whatsNext as WhatsNextSection[]} --- src/whatsNew/styles.ts @@ -42,6 +42,7 @@ export const WhatsNewScreenStyles = StyleSheet.create({ cardContent: { padding: 24, paddingBottom: 8, + width: '100%', justifyContent: 'center', }, cardTitle: {
fix(core): ALLSPARK-7515 what's new fix (#5293)
fix(core): ALLSPARK-7515 what's new fix (#5293) Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com>
1c8fc346c26c062bbcbdbf32e4e6570df2b95ed0
--- package-lock.json @@ -4192,9 +4192,9 @@ "integrity": "sha512-ppHmGeLmROMI8bji9txjodeqetklJIUIVf7eioPug8ZtS0YJrWBdnty8kbVZp+fQm+nLsDG0aqUOPDgZzzDd9A==" }, "@walmart/feedback-all-spark-miniapp": { - "version": "0.1.14", - "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.1.14.tgz", - "integrity": "sha512-9UHmUvjQim8EKCE9Hyaz3ugH9MjEf/kLW6CHy4CHM0xYbDt6sagw4uSpf1IorKsGpe3AEliY5hm74FR7nYEKSw==" + "version": "0.1.15", + "resolved": "https://npme.walmart.com/@walmart/feedback-all-spark-miniapp/-/feedback-all-spark-miniapp-0.1.15.tgz", + "integrity": "sha512-WL90cwpbc5PqCpgps8lzGWBoGYjAyUPHARxGie2dJUMhvy/B8PH0cJILz1LNIDDHb1iXekSSqQzm/rahbxzJBw==" }, "@walmart/functional-components": { "version": "1.0.34", @@ -4242,9 +4242,9 @@ "integrity": "sha512-DMXzHrlFBvd5qOHxju7irJ+4UkclgpwJVlEKzPqmL4oQPYXkjCydvbJR0O5FmZtDDyBrKxKtofD2vD4nyBeHPA==" }, "@walmart/inbox-mini-app": { - "version": "0.18.0", - "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.18.0.tgz", - "integrity": "sha512-uSob+Hfw/SrO7V55lHruCUc5nD8rKUYNUp0zRh0UJZLA/27uwGFShRj/0FAgMWaSJl7lGo7n5E5jvy/1LGW+Ug==" + "version": "0.19.0", + "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.19.0.tgz", + "integrity": "sha512-KoDCRHk536Cjzbf9oiU5hSo3z+0pUt9YmXlHZMGhqrcOFULBBRVovgtLtXn8En3fIsSdHUL9jNxKImvEkMPZGg==" }, "@walmart/iteminfo-mini-app": { "version": "2.0.16", --- package.json @@ -77,13 +77,13 @@ "@walmart/config-components": "1.0.34", "@walmart/counts-component-miniapp": "0.0.22", "@walmart/exception-mini-app": "0.38.1", - "@walmart/feedback-all-spark-miniapp": "0.1.14", + "@walmart/feedback-all-spark-miniapp": "0.1.15", "@walmart/functional-components": "1.0.34", "@walmart/gta-react-native-calendars": "0.0.15", "@walmart/gtp-shared-components": "^1.2.0", "@walmart/impersonation-mini-app": "1.0.20", "@walmart/ims-print-services-ui": "0.0.36", - "@walmart/inbox-mini-app": "0.18.0", + "@walmart/inbox-mini-app": "0.19.0", "@walmart/iteminfo-mini-app": "2.0.16", "@walmart/manager-approvals-miniapp": "0.0.58", "@walmart/metrics-mini-app": "0.4.14",
inbox and feedback mini app version bump
inbox and feedback mini app version bump
a07612a1aaf903a03ddc465dff24099cfc0726fc
--- .yarn/patches/@walmart-me-at-walmart-common-npm-6.25.1-53e1c47768.patch @@ -1,6 +1,6 @@ diff --git a/lib/components/TeamHub.d.ts b/lib/components/TeamHub.d.ts new file mode 100644 -index 0000000000000000000000000000000000000000..5837cbc0eedb61f385994a90ddecf17cea767f05 +index 0000000000000000000000000000000000000000..1902fe875de9a89748ca00630c573e500ea4139a --- /dev/null +++ b/lib/components/TeamHub.d.ts @@ -0,0 +1,35 @@ @@ -33,7 +33,7 @@ index 0000000000000000000000000000000000000000..5837cbc0eedb61f385994a90ddecf17c +} +export declare const TEAM_HUB_KEY = "Me@Walmart.ManagerExperience.MyTeam"; +export declare const TEAM_HUB_CCM_NAMESPACE = "myteam"; -+export declare const TEAM_HUB_SCREEN_NAME = "myTeam"; ++export declare const TEAM_HUB_SCREEN_NAME = "myTeam.root"; +export declare const DEFAULT_WIDGET_IDS: string[]; +/** + * Component container for Team Hub Manager experience. @@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..5837cbc0eedb61f385994a90ddecf17c +export declare const TeamHubContainer: import("@walmart/allspark-foundation/Components").ComponentContainer<any> | import("@walmart/allspark-foundation/Components").ComponentContainer<TeamHubWidgetProps>; diff --git a/lib/components/TeamHub.js b/lib/components/TeamHub.js new file mode 100644 -index 0000000000000000000000000000000000000000..7a9292ed046e8a9809290e0606a92fcdd7df402d +index 0000000000000000000000000000000000000000..0156685ced8bca4e983dfcfd24e6181225afd90e --- /dev/null +++ b/lib/components/TeamHub.js @@ -0,0 +1,12 @@ @@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..7a9292ed046e8a9809290e0606a92fcd +const Components_1 = require("@walmart/allspark-foundation/Components"); +exports.TEAM_HUB_KEY = 'Me@Walmart.ManagerExperience.MyTeam'; +exports.TEAM_HUB_CCM_NAMESPACE = 'myteam'; -+exports.TEAM_HUB_SCREEN_NAME = 'myTeam'; ++exports.TEAM_HUB_SCREEN_NAME = 'myTeam.root'; +exports.DEFAULT_WIDGET_IDS = ['roster']; +/** + * Component container for Team Hub Manager experience. --- __tests__/navigation/navigationUtils.test.tsx @@ -128,7 +128,7 @@ describe('goToWeeklySchedule', () => { const navMock = jest.fn(); jest .spyOn(AllsparkNavigationClient, 'getCurrentRouteName') - .mockImplementation(() => 'myTeam'); + .mockImplementation(() => 'myTeam.root'); jest .spyOn(AllsparkNavigationClient, 'navigate') .mockImplementation(navMock); @@ -171,14 +171,14 @@ describe('onNewMessage', () => { onNewMessage(); expect(mockAnalytics).toHaveBeenCalledWith( 'newMessageNavigation', - {message: 'New message navigation', routeInfo: 'myTeam'}, + {message: 'New message navigation', routeInfo: 'myTeam.root'}, 10, ); expect(navMock).toHaveBeenCalledWith('myTeam', { params: { screen: 'myTeam.newMessage', }, - screen: 'myTeam', + screen: 'myTeam.root', }); }); }); --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.15.1-alpha.16", + "version": "1.15.1-alpha.17", "main": "dist/index.js", "files": [ "dist" --- src/index.tsx @@ -11,7 +11,7 @@ export default MyTeamFeature.createModule({ name: FEATURE_ID, tags: [FeatureTags.associate], screens: MyTeamFeature.createScreens({ - ['myTeam']: MyTeamFeature.createScreen(MyTeamMiniApp, { + ['myTeam.root']: MyTeamFeature.createScreen(MyTeamMiniApp, { tags: [ScreenTags.MyTeamTab], clockCheckRequired: true, options: { --- yarn.lock @@ -6306,12 +6306,12 @@ __metadata: "@walmart/me-at-walmart-common@patch:@walmart/me-at-walmart-common@npm%3A6.25.1#~/.yarn/patches/@walmart-me-at-walmart-common-npm-6.25.1-53e1c47768.patch": version: 6.25.1 - resolution: "@walmart/me-at-walmart-common@patch:@walmart/me-at-walmart-common@npm%3A6.25.1#~/.yarn/patches/@walmart-me-at-walmart-common-npm-6.25.1-53e1c47768.patch::version=6.25.1&hash=2d814a" + resolution: "@walmart/me-at-walmart-common@patch:@walmart/me-at-walmart-common@npm%3A6.25.1#~/.yarn/patches/@walmart-me-at-walmart-common-npm-6.25.1-53e1c47768.patch::version=6.25.1&hash=fa8322" peerDependencies: "@reduxjs/toolkit": "*" "@walmart/allspark-foundation": "*" redux-saga: "*" - checksum: 10c0/1df418ee1e1a3c1db36e14d5bb83f8836c124819e53a621abfa10049551ddad04f2da80c9fde5db35196fcfe69d0a9c7674590d207241c742daaab1a1d698f2f + checksum: 10c0/c137a66c1f6a75e7519a6375ef8fd7ccac54d460085c583be27c87fcdbcd5f940d82560adfa233ae49b23de2b1a851be5c6af91f188f92948edc1486bb2bd37a languageName: node linkType: hard
feat(ui): update my team mini app version
feat(ui): update my team mini app version
4a02ecd5bb5ad10667e3f3bcf44152dda436f3a7
--- packages/allspark-foundation-hub/__tests__/shared/TeamSearchInputLoading.test.tsx @@ -0,0 +1,20 @@ +import React from 'react'; +import { render } from '@testing-library/react-native'; +import { TeamSearchInputLoading } from '../../src/Shared/Components/SearchInput/TeamSearchInputLoading'; + +jest.mock('@walmart/gtp-shared-components', () => ({ + Skeleton: jest.fn(() => null), +})); + +describe('TeamSearchInputLoading', () => { + it('should render null when loading is false', () => { + const { queryByTestId } = render(<TeamSearchInputLoading loading={false} />); + expect(queryByTestId('team-search-input-loading-component')).toBeNull(); + }); + + it('should render loading skeletons when loading is true', () => { + const { getByTestId } = render(<TeamSearchInputLoading loading={true} />); + expect(getByTestId('team-search-input-loading-component')).toBeTruthy(); + expect(getByTestId('loading-microphone-icon')).toBeTruthy(); + }); +}); --- packages/allspark-foundation-hub/src/Shared/Components/SearchInput/TeamSearchInputLoading.test.tsx @@ -1,21 +0,0 @@ -// import React from 'react'; -// import { render } from '@testing-library/react-native'; -// import { TeamSearchInputLoading } from './TeamSearchInputLoading'; -// import { Skeleton } from '@walmart/gtp-shared-components'; - -// jest.mock('@walmart/gtp-shared-components', () => ({ -// Skeleton: jest.fn(() => null), -// })); - -// describe('TeamSearchInputLoading', () => { -// it('should render null when loading is false', () => { -// const { queryByTestId } = render(<TeamSearchInputLoading loading={false} />); -// expect(queryByTestId('team-search-input-loading-component')).toBeNull(); -// }); - -// it('should render loading skeletons when loading is true', () => { -// const { getByTestId } = render(<TeamSearchInputLoading loading={true} />); -// expect(getByTestId('team-search-input-loading-component')).toBeTruthy(); -// expect(getByTestId('loading-microphone-icon')).toBeTruthy(); -// }); -// });
Adding manager experience tests
Adding manager experience tests
41da2a2bfe664e24d496363c6d0f8a97ea7e3f25
--- packages/allspark-foundation-hub/src/HubFeature/Store/Common/constant.ts @@ -11,3 +11,10 @@ export const TOTAL_STORE_TEAM_LABEL = 'Total store'; export const MY_TEAMS_TEAM_ID = 'myTeams'; export const MY_TEAMS_TEAM_LABEL = 'My teams'; export const PLATFORM_NAME = 'manager-experience'; + +export declare enum UserDomain { + dc = 'distribution center', + candidate = 'candidate', + homeoffice = 'homeoffice', + store = 'store/club', +} --- packages/allspark-foundation-hub/src/HubFeature/Store/Hub/TeamSwitcher/index.tsx @@ -37,6 +37,7 @@ import { TOTAL_STORE_TEAM_ID, TOTAL_STORE_TEAM_LABEL, FEATURE_ID, + UserDomain, } from '../../Common/constant'; import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context'; @@ -71,6 +72,9 @@ export const TeamSwitcher = ({ const empType: string | undefined = useSelector( UserSelectors.getEmployeeType ); + const userDomain: string | undefined = useSelector(UserSelectors.getDomain); + const isHomeOffice: boolean = + userDomain?.toLowerCase() === UserDomain.homeoffice; const userTeams: Team[] | undefined = useSelector(UserSelectors.getTeams); const styles = useMemo(() => TeamSwitcherStyles(), []); const TeamImage = useAllsparkImage(); @@ -130,7 +134,7 @@ export const TeamSwitcher = ({ if (isOffSite && empType === EMP_TYPE_SALARIED) { evaluatedTeamList = [totalStore, management, ...allTeamsOfStore]; evaluatedSelectTeam = management; - } else if (isOffSite && empType === EMP_TYPE_HOURLY) { + } else if ((isOffSite && empType === EMP_TYPE_HOURLY) || isHomeOffice) { evaluatedTeamList = [totalStore, ...allTeamsOfStore]; evaluatedSelectTeam = totalStore; } else if (userPrefTeams && userPrefTeams.length > 1) {
Update the user domain for team switcher
Update the user domain for team switcher
31cb289eba8b4613bd79362a0c252eb2b415b5b7
--- packages/allspark-foundation/src/Components/Hub/Container/index.tsx @@ -0,0 +1,2 @@ +export * from './types'; +export const Container = () => <></>; --- packages/allspark-foundation/src/Components/Hub/Container/types.ts @@ -0,0 +1 @@ +export type ContainerTypes = {}; --- packages/allspark-foundation/src/Components/Hub/Header/index.tsx @@ -0,0 +1,2 @@ +export * from './types'; +export const Header = () => <></>; --- packages/allspark-foundation/src/Components/Hub/Header/types.ts @@ -0,0 +1 @@ +export type HeaderTypes = {}; --- packages/allspark-foundation/src/Components/Hub/TeamSwitcher/index.tsx @@ -0,0 +1,2 @@ +export * from './types'; +export const TeamSwitcher = () => <></>; --- packages/allspark-foundation/src/Components/Hub/TeamSwitcher/types.ts @@ -0,0 +1 @@ +export type TeamSwitcherTypes = {}; --- packages/allspark-foundation/src/Components/TeamOnboarding/index.tsx @@ -0,0 +1,2 @@ +export * from './types'; +export const TeamOnboarding = () => <></>; --- packages/allspark-foundation/src/Components/TeamOnboarding/types.ts @@ -0,0 +1 @@ +export type TeamOnboardingTypes = {}; --- packages/allspark-foundation/src/Components/index.tsx @@ -2,6 +2,10 @@ import { useSnackbar } from '@walmart/gtp-shared-components'; export * from './Badges'; export * from './Banners'; +export * from './Hub/Container'; +export * from './Hub/Header'; +export * from './Hub/TeamSwitcher'; +export * from './TeamOnboarding'; /** * A reference to the Snackbar hook from @walmart/gtp-shared-components.
feat(ui): add new directories for manager experience
feat(ui): add new directories for manager experience
9008fa56ede3e4b01067e7e00e76fa45ba60c368
--- README.md @@ -2,7 +2,7 @@ This is the MyWalmart app. - [Onboarding docs](https://gecgithub01.walmart.com/pages/allspark/allspark/docs/getting-started) -## Project Setup +## Project Setup ### Prerequisites --- package.json @@ -84,7 +84,7 @@ "@walmart/allspark-utils": "6.9.0", "@walmart/amp-mini-app": "1.2.8", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.31.5", + "@walmart/ask-sam-mini-app": "1.32.4", "@walmart/associate-listening-mini-app": "1.2.37", "@walmart/attendance-mini-app": "3.174.0", "@walmart/avp-feature-app": "0.16.19", --- yarn.lock @@ -6642,9 +6642,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ask-sam-mini-app@npm:1.31.5": - version: 1.31.5 - resolution: "@walmart/ask-sam-mini-app@npm:1.31.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.31.5.tgz" +"@walmart/ask-sam-mini-app@npm:1.32.4": + version: 1.32.4 + resolution: "@walmart/ask-sam-mini-app@npm:1.32.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.32.4.tgz" dependencies: apisauce: "npm:^1.1.2" numeral: "npm:^2.0.6" @@ -6657,7 +6657,6 @@ __metadata: "@terrylinla/react-native-sketch-canvas": "*" "@walmart/allspark-foundation": "*" "@walmart/ask-sam-chat-components": ">=0.2.9" - "@walmart/core-services": ">=6.1.0" "@walmart/gtp-shared-components": ">=2.2.1" "@walmart/redux-store": ">=3.1.4" "@walmart/schedule-mini-app": "*" @@ -6688,7 +6687,7 @@ __metadata: react-native-wm-voice-text: ">=0.3" reselect: ">=4" victory-native: ">=36.5" - checksum: 10c0/32c74fdcd4f7c3b9e0aba092d6cbf89172618b44c332626f507ca63d0e98cf289788a3b9d2b948b50b23e73755e8c488d7c9b69ae02f295528ed9f1c421b4fb6 + checksum: 10c0/a7027647c1ef7ba0cfb738a1ebaa7ff8f6ece216d45919c0425221dbfd4bce070eb1491e6dfa8a6c8e1db611c8b249c82c3458400b6053fd3cc6219606d7ab28 languageName: node linkType: hard @@ -7591,7 +7590,7 @@ __metadata: "@walmart/allspark-utils": "npm:6.9.0" "@walmart/amp-mini-app": "npm:1.2.8" "@walmart/ask-sam-chat-components": "npm:^0.2.7" - "@walmart/ask-sam-mini-app": "npm:1.31.5" + "@walmart/ask-sam-mini-app": "npm:1.32.4" "@walmart/associate-listening-mini-app": "npm:1.2.37" "@walmart/attendance-mini-app": "npm:3.174.0" "@walmart/avp-feature-app": "npm:0.16.19"
chore(fixes) : ask-sam: Removed stt credentials API call and @walmart/core-services (#4432)
chore(fixes) : ask-sam: Removed stt credentials API call and @walmart/core-services (#4432) * feat(ask-sam-mini-app): SMBLV-8964 removed /stt-credentials related code * Update README.md - dummy commit dummy commit --------- Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
a4b49c070e8b58e297a0379bf819c0373fd0e805
--- .eslintrc.js @@ -1,7 +1,6 @@ module.exports = { - root: true, extends: ['expo'], - ignorePatterns: ['dist','__tests__/__mocks__/**', 'src/allspark-extention.types.ts', 'src/index.tsx'], + ignorePatterns: ['/dist','__tests__/__mocks__/**', 'src/allspark-extention.types.ts', 'src/index.tsx'], rules: { '@typescript-eslint/no-unused-vars': [ 'error', --- .eslintrc.js.backup @@ -1,24 +0,0 @@ -module.exports = { - extends: ['expo'], - ignorePatterns: ['dist','__tests__/__mocks__/**', 'src/allspark-extention.types.ts', 'src/index.tsx'], - rules: { - '@typescript-eslint/no-unused-vars': [ - 'error', - { - varsIgnorePattern: '^_', - argsIgnorePattern: '^_' - } - ], - 'eol-last': ['error', 'always'], - 'indent': ['error', 2, {'SwitchCase': 1}], - 'space-in-parens': ['error', 'never'], - 'no-trailing-spaces': 'error', - 'array-bracket-spacing': ['error', 'never'], - 'object-curly-spacing': ['error', 'never'], - quotes: ['error', 'single'], - 'no-debugger': 'error' - }, - globals: { - JSX: true, - }, -}; --- package.json @@ -20,8 +20,8 @@ "env:prod": "EXPO_PUBLIC_APP_VARIANT=production expo prebuild --clean --no-install", "env:teflon": "EXPO_PUBLIC_APP_VARIANT=teflon expo prebuild --clean --no-install", "jetifier": "jetifier", - "lint": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.jsx,.ts,.tsx", - "lint:fix": "ESLINT_USE_FLAT_CONFIG=false eslint . --ext .js,.jsx,.ts,.tsx --fix", + "lint": "eslint .", + "lint:fix": "eslint . --fix", "run-expo-doctor": "expo-doctor", "start:minified": "expo start --no-dev --minify", "start": "ts-node scripts/runWithVariablePrompt.ts 'expo start --dev-client'",
feat(translations): SMDV-8492 revert files
feat(translations): SMDV-8492 revert files
b83de33f6ab4afdf5d95e739bb2d7b16f6d7ec53
--- package-lock.json @@ -37,7 +37,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.74", "@walmart/attendance-mini-app": "0.86.0", - "@walmart/compass-sdk-rn": "3.51.0", + "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.10.15", @@ -4907,9 +4907,9 @@ } }, "node_modules/@walmart/compass-sdk-rn": { - "version": "3.51.0", - "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-3.51.0.tgz", - "integrity": "sha512-dMoMj7wwoIDCAp1GUOCpuVY6h9fjCqeZEKpG9ZFm1mY+K4OHQsiu6SkE3WzEmUAvgtxay7R4ffo0AtHe0Ct68Q==", + "version": "4.0.0", + "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-4.0.0.tgz", + "integrity": "sha512-tPDwyePO0HGw+8UePPiIOMQUJkmxA9hb5kmOBdtuHRI7thJ2fH0Lwrw+JqVpBLOEnO9V0we+9pbghW7wOYhwig==", "license": "MIT", "peerDependencies": { "react": "*", @@ -25160,9 +25160,9 @@ } }, "@walmart/compass-sdk-rn": { - "version": "3.51.0", - "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-3.51.0.tgz", - "integrity": "sha512-dMoMj7wwoIDCAp1GUOCpuVY6h9fjCqeZEKpG9ZFm1mY+K4OHQsiu6SkE3WzEmUAvgtxay7R4ffo0AtHe0Ct68Q==" + "version": "4.0.0", + "resolved": "https://npme.walmart.com/@walmart/compass-sdk-rn/-/compass-sdk-rn-4.0.0.tgz", + "integrity": "sha512-tPDwyePO0HGw+8UePPiIOMQUJkmxA9hb5kmOBdtuHRI7thJ2fH0Lwrw+JqVpBLOEnO9V0we+9pbghW7wOYhwig==" }, "@walmart/config-components": { "version": "4.1.0-rc.4", --- package.json @@ -79,7 +79,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.3.74", "@walmart/attendance-mini-app": "0.86.0", - "@walmart/compass-sdk-rn": "3.51.0", + "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.10.15",
Updating the compass-sdk-rn to 4.0.0
Updating the compass-sdk-rn to 4.0.0
157e6b8bf1851873353e5b3dec414e8ebd6ee71d
--- __tests__/redux/selectors.test.ts @@ -45,51 +45,6 @@ describe('Selectors', () => { expect(initialMockedName).toStrictEqual('Darlene'); }); - it('getTextingState selector', () => { - const textingState = selectors.getTextingState(appConfigData); - expect(textingState).toStrictEqual({ - blobContainer: '/path/to/blob', - isReceivingPTT: false, - localBlobStorageAvailable: false, - sasToken: 'fake-SAS-token', - unreadChannelsCount: 0, - unreadMessagesCount: 0, - uploadingBlob: false, - }); - }); - - it('getSasToken selector', () => { - const sasToken = selectors.getSasToken(appConfigData); - expect(sasToken).toStrictEqual('fake-SAS-token'); - }); - - it('getUnreadChannelsCount selector', () => { - const unreadChannelsCoun = selectors.getUnreadChannelsCount(appConfigData); - expect(unreadChannelsCoun).toStrictEqual(0); - }); - - it('getUnreadMessagesCount selector', () => { - const unreadMessagesCount = selectors.getUnreadMessagesCount(appConfigData); - expect(unreadMessagesCount).toStrictEqual(0); - }); - - it('getLocalBlobStorageAvailable selector', () => { - const isLocalBlobStorageAvailable = - selectors.getLocalBlobStorageAvailable(appConfigData); - expect(isLocalBlobStorageAvailable).toStrictEqual(false); - }); - - it('getUploadingBlob selector', () => { - const isUploadingBlob = selectors.getUploadingBlob(appConfigData); - expect(isUploadingBlob).toStrictEqual(false); - }); - - it('getPlayingReceivingPTT selector', () => { - const isgetPlayingReceivingPTT = - selectors.getPlayingReceivingPTT(appConfigData); - expect(isgetPlayingReceivingPTT).toStrictEqual(false); - }); - it('getTextingAppConfigData selector', () => { const getTextingAppConfigData = selectors.getTextingAppConfigData(appConfigData); --- src/redux/reducer.tsx @@ -1,7 +1,7 @@ import {createSlice, PayloadAction} from '@reduxjs/toolkit'; export const rosterSlice = createSlice({ - name: 'roster', //Todo: Update it to roster and make changes in the initial state as well - https://jira.walmart.com/browse/SMDV-5325 + name: 'roster', initialState: { searchText: '', }, --- src/redux/selectors.ts @@ -15,35 +15,10 @@ export const getUserFirstName = createSelector( (state) => state?.preferredFirstName, ); -export const getTextingState = (state: SharedReduxState) => state.texting; +export const getRosterState = (state: SharedReduxState) => state.roster; export const getGlobalState = (state: GlobalState) => state; -export const getSasToken = createSelector( - [getTextingState], - (state) => state.sasToken, -); - -export const getUnreadChannelsCount = createSelector( - [getTextingState], - (state) => state.unreadChannelsCount, -); - -export const getUnreadMessagesCount = createSelector( - [getTextingState], - (state) => state.unreadMessagesCount, -); - -export const getLocalBlobStorageAvailable = createSelector( - [getTextingState], - (state) => state.localBlobStorageAvailable, -); - -export const getUploadingBlob = createSelector( - [getTextingState], - (state) => state?.uploadingBlob, -); - export type Permissions = { rn: string; a: string; @@ -70,11 +45,6 @@ export const getRbacState = createSelector( (state) => state?.rbac as RBACAppState, ); -export const getPlayingReceivingPTT = createSelector( - [getTextingState], - (state) => state.isReceivingPTT, -); - export const getTextingAppConfigData = (state: GlobalState) => state.appConfig.data?.texting || {}; @@ -192,6 +162,6 @@ export const setFirestorePersistenceEnabled = createSelector( ); export const getSearchText = createSelector( - [getTextingState], + [getRosterState], (state) => state?.searchText, );
Update selectors
Update selectors
a583b5f5560184bd4b971b9fee5563404e743b2f
--- targets/US/package.json @@ -99,7 +99,7 @@ "@walmart/core-utils": "6.3.9", "@walmart/core-widget-registry": "workspace:^", "@walmart/counts-component-miniapp": "0.1.14", - "@walmart/digital-locks-mini-app": "1.1.9-rc.2", + "@walmart/digital-locks-mini-app": "1.1.9-rc.3", "@walmart/emergency-mini-app": "1.30.5", "@walmart/exception-mini-app": "1.8.11", "@walmart/facilities-management-miniapp": "0.17.0", --- yarn.lock @@ -6708,9 +6708,9 @@ __metadata: languageName: node linkType: hard -"@walmart/digital-locks-mini-app@npm:1.1.9-rc.2": - version: 1.1.9-rc.2 - resolution: "@walmart/digital-locks-mini-app@npm:1.1.9-rc.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fdigital-locks-mini-app%2F-%2F%40walmart%2Fdigital-locks-mini-app-1.1.9-rc.2.tgz" +"@walmart/digital-locks-mini-app@npm:1.1.9-rc.3": + version: 1.1.9-rc.3 + resolution: "@walmart/digital-locks-mini-app@npm:1.1.9-rc.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fdigital-locks-mini-app%2F-%2F%40walmart%2Fdigital-locks-mini-app-1.1.9-rc.3.tgz" peerDependencies: "@walmart/allspark-foundation": ">=6.0.0" expo: 50.0.17 @@ -6724,7 +6724,7 @@ __metadata: dependenciesMeta: "@walmart/me-at-walmart": built: false - checksum: 10c0/97e10c74ece872874f9f25e5a29ffbb057332911041a7e0996e0d400a6f41a10ed84ceba2ff6c0ca36e3b7cb346eac5c4acb161258e92fb63c4c79f7665a750c + checksum: 10c0/15ee4e064429c33cc7186c0baf9a790739e4e6e37a328b87bf83be54699354882457cad21a460bcc6ba4538d2f3e8743e687f32ec6a6eab2f5594fdab9622625 languageName: node linkType: hard @@ -7428,7 +7428,7 @@ __metadata: "@walmart/core-utils": "npm:6.3.9" "@walmart/core-widget-registry": "workspace:^" "@walmart/counts-component-miniapp": "npm:0.1.14" - "@walmart/digital-locks-mini-app": "npm:1.1.9-rc.2" + "@walmart/digital-locks-mini-app": "npm:1.1.9-rc.3" "@walmart/emergency-mini-app": "npm:1.30.5" "@walmart/exception-mini-app": "npm:1.8.11" "@walmart/facilities-management-miniapp": "npm:0.17.0"
bump to 1.1.9-rc.3
bump to 1.1.9-rc.3
8506aeeed7174086968788d43dbda2b71600d9f3
--- jest.config.js @@ -9,10 +9,10 @@ module.exports = { ], coverageThreshold: { global: { - statements: 14.07, + statements: 8.67, branches: 3.51, - functions: 6.02, - lines: 14.27, + functions: 5.81, + lines: 8.75, }, }, transformIgnorePatterns: [ --- jest.config.js @@ -9,10 +9,10 @@ module.exports = { ], coverageThreshold: { global: { - statements: 14.07, + statements: 8.67, branches: 3.51, - functions: 6.02, - lines: 14.27, + functions: 5.81, + lines: 8.75, }, }, transformIgnorePatterns: [
lowering jest coverage temporarily
lowering jest coverage temporarily
15904bf3ac03e2d772c6b10acd9c5aec2e5cdd0e
--- src/legacy/sagas.ts @@ -1,10 +1,12 @@ -import {all, put, takeLatest} from 'redux-saga/effects'; +import {all, put, select, takeLatest} from 'redux-saga/effects'; import { IUserActions, UserActionTypes, + UserSelectors, } from '@walmart/allspark-foundation/User'; import { ClockActionCreators, + ClockActionTypes, ClockStatus, } from '@walmart/allspark-foundation/Clock'; import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; @@ -47,12 +49,44 @@ export function* onExitImpersonation() { yield put({type: 'global/EXIT_IMPERSONATION'}); } +/** + * Sync clock status updates with impersonated user during active impersonation. + * When clock status changes while impersonating, we need to ensure the clockedIn + * field is properly derived to prevent the Foundation selector from defaulting to true. + */ +export function* onClockChangeWhileImpersonated(action: any) { + const impersonated: boolean = yield select(UserSelectors.getImpersonated); + if (!impersonated) { + return; + } + + const clockData = action.payload; + if (!clockData) { + return; + } + + // Ensure the clock state has the derived clockedIn field + // (in case STATE_CHANGE came from Time Clock without it) + if (clockData.clockedIn === undefined) { + yield put( + ClockActionCreators.FETCH_SUCCESS({ + ...clockData, + clockedIn: clockData.clockStatus !== ClockStatus.clockedOut, + }), + ); + } +} + export function* legacySagas() { yield all( createRestartableSagas( [ takeLatest(UserActionTypes.START_IMPERSONATION, onStartImpersonation), takeLatest(UserActionTypes.EXIT_IMPERSONATION, onExitImpersonation), + takeLatest( + [ClockActionTypes.STATE_CHANGE, ClockActionTypes.FETCH_SUCCESS], + onClockChangeWhileImpersonated, + ), ], Logger.error, ),
fix(bug): sync clock status updates during active impersonation
fix(bug): sync clock status updates during active impersonation
894ab7e114d56d8c5e57fa21829d29a24c7195e3
--- targets/US/package.json @@ -125,7 +125,7 @@ "@walmart/native-rfid-scanner": "3.9.15", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.3", - "@walmart/payrollsolution_miniapp": "0.141.11", + "@walmart/payrollsolution_miniapp": "0.141.17", "@walmart/price-changes-mini-app": "1.10.15", "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch", "@walmart/react-native-encrypted-storage": "~1.1.3", --- yarn.lock @@ -7103,7 +7103,7 @@ __metadata: "@walmart/native-rfid-scanner": "npm:3.9.15" "@walmart/onewalmart-miniapp": "npm:1.0.24" "@walmart/pay-stub-miniapp": "npm:0.15.3" - "@walmart/payrollsolution_miniapp": "npm:0.141.11" + "@walmart/payrollsolution_miniapp": "npm:0.141.17" "@walmart/price-changes-mini-app": "npm:1.10.15" "@walmart/profile-feature-app": "patch:@walmart/profile-feature-app@npm%3A1.138.3#~/.yarn/patches/@walmart-profile-feature-app-npm-1.138.3-9802440ed6.patch" "@walmart/react-native-encrypted-storage": "npm:~1.1.3" @@ -7530,12 +7530,12 @@ __metadata: languageName: node linkType: hard -"@walmart/payrollsolution_miniapp@npm:0.141.11": - version: 0.141.11 - resolution: "@walmart/payrollsolution_miniapp@npm:0.141.11" +"@walmart/payrollsolution_miniapp@npm:0.141.17": + version: 0.141.17 + resolution: "@walmart/payrollsolution_miniapp@npm:0.141.17" dependencies: crypto-js: "npm:^3.3.0" - checksum: 10c0/8309528bba5f541995635547b950899b4a374d87ae424ade3292727d42919be5f3a6218d75f265d1f443f4654afce26d20e6ddce4181600334a039a3e202d37e + checksum: 10c0/b790cf6b7dfab9987156f140df891932e44318310cecefdc14aaa902197446f16f076a73aced192ce28efaa8913cb5b1acda9010da7eae5613e7e6c95d140487 languageName: node linkType: hard
bump version
bump version
b6c4c604e886959a7fd16fd0c674d5fcdd0bc502
--- src/components/ClockedOutScreenGuard.tsx @@ -28,7 +28,7 @@ interface ClockedOutScreenGuardProps { const ClockedOutStack = createStackNavigator<TextingNavParamsMap>(); export const ClockedOutScreen = () => { - const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); analytics('roster', {message: 'clocked out roster access'}, 10); return ( <> --- src/components/ClockedOutScreenGuard.tsx @@ -28,7 +28,7 @@ interface ClockedOutScreenGuardProps { const ClockedOutStack = createStackNavigator<TextingNavParamsMap>(); export const ClockedOutScreen = () => { - const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); analytics('roster', {message: 'clocked out roster access'}, 10); return ( <>
fixing lint
fixing lint
e909d59ee28612524bba64e6bde352d1788d548c
--- package-lock.json @@ -68,7 +68,7 @@ "@walmart/learning-mini-app": "18.0.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.18.6", - "@walmart/mod-flex-mini-app": "1.14.6", + "@walmart/mod-flex-mini-app": "1.15.3", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.0.14", "@walmart/onewalmart-miniapp": "1.0.16", @@ -9385,9 +9385,9 @@ } }, "node_modules/@walmart/mod-flex-mini-app": { - "version": "1.14.6", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.14.6.tgz", - "integrity": "sha512-jEZfIGO8eAhLxPmmwAT/M+ivWuDVfWqBntvTLm0zNnrro+A7UErA1iLrWCWpC9MYxnts5WENDBXROZyvvoXk4Q==", + "version": "1.15.3", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.15.3.tgz", + "integrity": "sha512-k/zYnCjhuqvxnD+6AEqPTBXsjtvnbwgbpMzAm7QR7+vTEx3ukI9N465MfhE59+mc3RCuFYotF4oxmOqyYdwwfw==", "hasInstallScript": true, "peerDependencies": { "@react-native-async-storage/async-storage": "^1.19.0", @@ -33499,9 +33499,9 @@ } }, "@walmart/mod-flex-mini-app": { - "version": "1.14.6", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.14.6.tgz", - "integrity": "sha512-jEZfIGO8eAhLxPmmwAT/M+ivWuDVfWqBntvTLm0zNnrro+A7UErA1iLrWCWpC9MYxnts5WENDBXROZyvvoXk4Q==" + "version": "1.15.3", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.15.3.tgz", + "integrity": "sha512-k/zYnCjhuqvxnD+6AEqPTBXsjtvnbwgbpMzAm7QR7+vTEx3ukI9N465MfhE59+mc3RCuFYotF4oxmOqyYdwwfw==" }, "@walmart/moment-walmart": { "version": "1.0.4" --- package.json @@ -109,7 +109,7 @@ "@walmart/learning-mini-app": "18.0.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/metrics-mini-app": "0.18.6", - "@walmart/mod-flex-mini-app": "1.14.6", + "@walmart/mod-flex-mini-app": "1.15.3", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.0.14", "@walmart/onewalmart-miniapp": "1.0.16",
Updated modflex to 1.15.3
Updated modflex to 1.15.3
04527954dbe69aac2f557d2d457a2466bb1af9ac
--- package.json @@ -90,7 +90,7 @@ "@walmart/inbox-mini-app": "0.40.0", "@walmart/iteminfo-mini-app": "4.2.6", "@walmart/manager-approvals-miniapp": "0.0.62", - "@walmart/me-field-mini-app": "^1.1.9", + "@walmart/me-field-mini-app": "1.1.11", "@walmart/metrics-mini-app": "0.8.1", "@walmart/moment-walmart": "1.0.4", "@walmart/payrollsolution_miniapp": "^0.123.2",
feat: :sparkles: Bump Me@Learning mini app version
feat: :sparkles: Bump Me@Learning mini app version
818427a900e3a71cd8a2e4c058fa7a8d8f858ad9
--- packages/me-at-walmart-container/src/services/user/index.ts @@ -55,9 +55,11 @@ export const MeAtWalmartUserService = { response.data.getAssociateById, currentUser! ); + if (!user.siteId) { + throw new Error('Cannot calculate user siteId data from getAssociateById query'); + } return user; } - throw new Error('No data returned from getAssociateById query'); }, }; --- packages/me-at-walmart-container/src/services/user/transforms.ts @@ -6,7 +6,7 @@ import { } from '@walmart/me-at-walmart-athena-queries'; import {UserDomain, UserType} from '@walmart/me-at-walmart-common'; -import {BU_TYPE_DOMAIN, TokenData} from './types'; +import {BU_TYPE_DOMAIN, GCC_TYPE_DOMAIN, TokenData} from './types'; import { generateImpersonationToken, inferDomain, @@ -19,17 +19,24 @@ import { type UserResponse = GetLoggedInUserQuery['getLoggedInUser']; type AssignedBusinessUnit = NonNullable<UserResponse>['assignedBusinessUnit']; +const GCC_DOMAIN_MAP: Record<string, UserDomain> = { + [GCC_TYPE_DOMAIN.HO]: UserDomain.homeoffice, + [GCC_TYPE_DOMAIN.DC]: UserDomain.dc, +}; + export const DEFAULT_COUNTRY_CODE = 'US'; // Determine site related fields based on domain. // siteId is kept for backwards compatability and should always match workingSite export const determineSiteProps = ( - domain: string | BU_TYPE_DOMAIN | undefined, + domain: string | BU_TYPE_DOMAIN | GCC_TYPE_DOMAIN | undefined, siteId: string | undefined, workingSite: string | null | undefined ) => { - const isDcUser = domain === BU_TYPE_DOMAIN.DC; - const isHoUser = domain === BU_TYPE_DOMAIN.HO; + const isDcUser = + domain === BU_TYPE_DOMAIN.DC || domain === GCC_TYPE_DOMAIN.DC; + const isHoUser = + domain === BU_TYPE_DOMAIN.HO || domain === GCC_TYPE_DOMAIN.HO; return { siteId: isDcUser ? workingSite : siteId, @@ -172,9 +179,18 @@ export const transformImpersonateeData = ( data: NonNullable<GetAssociateByIdQuery['getAssociateById']>, impersonator: User ): ImpersonationUser => { - const userId = stripStoreFromUserId(inferUserIdfromUpn(data.workEmail!)); - const siteId = inferSiteId(data.workEmail!); - const domain = inferDomainFromUpn(data.workEmail!); + // workEmail works for store/club users, dc and homeoffice falls back to userId + const userId = + stripStoreFromUserId(inferUserIdfromUpn(data.workEmail ?? '')) ?? + data.userId ?? + ''; + // workEmail works for store/club users, dc and homeoffice falls back to facilityNumber + const siteId = inferSiteId(data.workEmail ?? '') ?? data.facilityNumber ?? ''; + // workEmail works for store/club users, dc and homeoffice falls back to geographicCategoryCode + const domain = + inferDomainFromUpn(data.workEmail ?? '') ?? + GCC_DOMAIN_MAP[data.geographicCategoryCode?.toLocaleLowerCase()!] ?? + ''; const win = data.win ? String(data.win) : impersonator.win; const emailDomain = --- packages/me-at-walmart-container/src/services/user/types.ts @@ -9,6 +9,12 @@ export enum BU_TYPE_DOMAIN { HO = UserDomain.homeoffice, } +// Mapping GeographicCategoryCode to domain on UI +export enum GCC_TYPE_DOMAIN { + HO = 'ho', + DC = 'dc', +} + export enum UserInfoSource { ATHENA = 'ATHENA', SARO = 'SARO',
fix: add dc and homeoffice domain impersonation (#3981)
fix: add dc and homeoffice domain impersonation (#3981) * add dc and homeoffice domain * clean up lint and add default value to utils params * add comments to impersonation transform * added check for siteId to prevent from impersonation if empty --------- Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com> Co-authored-by: Dylan Lane - rlane1 <Russell.Lane@walmart.com>
e73b676dd89ba5557c5109dde902dc49ad193f46
--- src/components/AssociateList/AssociateListItem.tsx @@ -29,6 +29,8 @@ 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, @@ -62,6 +64,15 @@ export const AssociateListItem = ({ const userIsInRoster = useUserIsInRoster(); 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 shouldShowMessageButton = associate?.associateId !== currentUserAssociateId?.toString(); const isWfmScheduleValid = @@ -88,6 +99,10 @@ export const AssociateListItem = ({ [isLastItem], ); + const isStatusChipVisible = siteIsDC + ? isSalariedOrLead + : showStatusChipAndViewSchedule; + return ( <View testID='associate-list-item-container' style={styles.container}> <View @@ -126,7 +141,7 @@ export const AssociateListItem = ({ </Body> </View> )} - {showStatusChipAndViewSchedule && handleViewSchedule ? ( + {isStatusChipVisible && handleViewSchedule ? ( <Link onPress={handleViewSchedule} testID={`view-schedule-btn-${associate.associateId}`} @@ -142,7 +157,7 @@ export const AssociateListItem = ({ id='wmConnect.DNDStatusChip' props={{userId: encryptedId, style: styles.tag}} /> - {showStatusChipAndViewSchedule ? ( + {isStatusChipVisible ? ( <View accessible={false}> <StatusChip associate={associate} style={styles.tag} /> </View>
update Status chip access
update Status chip access
86b214c5e9e1c5b151dda5ba42423054f1f232d3
--- package-lock.json @@ -3504,9 +3504,9 @@ } }, "@walmart/settings-mini-app": { - "version": "1.2.3", - "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.2.3.tgz", - "integrity": "sha512-4VL2h7BKEZNP+QtIaYbQXJ6kpxZdeeCqTA3PvP1L933vlNsilF3y5RO9lCyMsTjWQ+AJ3Ww6gqC/oNDxjTvtGw==" + "version": "1.2.6", + "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.2.6.tgz", + "integrity": "sha512-bSYWNNt5wFADM8milPDSKuNAbPk5uz6hXl+9Ht/4ZrRq4wvB6Gzo47Q7kui5xlFmKT9WXqnYK8Ayr/WT1HEyfQ==" }, "@walmart/shelfavailability-mini-app": { "version": "0.3.61", --- 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.2.3", + "@walmart/settings-mini-app": "1.2.6", "@walmart/time-clock-mini-app": "0.3.8", "@walmart/ui-components": "1.1.44", "@walmart/welcomeme-mini-app": "0.26.2",
settings version bump - haptics changes
settings version bump - haptics changes
7b75fc9187942b0deb17cf39f9fad3c8f0b1ef15
--- docs/CHANGELOG.md @@ -1,3 +1,11 @@ +# [3.11.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.10.0...v3.11.0) (2025-12-16) + + +### Features + +* **ui:** update tests for roster ([f1d1c53](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/f1d1c539e37db4f829f2534f33bead2450a5311e)) +* **ui:** update tests for roster ([1464805](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/14648059750b6977ca6575c56502eaee7b5e3145)) + # [3.10.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.9.0...v3.10.0) (2025-12-16) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "3.10.0", + "version": "3.11.0", "main": "dist/index.js", "files": [ "dist",
chore(release): 3.11.0 [skip ci]
chore(release): 3.11.0 [skip ci] # [3.11.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v3.10.0...v3.11.0) (2025-12-16) ### Features * **ui:** update tests for roster ([f1d1c53](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/f1d1c539e37db4f829f2534f33bead2450a5311e)) * **ui:** update tests for roster ([1464805](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/14648059750b6977ca6575c56502eaee7b5e3145))
6dd2de2379dca61d12f4cfd64b3dc483c268df57
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingScreen.tsx @@ -8,14 +8,12 @@ import { ShiftFilterList } from '../../Components/ShiftFilter/ShiftFilterList'; import { mockFilterListData } from '../EditSavedTeamModal/mockTeamsData'; import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { styles } from './styles'; -import { FEATURE_ID, ONBOARDING_KEY, PLATFORM_NAME } from '../../constant'; +import { FEATURE_ID, ONBOARDING_KEY } from '../../constant'; import { LoggerService, useTelemetryService, AllsparkLocalStorage, } from '@walmart/allspark-foundation'; -import { AllsparkEnvironment } from '@walmart/allspark-foundation/Environment'; -import { getVersion } from 'react-native-device-info'; import { useOnboardingContext } from './OnboardingContext'; import { UserSelectors } from '@walmart/allspark-foundation/User'; import { ManagerExperienceCreators } from '../../Redux'; @@ -23,25 +21,27 @@ import { useDispatch, useSelector } from 'react-redux'; import { hubHeaderEnabled } from '../../Redux'; import { useGetSupplyChainAllTeamsBySite } from '../../Hooks/useGetSupplyChainTeamsByStore'; import { AllTeamsSections } from '../EditSavedTeamModal/types'; -import { useUpsertSupplyChainAssociatePreferenceMutation } from '@walmart/me-at-walmart-athena-queries'; import { useFocusEffect } from '@react-navigation/native'; +import { useUpsertSupplyChainAssociatePreference } from '../../Hooks'; export const OnboardingScreen = () => { const { t } = useAllsparkTranslation(FEATURE_ID); const teamSelectionTelemetry = useTelemetryService(); const logger = LoggerService.getContainerInstance(); const { disableOnboarding } = useOnboardingContext(); - const { allSiteTeamsSections } = useGetSupplyChainAllTeamsBySite(); // from redux + const { allSiteTeamsSections } = useGetSupplyChainAllTeamsBySite(); const site = useSelector(UserSelectors.getWorkingSite); const [input, setInput] = useState(''); const dispatch = useDispatch(); const win = useSelector(UserSelectors.getWin); - const countryCode = useSelector(UserSelectors.getCountryCode) as string; const [selectedTeams, setSelectedTeams] = useState<string[]>([]); const [selectedShifts, setSelectedShifts] = useState<string[]>([]); const [sections, setSearchedsections] = useState<typeof allSiteTeamsSections>( [] ); + const { upsertSupplyChainPreferences } = + useUpsertSupplyChainAssociatePreference(); + useFocusEffect( useCallback(() => { /** @@ -104,19 +104,6 @@ export const OnboardingScreen = () => { disableOnboarding(); }, []); - const [upsertSupplyChainAssociatePreferenceMutation] = - useUpsertSupplyChainAssociatePreferenceMutation({ - context: { - headers: { - 'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId, - 'x-o-platform': PLATFORM_NAME, - 'x-o-platform-version': getVersion(), - }, - }, - onCompleted: () => {}, - onError: () => {}, - }); - const handleSaveButton = useCallback(async () => { logger.info('Onboarding', { message: 'Onboarding started', @@ -127,27 +114,7 @@ export const OnboardingScreen = () => { dispatch(ManagerExperienceCreators.setSelectedTeamIDs(selectedTeams)); dispatch(ManagerExperienceCreators.setSelectedShifts(selectedShifts)); await AllsparkLocalStorage.set(ONBOARDING_KEY, 'true'); - upsertSupplyChainAssociatePreferenceMutation({ - variables: { - associatePreferencesInput: { - walmartIdentificationNumber: String(win), - meAtWalmartPreferences: { - managerExperiencePreferences: { - mySupplyChainTeams: { - businessUnitNumber: Number(site), - shiftCodePreference: selectedShifts, - supplyChainTeamPreference: selectedTeams.map((teamId) => ({ - businessUnitNumber: Number(site), - countryCode: countryCode, - teamId: teamId, - })), - }, - }, - }, - }, - businessUnitNumber: Number(site), - }, - }); + upsertSupplyChainPreferences(selectedShifts, selectedTeams); disableOnboarding(); }, [ logger, @@ -155,7 +122,6 @@ export const OnboardingScreen = () => { dispatch, selectedTeams, selectedShifts, - upsertSupplyChainAssociatePreferenceMutation, win, site, disableOnboarding,
feat(ui): moved upsert logic to a hook for onboarding screen
feat(ui): moved upsert logic to a hook for onboarding screen
e7e41a1eeadceb01c07cd25a0c811f6a1c4c71f5
--- .eslintrc.js @@ -1,13 +1,7 @@ -const prettierConfig = require('./.prettierrc'); - module.exports = { - root: true, - extends: ['@react-native-community', 'prettier'], - parser: '@typescript-eslint/parser', - plugins: ['@typescript-eslint'], + extends: ['@react-native'], rules: { 'no-shadow': 'off', - 'prettier/prettier': ['error', prettierConfig], '@typescript-eslint/no-shadow': 'error', }, globals: { --- package-lock.json @@ -29,6 +29,7 @@ "@graphql-codegen/typescript-react-apollo": "^3.3.7", "@react-native-community/eslint-config": "^2.0.0", "@react-native/babel-preset": "^0.73.0", + "@react-native/eslint-config": "0.73.2", "@redux-saga/testing-utils": "^1.1.3", "@testing-library/jest-native": "5.4.3", "@testing-library/react-hooks": "8.0.1", @@ -338,6 +339,35 @@ "url": "https://opencollective.com/babel" } }, + "node_modules/@babel/eslint-parser": { + "version": "7.24.5", + "resolved": "https://npme.walmart.com/@babel/eslint-parser/-/eslint-parser-7.24.5.tgz", + "integrity": "sha512-gsUcqS/fPlgAw1kOtpss7uhY6E9SFFANQ6EFX5GTvzUwaV0+sGaZWk6xq22MOdeT9wfxyokW3ceCUvOiRtZciQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", + "eslint-visitor-keys": "^2.1.0", + "semver": "^6.3.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || >=14.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.11.0", + "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://npme.walmart.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=10" + } + }, "node_modules/@babel/generator": { "version": "7.23.6", "resolved": "https://npme.walmart.com/@babel/generator/-/generator-7.23.6.tgz", @@ -7179,6 +7209,16 @@ "dev": true, "license": "UNLICENSED" }, + "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { + "version": "5.1.1-v1", + "resolved": "https://npme.walmart.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", + "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-scope": "5.1.1" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://npme.walmart.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -9748,6 +9788,58 @@ "async-limiter": "~1.0.0" } }, + "node_modules/@react-native/eslint-config": { + "version": "0.73.2", + "resolved": "https://npme.walmart.com/@react-native/eslint-config/-/eslint-config-0.73.2.tgz", + "integrity": "sha512-YzMfes19loTfbrkbYNAfHBDXX4oRBzc5wnvHs4h2GIHUj6YKs5ZK5lldqSrBJCdZAI3nuaO9Qj+t5JRwou571w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.20.0", + "@babel/eslint-parser": "^7.20.0", + "@react-native/eslint-plugin": "0.73.1", + "@typescript-eslint/eslint-plugin": "^5.57.1", + "@typescript-eslint/parser": "^5.57.1", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-eslint-comments": "^3.2.0", + "eslint-plugin-ft-flow": "^2.0.1", + "eslint-plugin-jest": "^26.5.3", + "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-react": "^7.30.1", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-native": "^4.0.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "eslint": ">=8", + "prettier": ">=2" + } + }, + "node_modules/@react-native/eslint-config/node_modules/eslint-config-prettier": { + "version": "8.10.0", + "resolved": "https://npme.walmart.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", + "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", + "dev": true, + "license": "MIT", + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/@react-native/eslint-plugin": { + "version": "0.73.1", + "resolved": "https://npme.walmart.com/@react-native/eslint-plugin/-/eslint-plugin-0.73.1.tgz", + "integrity": "sha512-8BNMFE8CAI7JLWLOs3u33wcwcJ821LYs5g53Xyx9GhSg0h8AygTwDrwmYb/pp04FkCNCPjKPBoaYRthQZmxgwA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@react-native/gradle-plugin": { "version": "0.73.4", "resolved": "https://npme.walmart.com/@react-native/gradle-plugin/-/gradle-plugin-0.73.4.tgz", @@ -15187,6 +15279,24 @@ "eslint": "^8.1.0" } }, + "node_modules/eslint-plugin-ft-flow": { + "version": "2.0.3", + "resolved": "https://npme.walmart.com/eslint-plugin-ft-flow/-/eslint-plugin-ft-flow-2.0.3.tgz", + "integrity": "sha512-Vbsd/b+LYA99jUbsL6viEUWShFaYQt2YQs3QN3f+aeszOhh2sgdcU0mjzDyD4yyBvMc8qy2uwvBBWfMzEX06tg==", + "dev": true, + "license": "MIT", + "dependencies": { + "lodash": "^4.17.21", + "string-natural-compare": "^3.0.1" + }, + "engines": { + "node": ">=12.22.0" + }, + "peerDependencies": { + "@babel/eslint-parser": "^7.12.0", + "eslint": "^8.1.0" + } + }, "node_modules/eslint-plugin-jest": { "version": "27.6.0", "resolved": "https://npme.walmart.com/eslint-plugin-jest/-/eslint-plugin-jest-27.6.0.tgz", --- package.json @@ -45,6 +45,7 @@ "@graphql-codegen/typescript-react-apollo": "^3.3.7", "@react-native-community/eslint-config": "^2.0.0", "@react-native/babel-preset": "^0.73.0", + "@react-native/eslint-config": "0.73.2", "@redux-saga/testing-utils": "^1.1.3", "@testing-library/jest-native": "5.4.3", "@testing-library/react-hooks": "8.0.1", --- packages/allspark-foundation/src/utils/DynamicServiceCreator.tsx @@ -13,7 +13,7 @@ export type AnyService = Record< * that aren't defined on the original service type T. */ export const DynamicServiceCreator = <T extends AnyService, I extends T = T>( - _: string, + _name: string, transform?: (implementation: T) => I ) => { let isConnected = false;
chore: refactor lint setup
chore: refactor lint setup
d7e9cedc78ca29de8c1041f681353e30212752e4
--- docs/docusaurus.config.ts @@ -83,7 +83,7 @@ const config: Config = { // Uncomment this to enable blog //{to: '/blog', label: 'Blog', position: 'left'}, { - to: 'https://gecgithub01.walmart.com/allspark/allspark', + to: '', label: 'FAQ', position: 'right', },
Update getting started file
Update getting started file
13e1dfbd9d9964f15457b811a9d63a07b6931216
--- packages/core-services-allspark/src/graphql/links.ts @@ -57,16 +57,31 @@ export const typeRemappingLink = new ApolloLink((operation, forward) => { }); export const createErrorLoggerLink = (logger: IAllsparkLogger) => - onError(({ graphQLErrors }) => { + onError(({ graphQLErrors, operation, networkError }) => { + const baseLog = JSON.parse( + JSON.stringify({ + headers: operation.getContext()?.headers, + extensions: operation.extensions, + operation: operation.variables, + graphQLErrors: [], + }) + ); + if (graphQLErrors) { graphQLErrors.forEach(({ message, locations, path }) => { - logger.error('GraphQL error', { + baseLog.graphQLErrors.push({ message, locations, path, }); }); } + + if (networkError) { + baseLog.networkError = networkError; + } + + logger.error('GraphQL error', baseLog); }); export const athenaUriLink = new ApolloLink((operation, forward) => {
fix: add more details to graphql error logger link
fix: add more details to graphql error logger link
87e483bc301aaeb93015ccb2ae152156f9607afb
--- package.json @@ -118,7 +118,7 @@ "@walmart/me-at-walmart-common": "6.1.4", "@walmart/me-at-walmart-container": "6.1.4", "@walmart/metrics-mini-app": "0.22.4", - "@walmart/mod-flex-mini-app": "1.18.5", + "@walmart/mod-flex-mini-app": "1.19.6", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.6", "@walmart/myteam-mini-app": "1.4.0", --- yarn.lock @@ -6538,9 +6538,9 @@ __metadata: languageName: node linkType: hard -"@walmart/mod-flex-mini-app@npm:1.18.5": - version: 1.18.5 - resolution: "@walmart/mod-flex-mini-app@npm:1.18.5" +"@walmart/mod-flex-mini-app@npm:1.19.6": + version: 1.19.6 + resolution: "@walmart/mod-flex-mini-app@npm:1.19.6" peerDependencies: "@react-native-async-storage/async-storage": ^1.19.0 "@react-native-picker/picker": ^2.4.8 @@ -6591,7 +6591,7 @@ __metadata: redux-thunk: ^2.4.0 uuid: ^3.3.2 wifi-store-locator: ^1.4.1 - checksum: 10c0/3550b02b874adc0b352cbc163a8c71ce649099a69bb1a95fa2fb5c6c486df90052d50ce57da2a49a51968765f7b6588568e5548cac86be9e0738e907a6e29f39 + checksum: 10c0/7b780bcbb370a97cf565f071ac36b0295d5ee584d8a3518e05be8a3f175521d1d9377d16b997dd0ad5a735ab3fa488e4a45701b9f5dcc0d8a2d1be3836923fa9 languageName: node linkType: hard @@ -7833,7 +7833,7 @@ __metadata: "@walmart/me-at-walmart-common": "npm:6.1.4" "@walmart/me-at-walmart-container": "npm:6.1.4" "@walmart/metrics-mini-app": "npm:0.22.4" - "@walmart/mod-flex-mini-app": "npm:1.18.5" + "@walmart/mod-flex-mini-app": "npm:1.19.6" "@walmart/moment-walmart": "npm:1.0.4" "@walmart/money-auth-shared-components": "npm:0.1.6" "@walmart/myteam-mini-app": "npm:1.4.0"
update modflex drop 23
update modflex drop 23
646eaeb15db9fb5057c90bb3b4844c5246bff206
--- src/components/AssociateList/styles.ts @@ -67,16 +67,19 @@ export const associateListItemStyles = (hasBorder: boolean) => readTogetherContainer: { display: 'flex', flexDirection: 'row', + flex: 1, }, associateInfoContainer: { display: 'flex', flexDirection: 'column', justifyContent: 'flex-start', + flex: 1, }, associateName: { color: colors.gray['160'], fontSize: 16, lineHeight: 24, + alignItems: 'flex-end', }, plainText: { color: colors.gray['160'], --- src/components/MyWalmartv2/Common/RosterFilterChips/RosterFilterChips.tsx @@ -176,6 +176,7 @@ const styles = StyleSheet.create({ flexDirection: 'row', flexWrap: 'wrap', marginBottom: 16, + paddingLeft: 16, }, /** * Base style for filter chips --- src/components/MyWalmartv2/Common/RosterHeader/style.ts @@ -6,6 +6,8 @@ export const styles = StyleSheet.create({ flexDirection: 'row', alignItems: 'center', marginBottom: 20, + paddingTop: 16, + paddingLeft: 16, }, heading: { marginLeft: 8, @@ -18,7 +20,7 @@ export const styles = StyleSheet.create({ textLink: { marginLeft: 20, fontSize: 16, - fontFamily: 'Bogle-Bold', + fontFamily: 'Bogle-Regular', color: colors.black['160'], flex: 1, }, --- src/screens/RosterDetailScreen/RosterDetailScreen.tsx @@ -4,47 +4,13 @@ import {useSelector} from 'react-redux'; import {SupplyChainRosterDetailScreen} from './SupplyChainRosterDetailScreen/SupplyChainRosterDetailScreen'; import {StoreRosterDetailScreen} from './StoreRosterDetailScreen/StoreRosterDetailScreen'; import {RosterDetailScreenProps} from './types'; -import {RouteProp, useNavigation} from '@react-navigation/native'; +import {useNavigation} from '@react-navigation/native'; import {translationClient} from '../../common'; import {renderDrawerButton} from '@walmart/allspark-foundation'; import { useGetViewersPrimaryTeam, useUserCanSeeHub, - UseGetViewersPrimaryTeamReturnType, } from '@walmart/allspark-foundation-hub'; -import {RosterNavParamsMap} from '../../navigation'; - -export const renderLeftHeader = ( - route: RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, - primaryTeam: UseGetViewersPrimaryTeamReturnType, - showTeamHub: boolean, -) => { - return !showTeamHub && - (!route?.params?.teamId || - (route?.params?.teamId && - primaryTeam?.[0]?.teamId === route?.params?.teamId)) - ? renderDrawerButton - : undefined; -}; - -export const renderTitle = ( - route: RouteProp<RosterNavParamsMap, 'myTeam.rosterDetail'>, - primaryTeam: UseGetViewersPrimaryTeamReturnType, - showTeamHub: boolean, -) => { - return !showTeamHub && - (!route?.params?.teamId || - (route?.params?.teamId && - primaryTeam?.[0]?.teamId === route?.params?.teamId)) - ? translationClient.translate('team.title', { - default: 'Team', - fallbackLng: 'en-US', - }) - : translationClient.translate('roster.title', { - default: 'Roster', - fallbackLng: 'en-US', - }); -}; export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const isSiteDC = useSelector(SiteSelectors.getWorkingSiteIsDC); @@ -53,12 +19,29 @@ export const RosterDetailScreen = ({route}: RosterDetailScreenProps) => { const showTeamHub = useUserCanSeeHub(); useEffect(() => { + const isOnPrimaryTeam = !showTeamHub && + (!route?.params?.teamId || + (route?.params?.teamId && + primaryTeam?.[0]?.teamId === route?.params?.teamId)); + + const title = isOnPrimaryTeam + ? translationClient.translate('team.title', { + default: 'Team', + fallbackLng: 'en-US', + }) + : translationClient.translate('roster.title', { + default: 'Roster', + fallbackLng: 'en-US', + }); + navigation.setOptions({ - title: renderTitle(route, primaryTeam, showTeamHub), - headerLeft: renderLeftHeader(route, primaryTeam, showTeamHub), + title, + ...(isOnPrimaryTeam && { + headerLeft: renderDrawerButton, + }), }); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [navigation]); + }, [navigation, primaryTeam, showTeamHub]); return ( <>
fix(ui): roster details styling issues
fix(ui): roster details styling issues
bc4633f6f9d0638e7ac1c84fa8fc68a992d1d316
--- .gitignore @@ -21,6 +21,7 @@ yarn-error.log # generated by bob lib/ +dist/ packages/**/tsconfig.tsbuildinfo packages/allspark-foundation/cli/ packages/allspark-foundation/cli/* --- packages/allspark-build-cache-provider/package.json @@ -10,11 +10,11 @@ "prepack": "yarn build" }, "dependencies": { + "@octokit/rest": "^21.1.1", "env-paths": "^3.0.0", "fs-extra": "^11.3.0", "node-fetch": "^3.3.2", "octokit": "^4.1.3", - "@octokit/rest": "^21.1.1", "tar": "^7.4.3", "uuid": "^11.1.0" }, @@ -39,4 +39,4 @@ "react": "19.x", "react-native": "0.79.x" } -} \ No newline at end of file +}
fix(ci): fixed gitignore issues (#543)
fix(ci): fixed gitignore issues (#543) * fix(plugin): updated sumo plugin to add initialize line * fix(ci): fixed looper publish issue with beta version * fix(ci): fixed cache provider gitignore issues --------- Co-authored-by: Hariharan Sundaram <hariharan.sundaram0@walmart.com>
b36c1bf90b092b2f4c6b705dd2eea513d5415af2
--- android/app/build.gradle @@ -143,7 +143,7 @@ android { } defaultConfig { - applicationId "com.walmart.squiggly" + applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 875 --- android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - package="com.walmart.squiggly"> + package="com.walmart.stores.allspark.beta"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.USE_BIOMETRIC" /> --- android/app/src/main/java/com/walmart/stores/allspark/beta/MainApplication.java @@ -12,7 +12,7 @@ import com.facebook.soloader.SoLoader; import java.lang.reflect.InvocationTargetException; import java.util.List; import com.walmart.ssmp.platform.core.PlatformCoreApplication; -import com.walmart.squiggly.BuildConfig; +import com.walmart.stores.allspark.beta.BuildConfig; import dagger.hilt.android.HiltAndroidApp; @HiltAndroidApp --- ios/AllSpark.xcodeproj/project.pbxproj @@ -264,7 +264,7 @@ LastUpgradeCheck = 1130; TargetAttributes = { 13B07F861A680F5B00A75B9A = { - DevelopmentTeam = 74G6H8XY8B; + DevelopmentTeam = F7HDEWM8SU; LastSwiftMigration = 1150; ProvisioningStyle = Manual; }; @@ -510,13 +510,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = 212ACBF9F6EA1B3866D5D388 /* Pods-AllSpark.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Prod"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 71; - DEVELOPMENT_TEAM = 74G6H8XY8B; + DEVELOPMENT_TEAM = F7HDEWM8SU; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = AllSpark/Info.plist; @@ -536,7 +536,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = com.walmart.squiggly; + PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta; PRODUCT_NAME = "Me@Walmart"; PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) Dev"; SWIFT_OBJC_BRIDGING_HEADER = "AllSpark-Bridging-Header.h"; @@ -551,13 +551,13 @@ isa = XCBuildConfiguration; baseConfigurationReference = 18C7AF990A657BA8B527E5F6 /* Pods-AllSpark.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Prod"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 71; - DEVELOPMENT_TEAM = 74G6H8XY8B; + DEVELOPMENT_TEAM = F7HDEWM8SU; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = AllSpark/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -576,9 +576,9 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = com.walmart.squiggly; + PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta; PRODUCT_NAME = "Me@Walmart"; - PROVISIONING_PROFILE_SPECIFIER = Squiggly_AppStore_Provision; + PROVISIONING_PROFILE_SPECIFIER = MeAtWMBeta_InHouse_Provision; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; --- ios/AllSpark/AllSpark.entitlements @@ -6,7 +6,7 @@ <string>development</string> <key>com.apple.security.application-groups</key> <array> - <string>group.com.walmart.sumo.appstore</string> + <string>group.com.walmart</string> </array> <key>keychain-access-groups</key> <array> --- ios/AllSpark/Info.plist @@ -9,9 +9,9 @@ <key>CFBundleExecutable</key> <string>$(EXECUTABLE_NAME)</string> <key>CFBundleIdentifier</key> - <string>com.walmart.squiggly</string> + <string>com.walmart.stores.allspark.beta</string> <key>SumoAppGroupId</key> - <string>group.com.walmart.sumo.appstore</string> + <string>group.com.walmart</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> @@ -31,7 +31,7 @@ <string>SSOLogin</string> <key>CFBundleURLSchemes</key> <array> - <string>com.walmart.squiggly</string> + <string>com.walmart.stores.allspark.beta</string> </array> </dict> </array> @@ -108,7 +108,7 @@ <string>remote-notification</string> </array> <key>UILaunchStoryboardName</key> - <string>LaunchScreen-Prod</string> + <string>LaunchScreen-Dev</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> @@ -126,7 +126,7 @@ <key>WMKits</key> <dict> <key>team-id</key> - <string>74G6H8XY8B</string> + <string>F7HDEWM8SU</string> </dict> </dict> </plist>
changing environment to dev
changing environment to dev
4994eae5c483db410e541ba250ac6364523ef167
--- packages/allspark-foundation/src/Telemetry/TelemetryContext.tsx @@ -0,0 +1,43 @@ +import React, { PropsWithChildren } from 'react'; +import { ITelemetryManager } from './types'; +import { TelemetryModule } from './TelemetryModule'; + +/** + * Context for providing a TelemetryManager instance. + * This is provided as an alternative to accessing a particular telemetry manager directly. + * Sometimes it's more convenient to create a telemetry manager for a particular module then set + * that in context for use by child components rather than importing the telemetry manager instance directly. + */ +export const TelemetryManagerContext = React.createContext<ITelemetryManager | null>(null); + +/** + * Provider component for TelemetryManagerContext. + * Allows either passing a featureId to create a new TelemetryManager, + * or passing an existing TelemetryManager instance. + * @param props Props including either featureId or manager, and children + * @returns Provider component wrapping children + */ +export const TelemetryManagerProvider = (props: PropsWithChildren<{ featureId: string } | { manager: ITelemetryManager }>) => { + const { children } = props; + + const telemetryManager = 'manager' in props ? props.manager : TelemetryModule.factory.createTelemetryManager(props.featureId); + + return ( + <TelemetryManagerContext.Provider value={telemetryManager} > + {children} + </TelemetryManagerContext.Provider> + ); +} + +/** + * Hook to access the TelemetryManager from context. + * Must be used within a TelemetryManagerContext.Provider. + * @returns The TelemetryManager instance + */ +export const useTelemetryManager = (): ITelemetryManager => { + const context = React.useContext(TelemetryManagerContext); + if (!context) { + throw new Error('useTelemetryManager must be used within a TelemetryManagerProvider'); + } + return context; +}; \ No newline at end of file
feat(telemetry): add context for internal use
feat(telemetry): add context for internal use
0d16f9b23195cc492ab5c655c9e5804783d5a38e
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/Screens/HubDashboard.tsx @@ -71,6 +71,7 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => { const userTeamSelectionComplete = useSelector( ManagerExperienceSelectors.getUserTeamSelectionComplete ); + const [userOnboarded, setUserOnboarded] = useState(false); const bottomSheetRef = useRef<{ open: () => void; close: () => void }>(null); @@ -158,7 +159,12 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => { /** Refresh the screen once the team selection is added/updated */ useEffect(() => { - onRefresh(); + if (userOnboardingComplete) { + setUserOnboarded(userOnboardingComplete); + } + if (userOnboardingComplete || userTeamSelectionComplete) { + onRefresh(); + } // eslint-disable-next-line react-hooks/exhaustive-deps }, [userOnboardingComplete, userTeamSelectionComplete]); @@ -262,7 +268,7 @@ export const HubDashboard = ({ name, widgets }: HubDashboardProps) => { </ScrollView> <BottomSheet ref={bottomSheetRef} - isVisible={userOnboardingComplete} + isVisible={userOnboarded} content={renderContent()} onPrimaryButtonPress={closeBottomSheet} primaryButtonText={
feat(ui): Update navigation for onboarding
feat(ui): Update navigation for onboarding
a1db0a72b30f6daa3f5642de30b23beed25ad5f0
--- scannedError.log @@ -1,4 +0,0 @@ -Build failed as we were not able to launch simulator for ( -Please relaunch the build process -Build failed as we were not able to launch simulator for ( -Please relaunch the build process
removed scannedError.log file
removed scannedError.log file
75c6fa4fc0d8dd30fc984ca52deec13cf99528ed
--- src/notification.ts @@ -40,16 +40,25 @@ export const backgroundPushNotificationHandler = (event?: SumoPushEvent) => { return false; }; -// export const foregroundPushNotificationHandler = (event?: SumoPushEvent) => { -// if ( -// event?.customData?.category === 'pushtotalkv2' && -// event.customData.messageType === messageTypes.AUDIO -// ) { -// playAudioMessageOrCatch(event.customData.url); -// return true; -// } -// return false; -// }; +export const foregroundPushNotificationHandler = (event?: SumoPushEvent) => { + if (event?.customData?.category === 'pushtotalkv2') { + const {storeNumber, channelId} = event?.customData; + // TODO - Handle when the user is already on the message screen + const handleOnTap = () => + goToMessageScreenForChannel(storeNumber, channelId); + navigate('Core.Toast', { + //@ts-ignore + duration: 4000, + //@ts-ignore + message: `${event?.title}: ${event?.body}`, + //@ts-ignore + dismissText: 'View', + customOnPress: handleOnTap, + }); + return true; + } + return false; +}; export const initNotificationListeners = async () => { WmNotification.addListener( @@ -57,8 +66,8 @@ export const initNotificationListeners = async () => { backgroundPushNotificationHandler, ); - // WmNotification.addListener( - // SumoPushEventTypes.ON_FOREGROUND_NOTIFICATION, - // foregroundPushNotificationHandler, - // ); + WmNotification.addListener( + SumoPushEventTypes.ON_FOREGROUND_NOTIFICATION, + foregroundPushNotificationHandler, + ); }; --- src/notification.ts @@ -40,16 +40,25 @@ export const backgroundPushNotificationHandler = (event?: SumoPushEvent) => { return false; }; -// export const foregroundPushNotificationHandler = (event?: SumoPushEvent) => { -// if ( -// event?.customData?.category === 'pushtotalkv2' && -// event.customData.messageType === messageTypes.AUDIO -// ) { -// playAudioMessageOrCatch(event.customData.url); -// return true; -// } -// return false; -// }; +export const foregroundPushNotificationHandler = (event?: SumoPushEvent) => { + if (event?.customData?.category === 'pushtotalkv2') { + const {storeNumber, channelId} = event?.customData; + // TODO - Handle when the user is already on the message screen + const handleOnTap = () => + goToMessageScreenForChannel(storeNumber, channelId); + navigate('Core.Toast', { + //@ts-ignore + duration: 4000, + //@ts-ignore + message: `${event?.title}: ${event?.body}`, + //@ts-ignore + dismissText: 'View', + customOnPress: handleOnTap, + }); + return true; + } + return false; +}; export const initNotificationListeners = async () => { WmNotification.addListener( @@ -57,8 +66,8 @@ export const initNotificationListeners = async () => { backgroundPushNotificationHandler, ); - // WmNotification.addListener( - // SumoPushEventTypes.ON_FOREGROUND_NOTIFICATION, - // foregroundPushNotificationHandler, - // ); + WmNotification.addListener( + SumoPushEventTypes.ON_FOREGROUND_NOTIFICATION, + foregroundPushNotificationHandler, + ); };
SMDV-4900 - adding in-app notification for messages part 1
SMDV-4900 - adding in-app notification for messages part 1
f6d24649e4c63a0bd334d13d770923700ecfca6f
--- src/utils/user.ts @@ -60,10 +60,7 @@ export const formatSchedule = (scheduleInfo: any): String => { } const {schedStartTime, schedEndTime} = getScheduleStartAndEndTime(scheduleInfo); - const scheduleText = schedStartTime + ' - ' + schedEndTime; - console.log('*** Format Schedule Output ***'); - console.log(scheduleText); - return scheduleText; + return schedStartTime + ' - ' + schedEndTime; }; export const getScheduleStartAndEndTime = (scheduleInfo: any) => { --- src/utils/user.ts @@ -60,10 +60,7 @@ export const formatSchedule = (scheduleInfo: any): String => { } const {schedStartTime, schedEndTime} = getScheduleStartAndEndTime(scheduleInfo); - const scheduleText = schedStartTime + ' - ' + schedEndTime; - console.log('*** Format Schedule Output ***'); - console.log(scheduleText); - return scheduleText; + return schedStartTime + ' - ' + schedEndTime; }; export const getScheduleStartAndEndTime = (scheduleInfo: any) => {
remove console log
remove console log
4393ca694e3b13adb32b6facf8e1d0265929b123
--- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -27,7 +27,6 @@ exports[`AssociateHallwayNav matches snapshot 1`] = ` options={ Object { "gestureDirection": "vertical", - "gestureEnabled": true, } } /> @@ -290,7 +289,6 @@ exports[`AssociateHallwayNav matches snapshot when time value are undefined 1`] options={ Object { "gestureDirection": "vertical", - "gestureEnabled": true, } } /> --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -129,7 +129,6 @@ export const MainStackNav = () => { name='askSam' component={AskSamMiniApp} options={{ - gestureEnabled: true, gestureDirection: 'vertical', ...bottomSheetTransitionOptions, }}
remove gesture
remove gesture
35e2ec38022549ac5891aad8c513f74aa89623ef
--- .looper.multibranch.yml @@ -5,6 +5,28 @@ tools: flavor: azul version: 17 +cache: + - name: cocoapods-cache + configs: + - type: generic + checksum: + - './targets/US/ios/Podfile.lock' + includes: + - './targets/US/ios/Pods' + +envs: + ## Global Variables + global: + variables: + XCODE_PROJECT_PATH: targets/US/ios/AllSpark.xcodeproj + ANDROID_GRADLE_PATH: targets/US/android/app/build.gradle + ios: + variables: + IOS_BASE_PATH: targets/US/ios + android: + variables: + ANDROID_BASE_PATH: targets/US/android + triggers: - manual: name: Publish Changed @@ -30,4 +52,4 @@ flows: publishFromChanges: - call: preparePublish - - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes \ No newline at end of file + - (name Publish From Changes) HUSKY_SKIP_HOOKS=1 npx lerna publish --yes
fix: looper configuration for mono repo
fix: looper configuration for mono repo
862c429643a854fb79641d3489ae07bbda9427ab
--- package-lock.json @@ -80,7 +80,7 @@ "@walmart/schedule-mini-app": "0.35.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.13", - "@walmart/taskit-mini-app": "2.34.2", + "@walmart/taskit-mini-app": "2.34.3", "@walmart/time-clock-mini-app": "2.85.0", "@walmart/topstock-mini-app": "1.0.5", "@walmart/ui-components": "1.11.1", @@ -6042,9 +6042,9 @@ } }, "node_modules/@walmart/taskit-mini-app": { - "version": "2.34.2", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.34.2.tgz", - "integrity": "sha512-PZ86XVVl1w5SjeVtkjoc5cqts1DAneVNp75ZG8dDRd9cGVGby79M+lyDZpxAh0fM1eSdQwxaWoCW/h1aEksWGQ==", + "version": "2.34.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.34.3.tgz", + "integrity": "sha512-JzIipZJ5Pjts55FDTX/DTVc3mp+BFQJc/tkDd2GbKeT7EssdM0CZkx1W0zhJN4pQg9SZs0swcXor2EYg/nodmA==", "peerDependencies": { "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@types/lodash": ">=4.14.176", @@ -25484,9 +25484,9 @@ "version": "1.5.13" }, "@walmart/taskit-mini-app": { - "version": "2.34.2", - "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.34.2.tgz", - "integrity": "sha512-PZ86XVVl1w5SjeVtkjoc5cqts1DAneVNp75ZG8dDRd9cGVGby79M+lyDZpxAh0fM1eSdQwxaWoCW/h1aEksWGQ==" + "version": "2.34.3", + "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-2.34.3.tgz", + "integrity": "sha512-JzIipZJ5Pjts55FDTX/DTVc3mp+BFQJc/tkDd2GbKeT7EssdM0CZkx1W0zhJN4pQg9SZs0swcXor2EYg/nodmA==" }, "@walmart/tcnumber": { "version": "2.3.3", --- package.json @@ -122,7 +122,7 @@ "@walmart/schedule-mini-app": "0.35.0", "@walmart/settings-mini-app": "1.18.1", "@walmart/shelfavailability-mini-app": "1.5.13", - "@walmart/taskit-mini-app": "2.34.2", + "@walmart/taskit-mini-app": "2.34.3", "@walmart/time-clock-mini-app": "2.85.0", "@walmart/topstock-mini-app": "1.0.5", "@walmart/ui-components": "1.11.1",
updated taskit version
updated taskit version
eccc162e79e0f097836a13f5fb7f26daeaa3f143
--- src/screens/MessagesScreen.tsx @@ -27,7 +27,7 @@ import { getChannelTypeFromPath, } from '../channels/transforms'; import {ChannelTypes} from '../channels'; -import {fetchResource} from "../services/blob"; +import {fetchResource} from '../services/blob'; const styles = StyleSheet.create({ container: { --- src/screens/MessagesScreen.tsx @@ -27,7 +27,7 @@ import { getChannelTypeFromPath, } from '../channels/transforms'; import {ChannelTypes} from '../channels'; -import {fetchResource} from "../services/blob"; +import {fetchResource} from '../services/blob'; const styles = StyleSheet.create({ container: {
fix lint error
fix lint error
9e2bfe662419a17ac04fbd61a7cce54cd75f53d3
--- src/queries/schema.types.ts @@ -1107,6 +1107,7 @@ export type CheckListItem = { status?: Maybe<Scalars['Int']>; }; +// eslint-disable-next-line no-shadow export enum ClockStatusDesc { OffTheClock = 'OFF_THE_CLOCK', OnTheClock = 'ON_THE_CLOCK', @@ -1215,6 +1216,7 @@ export type ComplianceTodoArgs = { activityTypeFilter?: InputMaybe<Array<ComplianceCourseActivityType>>; }; +// eslint-disable-next-line no-shadow export enum ComplianceCourseActivityType { GradQuiz = 'GRAD_QUIZ', Quiz = 'QUIZ', @@ -2054,6 +2056,7 @@ export type Event = { }; export enum EventType { + // eslint-disable-next-line no-shadow Birthday = 'BIRTHDAY', FifteenYearAnniversary = 'FIFTEEN_YEAR_ANNIVERSARY', FiftyYearAnniversary = 'FIFTY_YEAR_ANNIVERSARY', @@ -2131,6 +2134,7 @@ export type FieldOfStudy = { name: Scalars['String']; }; +// eslint-disable-next-line no-shadow export enum FilterBadges { All = 'ALL', Onboarding = 'ONBOARDING', @@ -2759,6 +2763,7 @@ export type Location = { locationTimeZone?: Maybe<LocationTimeZone>; }; +// eslint-disable-next-line no-shadow export enum LocationAvailabilityStatus { Available = 'AVAILABLE', Out = 'OUT', @@ -4231,6 +4236,7 @@ export type ProfilePicture = { profilePic?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum ProfilePictureSize { Large = 'LARGE', Original = 'ORIGINAL', @@ -4917,6 +4923,7 @@ export type SecondaryJobs = { secondaryStoreMdseDivNumber?: Maybe<Scalars['Int']>; }; +// eslint-disable-next-line no-shadow export enum SecondaryLocationType { Backroom = 'BACKROOM', Topstock = 'TOPSTOCK', @@ -4942,6 +4949,7 @@ export type SecondaryStockLocation = { sgln: Scalars['String']; }; +// eslint-disable-next-line no-shadow export enum SecondaryStockLocationType { Backroom = 'BACKROOM', Topstock = 'TOPSTOCK', @@ -5022,6 +5030,7 @@ export type SolrDocsList = { version?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum SortOrder { Ascending = 'ASCENDING', Descending = 'DESCENDING', @@ -5275,6 +5284,7 @@ export type TeamMetaData = { workgroupName?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum TeamRole { Salaried = 'SALARIED', Ta = 'TA', @@ -5774,6 +5784,7 @@ export type WorkgroupTeam = { workgroupId?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum IdType { Userid = 'USERID', Win = 'WIN', --- src/queries/schema.types.ts @@ -1107,6 +1107,7 @@ export type CheckListItem = { status?: Maybe<Scalars['Int']>; }; +// eslint-disable-next-line no-shadow export enum ClockStatusDesc { OffTheClock = 'OFF_THE_CLOCK', OnTheClock = 'ON_THE_CLOCK', @@ -1215,6 +1216,7 @@ export type ComplianceTodoArgs = { activityTypeFilter?: InputMaybe<Array<ComplianceCourseActivityType>>; }; +// eslint-disable-next-line no-shadow export enum ComplianceCourseActivityType { GradQuiz = 'GRAD_QUIZ', Quiz = 'QUIZ', @@ -2054,6 +2056,7 @@ export type Event = { }; export enum EventType { + // eslint-disable-next-line no-shadow Birthday = 'BIRTHDAY', FifteenYearAnniversary = 'FIFTEEN_YEAR_ANNIVERSARY', FiftyYearAnniversary = 'FIFTY_YEAR_ANNIVERSARY', @@ -2131,6 +2134,7 @@ export type FieldOfStudy = { name: Scalars['String']; }; +// eslint-disable-next-line no-shadow export enum FilterBadges { All = 'ALL', Onboarding = 'ONBOARDING', @@ -2759,6 +2763,7 @@ export type Location = { locationTimeZone?: Maybe<LocationTimeZone>; }; +// eslint-disable-next-line no-shadow export enum LocationAvailabilityStatus { Available = 'AVAILABLE', Out = 'OUT', @@ -4231,6 +4236,7 @@ export type ProfilePicture = { profilePic?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum ProfilePictureSize { Large = 'LARGE', Original = 'ORIGINAL', @@ -4917,6 +4923,7 @@ export type SecondaryJobs = { secondaryStoreMdseDivNumber?: Maybe<Scalars['Int']>; }; +// eslint-disable-next-line no-shadow export enum SecondaryLocationType { Backroom = 'BACKROOM', Topstock = 'TOPSTOCK', @@ -4942,6 +4949,7 @@ export type SecondaryStockLocation = { sgln: Scalars['String']; }; +// eslint-disable-next-line no-shadow export enum SecondaryStockLocationType { Backroom = 'BACKROOM', Topstock = 'TOPSTOCK', @@ -5022,6 +5030,7 @@ export type SolrDocsList = { version?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum SortOrder { Ascending = 'ASCENDING', Descending = 'DESCENDING', @@ -5275,6 +5284,7 @@ export type TeamMetaData = { workgroupName?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum TeamRole { Salaried = 'SALARIED', Ta = 'TA', @@ -5774,6 +5784,7 @@ export type WorkgroupTeam = { workgroupId?: Maybe<Scalars['String']>; }; +// eslint-disable-next-line no-shadow export enum IdType { Userid = 'USERID', Win = 'WIN',
suppress warnings
suppress warnings
3c21e6135bc2b67bba35d543c08adc7a02693c7f
--- src/services/config.ts @@ -9,7 +9,7 @@ export const getGraphQLConfig = (envConfig: EnvConfig) => { //envConfig.consumerId, // temporary until onboarded with athena 'wm_consumer.id': envConfig.env === 'prod' - ? 'cfac4a3d-ae91-43c8-81f5-ceb838e4cd44' + ? '7d935f1c-b438-4b89-9324-83a5380acf75' : '1bfc1d19-903b-438b-be7e-b0733aade46b', 'x-o-platform': 'roster-miniapp', 'x-o-platform-version': miniAppPackage?.version || '2.x.x',
Adding consumer id
Adding consumer id
70dbf4ec8e630c297f6b4f31618eb25613684999
--- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/index.tsx @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react'; +import React from 'react'; import { View } from 'react-native'; import { HubWidgetTypes } from './types'; import { HubWidgetStyles } from './styles'; @@ -24,33 +24,13 @@ export const HubWidget = ({ infoText, isActionBtnDisabled, variant, - refreshKey, - onRefreshStart, - onRefreshEnd, - refresh, ...rest }: HubWidgetTypes) => { const styles = HubWidgetStyles(); const IconComponent = Icons[iconName]; const showShortIntro = shortIntro && variant !== 'restricted'; const { t } = useAllsparkTranslation(FEATURE_ID); - - const reloadWidgetData = () => { - console.log('Reloading widget data.....', rest); - }; - - const onReload = async () => { - onRefreshStart(refreshKey); - await reloadWidgetData(); - onRefreshEnd(refreshKey); - }; - - useEffect(() => { - if (refresh) { - onReload(); - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [refresh]); + console.log('Rest props data: ', rest); return ( <View style={styles.container}> --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/types.ts @@ -20,10 +20,6 @@ interface HubWidgetBaseTypes { infoText?: string; selectedTeamPreference?: string; selectedTeamIds?: string[]; - refresh: boolean; - refreshKey: string; - onRefreshStart: (refreshKey: string) => void; - onRefreshEnd: (refreshKey: string) => void; } interface HubWidgetActionalable extends HubWidgetBaseTypes {
feat(ui): Update the refresh props for the hub
feat(ui): Update the refresh props for the hub
ed44f02d80a455021e949f29da34f4f07f9044d4
--- core/__tests__/core/FeatureToggleGuardTest.tsx @@ -18,6 +18,11 @@ describe('withFeatureToggleGuard', () => { it('renders the error message when feature is disabled', () => { (useOneClick as jest.Mock).mockReturnValue({ enable: false }); const component = render(<WrappedComponent />); - expect(component.getByText(/featureToggleGuard.title/i)).toBeTruthy(); - }); + const componentChild = component.root._fiber.child.sibling.child; + expect(componentChild.elementType.render.displayName).toBe('View'); + expect(componentChild.pendingProps.testID).toBe('ErrorMessage'); + expect(componentChild.pendingProps.children[1].props.children.type).toBe('Heading'); + expect(componentChild.pendingProps.children[1].props.children.props.children).toBe('featureToggleGuard.title'); + expect(componentChild.pendingProps.children[1].props.children.props.size).toBe('large'); + }); });
added component behavior for the test
added component behavior for the test
a0fd08e7f474923ef269364f8e970a1e4f904683
--- src/channels/components/UnreadBadge.tsx @@ -1,8 +1,10 @@ import React from 'react'; +import {useSelector} from 'react-redux'; import Animated, {ZoomIn} from 'react-native-reanimated'; import {Badge} from '@walmart/gtp-shared-components'; import {useUnread} from '../hooks'; import {StyleSheet} from 'react-native'; +import {messageButtonEnabled} from '../../redux/selectors'; const styles = StyleSheet.create({ badge: { @@ -12,8 +14,9 @@ const styles = StyleSheet.create({ export const UnreadBadge = () => { const unread = useUnread(); + const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); - return unread ? ( + return unread && isMessageButtonEnabled ? ( <Animated.View entering={ZoomIn} style={styles.badge}> <Badge color='spark'>{unread}</Badge> </Animated.View> --- src/channels/components/UnreadBadge.tsx @@ -1,8 +1,10 @@ import React from 'react'; +import {useSelector} from 'react-redux'; import Animated, {ZoomIn} from 'react-native-reanimated'; import {Badge} from '@walmart/gtp-shared-components'; import {useUnread} from '../hooks'; import {StyleSheet} from 'react-native'; +import {messageButtonEnabled} from '../../redux/selectors'; const styles = StyleSheet.create({ badge: { @@ -12,8 +14,9 @@ const styles = StyleSheet.create({ export const UnreadBadge = () => { const unread = useUnread(); + const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled); - return unread ? ( + return unread && isMessageButtonEnabled ? ( <Animated.View entering={ZoomIn} style={styles.badge}> <Badge color='spark'>{unread}</Badge> </Animated.View>
update ccm flag for unread count
update ccm flag for unread count
731f044eb26f96375b76c0440b8c0c39b09b5ebb
--- ios/Podfile.lock @@ -615,8 +615,6 @@ PODS: - BoringSSL-GRPC/Implementation (0.0.24): - BoringSSL-GRPC/Interface (= 0.0.24) - BoringSSL-GRPC/Interface (0.0.24) - - BVLinearGradient (2.6.2): - - React-Core - CocoaAsyncSocket (7.6.5) - CodePush (8.2.2): - Base64 (~> 1.1) @@ -2250,7 +2248,6 @@ PODS: DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - CocoaAsyncSocket - CodePush (from `../node_modules/react-native-code-push`) - "compass-sdk-rn (from `../node_modules/@walmart/compass-sdk-rn`)" @@ -2479,8 +2476,6 @@ SPEC REPOS: EXTERNAL SOURCES: boost: :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" - BVLinearGradient: - :path: "../node_modules/react-native-linear-gradient" CodePush: :path: "../node_modules/react-native-code-push" compass-sdk-rn: @@ -2732,7 +2727,6 @@ SPEC CHECKSUMS: Base64: cecfb41a004124895a7bcee567a89bae5a89d49b boost: 26fad476bfa736552bbfa698a06cc530475c1505 BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33 - BVLinearGradient: 34a999fda29036898a09c6a6b728b0b4189e1a44 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CodePush: eaa66fc8dd9ff611304ecc48397ce8831ba79ac9 compass-sdk-ios: 8077b7076d749de27c83846bad97ecde13f28657 @@ -2910,7 +2904,7 @@ SPEC CHECKSUMS: walmart-react-native-sumo-sdk: a6dc20c0ec3c8ab878886529a0e2fc22e747821c WebexSDK: d652713bd7ad5902e81918121912ba75a0056c3b wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3 - Yoga: 47d399a73c0c0caa9ff824e5c657eae31215bfee + Yoga: c716aea2ee01df6258550c7505fa61b248145ced PODFILE CHECKSUM: fc93c11e2096b0f20e15b7c98c1efea2b0908817
remove unneeded pod updates
remove unneeded pod updates
2b8c666596660370fa7b43ddf9be5950f958bd04
--- __tests__/__mocks__/@walmart/myteam-mini-app/index.js --- __tests__/__mocks__/@walmart/roster-mini-app/index.js --- __tests__/__mocks__/constants.js --- __tests__/__mocks__/packages/associate-exp-hub-mini-app/src/config/HubConfig.tsx --- __tests__/__mocks__/packages/associate-exp-hub-mini-app/src/constants.js --- __tests__/__mocks__/packages/associate-exp-hub-mini-app/src/constants/index.js --- __tests__/__mocks__/packages/associate-exp-hub-mini-app/src/services/telemetry/telemetry.js --- __tests__/__mocks__/packages/associate-exp-hub-mini-app/src/utils/telemetryUtils.js
feat(ui): update tests
feat(ui): update tests
285ccecb3579972ec188163eea9aed83fd8db25c
--- jest.config.js @@ -3,7 +3,13 @@ module.exports = { setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect'], testResultsProcessor: 'jest-sonar-reporter', coverageReporters: ['lcov', 'text'], - collectCoverageFrom: ['**/*.{ts,tsx}', '!**/*.d.ts'], + collectCoverageFrom: [ + '**/*.{ts,tsx}', + '!**/*.d.ts', + '!**/index.{ts,tsx}', + '!**/types.ts', + '!**/style.ts', + ], coverageThreshold: { 'global': { statements: 70,
feat(SMDV-7634): update jest.config so that we don't count barrel files and style files towards coverage
feat(SMDV-7634): update jest.config so that we don't count barrel files and style files towards coverage
10e06ef8ab3ed3a43da31648f3e021d08c4e30b9
--- package-lock.json @@ -3338,9 +3338,9 @@ "integrity": "sha512-53F4Ig1Bd7bMzwgmq0OnDa+T3PKdi0wyyTDg67F9mvdRn05Le+EVv6Dji8fft8XE8hGmgK5sjwpTuarBmnDsVQ==" }, "@walmart/exception-mini-app": { - "version": "0.34.0", - "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.34.0.tgz", - "integrity": "sha512-yxs/4U9guQGeQxSnrfIsOpYfpaKsqsUaar/ObVp4V2+U+kLv5w8OMtyRoF95LfWmQKdMl+rhZ5Jg8oXMGEgpJA==" + "version": "0.35.0", + "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.35.0.tgz", + "integrity": "sha512-xmcs0K9jjZ/PER3TbXMj8i7Yv9t5uKq93s5vsO1i4rVugGNXiORvzV9zhM01vIcfMhnEODvuYhmUdK6fvAnb6A==" }, "@walmart/feedback-all-spark-miniapp": { "version": "0.0.58", --- package.json @@ -76,7 +76,7 @@ "@walmart/ask-sam-mini-app": "0.30.15", "@walmart/config-components": "^1.0.29", "@walmart/counts-component-miniapp": "0.0.20", - "@walmart/exception-mini-app": "0.34.0", + "@walmart/exception-mini-app": "0.35.0", "@walmart/feedback-all-spark-miniapp": "0.0.58", "@walmart/functional-components": "1.0.32", "@walmart/gta-react-native-calendars": "0.0.15",
pinpoint bump
pinpoint bump
a065043ca718b36a543c11bbadfc1360080d18ae
--- __tests__/PinAccess/PinAccessScreenTest.tsx @@ -122,18 +122,6 @@ describe('PinAccess', () => { expect(setStoredPin).toHaveBeenCalledWith(pinCode); }); - it('renders as a Modal for PinScreenModal component', async () => { - defaultStateMock(); - - let component: ReactTestRenderer; - await act(async () => { - component = create( - <PinAccess {...baseProps} route={{name: 'PinAccessModal'}} />, - ); - expect(component.toJSON()).toMatchSnapshot(); - }); - }); - describe('Events', () => { defaultStateMock({dialogState: dialogConfig}); (EncryptedStorage.getItem as jest.Mock).mockResolvedValueOnce(pinCode); --- __tests__/PinAccess/__snapshots__/PinAccessScreenTest.tsx.snap @@ -89,5 +89,3 @@ exports[`PinAccess entry flow; no existing passcode 1`] = ` /> </View> `; - -exports[`PinAccess renders as a Modal for PinScreenModal component 1`] = `null`; --- package.json @@ -24,6 +24,7 @@ "android:prod": "npm run env:prod && react-native run-android --variant=prodDebug", "ios": "react-native run-ios", "ios:dev": "npm run env:dev && react-native run-ios", + "ios:beta": "npm run env:beta && react-native run-ios", "ios:prod": "npm run env:prod && react-native run-ios", "start": "react-native start", "coverage": "jest --coverage", --- src/PinAccess/PinAccess.tsx @@ -1,6 +1,6 @@ import React, {useState, FC, useEffect} from 'react'; import {useDispatch, useSelector} from 'react-redux'; -import {View, Modal} from 'react-native'; +import {View} from 'react-native'; import {StackScreenProps} from '@react-navigation/stack'; import {useTranslation} from 'react-i18next'; import EncryptedStorage from 'react-native-encrypted-storage'; @@ -43,11 +43,9 @@ type DialogContent = { export const PinAccess: FC<StackScreenProps<any>> = (props) => { const {navigation, route} = props; - const {params: {flow = ENTRY} = {}, name} = route; + const {params: {flow = ENTRY} = {}} = route; const isChangeFlow = flow === CHANGE; const showBackArrow = flow !== ENTRY; - const isModalScreen = name === 'PinAccessModal'; - const Wrapper = isModalScreen ? Modal : View; const dispatch = useDispatch(); const {top} = useSafeAreaInsets(); @@ -215,7 +213,7 @@ export const PinAccess: FC<StackScreenProps<any>> = (props) => { }; return ( - <Wrapper style={[styles.container, {paddingTop: top}]}> + <View style={[styles.container, {paddingTop: top}]}> <LockScreen headerTitle={headerTitle} passcodeLength={4} @@ -259,6 +257,6 @@ export const PinAccess: FC<StackScreenProps<any>> = (props) => { primaryButtonPress={primaryDialogButtonPress} {...dialogContent} /> - </Wrapper> + </View> ); };
Reverting pin screen modal to view
Reverting pin screen modal to view
737f0ecbdbba394ec44e1c21809cf00180f2f442
--- package-lock.json @@ -42,7 +42,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", "@walmart/attendance-mini-app": "3.10.0", - "@walmart/avp-feature-app": "0.0.31", + "@walmart/avp-feature-app": "0.0.32", "@walmart/avp-shared-library": "0.0.53", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.16", @@ -8531,13 +8531,10 @@ } }, "node_modules/@walmart/avp-feature-app": { - "version": "0.0.31", - "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.31.tgz", - "integrity": "sha512-j7JS9xr1499FSLKvH1HCHzhx+7E3LXgTNfD2mk7+moI92zVHOruHaXqiPyEP4Xi1J1oLSiPazhCFD2rq5Wc5jg==", + "version": "0.0.32", + "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.32.tgz", + "integrity": "sha512-tzufBPdEMOANy2H/P3kgQN20mz1kw6U6yQMnSS+LQenPhRF8N60uMF0nnI8ij/HIYGjgEBDqTTaIiMut6YTp5Q==", "hasInstallScript": true, - "dependencies": { - "react-native-gesture-handler": "^2.13.1" - }, "engines": { "node": ">=16" }, @@ -8547,7 +8544,8 @@ "@walmart/core-services": "~2.0.11", "@walmart/gtp-shared-components": "^2.0.0", "react": "^18.2.0", - "react-native": "~0.70.5" + "react-native": "~0.70.5", + "react-native-gesture-handler": "^2.13.1" } }, "node_modules/@walmart/avp-shared-library": { @@ -33022,12 +33020,9 @@ } }, "@walmart/avp-feature-app": { - "version": "0.0.31", - "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.31.tgz", - "integrity": "sha512-j7JS9xr1499FSLKvH1HCHzhx+7E3LXgTNfD2mk7+moI92zVHOruHaXqiPyEP4Xi1J1oLSiPazhCFD2rq5Wc5jg==", - "requires": { - "react-native-gesture-handler": "^2.13.1" - } + "version": "0.0.32", + "resolved": "https://npme.walmart.com/@walmart/avp-feature-app/-/avp-feature-app-0.0.32.tgz", + "integrity": "sha512-tzufBPdEMOANy2H/P3kgQN20mz1kw6U6yQMnSS+LQenPhRF8N60uMF0nnI8ij/HIYGjgEBDqTTaIiMut6YTp5Q==" }, "@walmart/avp-shared-library": { "version": "0.0.53", --- package.json @@ -83,7 +83,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", "@walmart/attendance-mini-app": "3.10.0", - "@walmart/avp-feature-app": "0.0.31", + "@walmart/avp-feature-app": "0.0.32", "@walmart/avp-shared-library": "0.0.53", "@walmart/compass-sdk-rn": "5.18.15", "@walmart/config-components": "4.2.16",
bumped the avp version
bumped the avp version
e912df6b8111430a99721dda58d9b22b5f47c03b
--- package-lock.json @@ -41,7 +41,7 @@ "i18next": "~21.9.2", "jwt-decode": "~3.1.2", "lodash": "~4.17.21", - "moment": "^2.29.4", + "moment-timezone": "~0.5.37", "namecase": "~1.1.2", "react": "~17.0.2", "react-i18next": "~11.18.6", @@ -19296,6 +19296,18 @@ "node": "*" } }, + "node_modules/moment-timezone": { + "version": "0.5.37", + "resolved": "https://npme.walmart.com/moment-timezone/-/moment-timezone-0.5.37.tgz", + "integrity": "sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==", + "license": "MIT", + "dependencies": { + "moment": ">= 2.9.0" + }, + "engines": { + "node": "*" + } + }, "node_modules/move-concurrently": { "version": "1.0.1", "resolved": "https://npme.walmart.com/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -39162,6 +39174,14 @@ "resolved": "https://npme.walmart.com/moment/-/moment-2.29.4.tgz", "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" }, + "moment-timezone": { + "version": "0.5.37", + "resolved": "https://npme.walmart.com/moment-timezone/-/moment-timezone-0.5.37.tgz", + "integrity": "sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==", + "requires": { + "moment": ">= 2.9.0" + } + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://npme.walmart.com/move-concurrently/-/move-concurrently-1.0.1.tgz", --- packages/allspark-container/package.json @@ -30,11 +30,6 @@ "@react-native-firebase/database": "~15.6.0", "@react-native-firebase/firestore": "~15.6.0", "@react-native-firebase/perf": "~15.6.0", - "@react-navigation/bottom-tabs": "~6.4.0", - "@react-navigation/drawer": "~6.5.0", - "@react-navigation/material-top-tabs": "~6.2.4", - "@react-navigation/native": "~6.0.13", - "@react-navigation/stack": "~6.3.1", "@walmart/config-components": "3.0.3", "@walmart/functional-components": "2.0.6", "@walmart/react-native-encrypted-storage": "1.1.12", @@ -42,10 +37,9 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.2.2-beta.2", "axios": "~0.27.2", + "i18next": "~21.9.2", "lodash": "~4.17.21", - "moment": "^2.29.4", "crypto-js": "~4.1.1", - "i18next": "~21.9.2", "jwt-decode": "~3.1.2", "namecase": "~1.1.2", "react-i18next": "~11.18.6", @@ -63,20 +57,34 @@ "wifi-store-locator": "^1.0.0-alpha2" }, "peerDependencies": { + "@react-navigation/bottom-tabs": "~6.4.0", + "@react-navigation/drawer": "~6.5.0", + "@react-navigation/material-top-tabs": "~6.2.4", + "@react-navigation/native": "~6.0.13", + "@react-navigation/stack": "~6.3.1", + "@walmart/allspark-foundation": "~1.8.0", + "@walmart/gtp-shared-components": "1.8.9", + "moment-timezone": "~0.5.37", "react": "^17.0.2", - "react-native": ">=0.66.0 <0.68.0", - "@walmart/allspark-foundation": "~1.8.0" + "react-native": ">=0.66.0 <0.68.0" }, "devDependencies": { + "@react-navigation/bottom-tabs": "~6.4.0", + "@react-navigation/drawer": "~6.5.0", + "@react-navigation/material-top-tabs": "~6.2.4", + "@react-navigation/native": "~6.0.13", + "@react-navigation/stack": "~6.3.1", "@types/crypto-js": "^4.0.2", "@types/lodash": "^4.14.178", "@types/react": "^17.0.37", "@types/react-redux": "^7.1.9", "@types/react-native": "0.67.4", "@types/uuid": "^8.3.4", + "@walmart/allspark-foundation": "~1.8.0", + "@walmart/gtp-shared-components": "1.8.9", + "moment-timezone": "~0.5.37", "react": "~17.0.2", - "react-native": "0.67.4", - "@walmart/allspark-foundation": "~1.8.0" + "react-native": "~0.67.4" }, "resolutions": { "@types/react": "^17" --- packages/allspark-foundation/package.json @@ -17,11 +17,27 @@ "clean": "rm index.d.ts index.js **/*.d.ts **/*.js || true" }, "dependencies": { + "axios": "~0.27.2", + "i18next": "~21.9.2", + "lodash": "~4.17.21", + "react-i18next": "~11.18.6", + "react-redux": "~7.2.9", + "redux": "~4.2.0", + "redux-flipper": "~2.0.2", + "redux-saga": "~1.2.1", + "redux-thunk": "~2.4.1", "reduxsauce": "~1.2.1", "reselect": "~4.1.6", "seamless-immutable": "~7.1.4", "uuid": "~9.0.0" }, + "peerDependencies": { + "@react-navigation/stack": "~6.3.1", + "@walmart/gtp-shared-components": "1.8.9", + "moment-timezone": "~0.5.37", + "react": "^17.0.2", + "react-native": ">=0.66.0 <0.69.0" + }, "devDependencies": { "@react-navigation/stack": "~6.3.1", "@types/lodash": "~4.14.185", @@ -31,34 +47,9 @@ "@types/seamless-immutable": "~7.1.16", "@types/uuid": "~8.3.4", "@walmart/gtp-shared-components": "1.8.9", - "axios": "~0.27.2", - "i18next": "~21.9.2", - "lodash": "~4.17.21", - "moment": "^2.29.4", + "moment-timezone": "~0.5.37", "react": "~17.0.2", - "react-i18next": "~11.18.6", - "react-native": "~0.67.4", - "react-redux": "~7.2.9", - "redux": "~4.2.0", - "redux-saga": "~1.2.1", - "redux-thunk": "~2.4.1", - "redux-flipper": "~2.0.2" - }, - "peerDependencies": { - "@react-navigation/stack": "~6.3.1", - "@walmart/gtp-shared-components": "1.8.9", - "axios": "~0.27.2", - "i18next": "~21.9.2", - "lodash": "~4.17.21", - "moment": "^2.29.4", - "react": "^17.0.2", - "react-i18next": "~11.18.6", - "react-native": ">=0.66.0 <0.69.0", - "react-redux": "~7.2.9", - "redux": "~4.2.0", - "redux-saga": "~1.2.1", - "redux-thunk": "~2.4.1", - "redux-flipper": "~2.0.2" + "react-native": "~0.67.4" }, "resolutions": { "@types/react": "^17"
chore: package updates
chore: package updates
057918814b9d1279082d08858b87f96b4cecbf5e
--- .yarn/patches/@walmart-native-rfid-scanner-npm-3.7.3-5a801a9019.patch @@ -0,0 +1,11 @@ +diff --git a/android/gradle.properties b/android/gradle.properties +index ce7988ed175160b23f23b0aff664349eaa43c88f..c622c5cad2e07148d0368c93e79a51de3cf404f6 100644 +--- a/android/gradle.properties ++++ b/android/gradle.properties +@@ -7,4 +7,4 @@ FLIPPER_VERSION=0.35.0 + JACKSON_VERSION = 2.9.3 + LOG4J_VERSION = 2.13.3 + MOCKITO_VERSION = 3.6.28 +-LOMBOK_VERSION = 1.18.18 +\ No newline at end of file ++LOMBOK_VERSION = 1.18.28
Adding patch for rfid scanner
Adding patch for rfid scanner
8599c8bc1fabb66741d65b1a663194b0b0029ea9
--- src/queries/getTeamsbyStore.ts @@ -26,7 +26,6 @@ export type GetTeamsByStoreQuery = { } | null> | null; }; -//TODO: Update MGQL to add these workgroup id fields export const GetTeamsByStoreDocument = gql` query GetTeamsByStore( $countryCode: String! --- src/queries/getTeamsbyStore.ts @@ -26,7 +26,6 @@ export type GetTeamsByStoreQuery = { } | null> | null; }; -//TODO: Update MGQL to add these workgroup id fields export const GetTeamsByStoreDocument = gql` query GetTeamsByStore( $countryCode: String!
removing unneeded changes to graphql
removing unneeded changes to graphql
f5c875937b7da65e5de91e1b495079a589358ee1
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.14", + "version": "1.0.14.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/myteam-mini-app", - "version": "1.0.14", + "version": "1.0.14.1", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", @@ -65,9 +65,9 @@ "@walmart/react-native-scanner-3.0": "0.4.2", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", - "@walmart/roster-mini-app": "1.0.16", + "@walmart/roster-mini-app": "1.0.17.1", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.15", + "@walmart/wmconnect-mini-app": "1.0.16.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11815,9 +11815,9 @@ } }, "node_modules/@walmart/roster-mini-app": { - "version": "1.0.16", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.16.tgz", - "integrity": "sha512-dTyQa9U8ZpVWgs7n+z5gjUNtrPiifmLBI71JKyPfazDfNSEa0GbXwvJrRQZYfs2bI+RpFQWWkE/nNkxJjBWfSQ==", + "version": "1.0.1-7.1", + "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.1-7.1.tgz", + "integrity": "sha512-n3x5/kW6RM6L4RHqRvcK5EaKMi6dH5CkaPYOvHvxq52xkEELz37oSTos58lkghjqQmPokGtCkCfDm3/ob6WO4w==", "dev": true, "hasInstallScript": true }, @@ -11844,9 +11844,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "version": "1.0.15", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.15.tgz", - "integrity": "sha512-nPIUPqtMXnTwR1UahbkO6o2reB8J2kVg2F1h0LKBn8v2AebEfJXfYDelKDFgKd+BsMJ6g/oE2BdHmc5WoDX2/g==", + "version": "1.0.1-6.1", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.1-6.1.tgz", + "integrity": "sha512-p0HPkLTH2P3MnOkEesJQV0qB+BpEL7RfNp17pRsMf7c/exLLEqN1fxMLbSNDwtz5Xjiznv0tG4r+caS7HoM+yA==", "dev": true, "hasInstallScript": true }, @@ -41047,9 +41047,9 @@ } }, "@walmart/roster-mini-app": { - "version": "1.0.16", - "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.16.tgz", - "integrity": "sha512-dTyQa9U8ZpVWgs7n+z5gjUNtrPiifmLBI71JKyPfazDfNSEa0GbXwvJrRQZYfs2bI+RpFQWWkE/nNkxJjBWfSQ==", + "version": "1.0.1-7.1", + "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.1-7.1.tgz", + "integrity": "sha512-n3x5/kW6RM6L4RHqRvcK5EaKMi6dH5CkaPYOvHvxq52xkEELz37oSTos58lkghjqQmPokGtCkCfDm3/ob6WO4w==", "dev": true }, "@walmart/ui-components": { @@ -41064,9 +41064,9 @@ } }, "@walmart/wmconnect-mini-app": { - "version": "1.0.15", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.15.tgz", - "integrity": "sha512-nPIUPqtMXnTwR1UahbkO6o2reB8J2kVg2F1h0LKBn8v2AebEfJXfYDelKDFgKd+BsMJ6g/oE2BdHmc5WoDX2/g==", + "version": "1.0.1-6.1", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.1-6.1.tgz", + "integrity": "sha512-p0HPkLTH2P3MnOkEesJQV0qB+BpEL7RfNp17pRsMf7c/exLLEqN1fxMLbSNDwtz5Xjiznv0tG4r+caS7HoM+yA==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.0.14", + "version": "1.0.14.1", "private": false, "main": "dist/index.js", "files": [ @@ -88,8 +88,8 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "1.0.15", - "@walmart/roster-mini-app": "1.0.16", + "@walmart/wmconnect-mini-app": "1.0.16.1", + "@walmart/roster-mini-app": "1.0.17.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- src/constants.ts @@ -3,4 +3,5 @@ export const APP_CONTAINER_SCREEN_NAME = 'myTeam.root'; export const MESSAGES_SCREEN_NAME = 'myTeam.messages'; export const NEW_MESSAGES_SCREEN_NAME = 'myTeam.newMessage'; export const IMAGE_PREVIEW_SCREEN = 'myTeam.imagePreviewScreen'; +export const VIEW_MESSAGE_DETAILS_SCREEN_NAME = 'myTeam.viewDetails'; export const LOCAL_STORAGE_KEY_PREFIX = 'myTeam-'; --- src/navigation/index.tsx @@ -16,11 +16,13 @@ import { NewMessageScreen, ImagePreviewScreen, buildMessageScreenOptions, + ViewMessageDetailsScreen, } from '@walmart/wmconnect-mini-app'; import { IMAGE_PREVIEW_SCREEN, MESSAGES_SCREEN_NAME, NEW_MESSAGES_SCREEN_NAME, + VIEW_MESSAGE_DETAILS_SCREEN_NAME, } from '../constants'; const TextingStack = createStackNavigator<TextingNavParamsMap>(); @@ -84,6 +86,11 @@ export const TextingNavigation = () => { options={messageScreenOptions} component={ImagePreviewScreen} /> + <TextingStack.Screen + name={VIEW_MESSAGE_DETAILS_SCREEN_NAME} + options={messageScreenOptions} + component={ViewMessageDetailsScreen} + /> </TextingStack.Navigator> ); }; --- src/navigation/types.ts @@ -1,4 +1,5 @@ import {GetTeamByIdQuery} from '../queries/getTeamById'; +import {FirebaseFirestoreTypes} from '@react-native-firebase/firestore'; export type TextingNavParamsMap = { myTeam: any; @@ -12,6 +13,10 @@ export type TextingNavParamsMap = { }; 'myTeam.searchScreen': {searchInput: string}; 'myTeam.clockedOutScreen': undefined; + 'myTeam.viewDetails': { + channelPath: string | undefined; + createdAt: FirebaseFirestoreTypes.Timestamp; + }; 'myTeam.imagePreviewScreen': { imageSource: {uri: any}; };
version update
version update
a3c7bc77272bd38e6c9b7798cbf30dd4e23d456e
--- package-lock.json @@ -37,7 +37,7 @@ "@walmart/amp-mini-app": "1.1.46", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.12.2", - "@walmart/attendance-mini-app": "0.238.0", + "@walmart/attendance-mini-app": "1.0.0 ", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.2.1 ", "@walmart/core-services": "~2.0.19", @@ -53,7 +53,7 @@ "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.6", - "@walmart/impersonation-mini-app": "1.20.1", + "@walmart/impersonation-mini-app": "1.20.2", "@walmart/ims-print-services-ui": "2.4.1", "@walmart/inbox-mini-app": "0.85.2", "@walmart/iteminfo-mini-app": "7.3.4", @@ -4886,9 +4886,9 @@ } }, "node_modules/@walmart/attendance-mini-app": { - "version": "0.238.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.238.0.tgz", - "integrity": "sha512-kQN/NcSo++tbpMnk4jid92alVPexATJ3WTT/3IjOSAf9C9kgEFvlb270L+PDIpcofAniHCNI2hbJ5JdlOHnl+A==", + "version": "1.0.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-1.0.0.tgz", + "integrity": "sha512-w2+SCQMmoHwGaW2XUoxAvvihVUofRcYnHYH+50qFZKsTu0laqwDtPIc/5iB4N8yconlCR0SK890v94v51fPH1Q==", "dependencies": { "@walmart/gta-react-native-calendars": "^0.0.16", "@walmart/wfm-ui": "^0.2.26", @@ -5314,9 +5314,9 @@ "license": "UNLICENSED" }, "node_modules/@walmart/impersonation-mini-app": { - "version": "1.20.1", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.1.tgz", - "integrity": "sha512-tMHxxAdD804+MNKHps9VIXlOZb5ioTcEDrx9ZICKhO8ZaY3QL2U5Bn2mpHK8TzZermRjN5T7rG3V8KtHoFYGiQ==", + "version": "1.20.2", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.2.tgz", + "integrity": "sha512-Eubyowsouh6ZEZEfJ4je0i+GwZzSFc36p5q1JeUfjrkLWNt/lJZUnIZ1cNKnEHVqCR+y5HwJ9JuRiioWyJ5sfQ==", "peerDependencies": { "@react-native-community/masked-view": ">=0.1.10", "@react-native-community/picker": ">=1.8.1", @@ -25159,9 +25159,9 @@ } }, "@walmart/attendance-mini-app": { - "version": "0.238.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-0.238.0.tgz", - "integrity": "sha512-kQN/NcSo++tbpMnk4jid92alVPexATJ3WTT/3IjOSAf9C9kgEFvlb270L+PDIpcofAniHCNI2hbJ5JdlOHnl+A==", + "version": "1.0.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-1.0.0.tgz", + "integrity": "sha512-w2+SCQMmoHwGaW2XUoxAvvihVUofRcYnHYH+50qFZKsTu0laqwDtPIc/5iB4N8yconlCR0SK890v94v51fPH1Q==", "requires": { "@walmart/gta-react-native-calendars": "^0.0.16", "@walmart/wfm-ui": "^0.2.26", @@ -25303,9 +25303,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.20.1", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.1.tgz", - "integrity": "sha512-tMHxxAdD804+MNKHps9VIXlOZb5ioTcEDrx9ZICKhO8ZaY3QL2U5Bn2mpHK8TzZermRjN5T7rG3V8KtHoFYGiQ==" + "version": "1.20.2", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.20.2.tgz", + "integrity": "sha512-Eubyowsouh6ZEZEfJ4je0i+GwZzSFc36p5q1JeUfjrkLWNt/lJZUnIZ1cNKnEHVqCR+y5HwJ9JuRiioWyJ5sfQ==" }, "@walmart/ims-print-services-ui": { "version": "2.4.1" --- package.json @@ -79,7 +79,7 @@ "@walmart/amp-mini-app": "1.1.46", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.12.2", - "@walmart/attendance-mini-app": "0.238.0", + "@walmart/attendance-mini-app": "1.0.0 ", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.2.1 ", "@walmart/core-services": "~2.0.19", @@ -95,9 +95,9 @@ "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.6", - "@walmart/impersonation-mini-app": "1.20.1", + "@walmart/impersonation-mini-app": "1.20.2", "@walmart/ims-print-services-ui": "2.4.1", - "@walmart/inbox-mini-app": "0.85.2", + "@walmart/inbox-mini-app": "0.86.0", "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25",
Platform components Upgrade
Platform components Upgrade
2138ddc9d4b6367882954963741155cda10a0f7e
--- ios/Podfile.lock @@ -410,7 +410,7 @@ PODS: - RNPermissions - PromisesObjC (1.2.12) - Protobuf (3.14.0) - - PTT (0.5.19): + - PTT (0.5.21): - BinaryCodable (~> 0.2.1) - CocoaAsyncSocket (~> 7.6.3) - Starscream (~> 3.0.2) @@ -590,8 +590,8 @@ PODS: - React-Core - react-native-pdf (6.2.2): - React-Core - - react-native-ptt-module (1.2.24): - - PTT (= 0.5.19) + - react-native-ptt-module (1.2.28): + - PTT (= 0.5.21) - React - react-native-safe-area-context (3.1.8): - React-Core @@ -1038,7 +1038,7 @@ SPEC CHECKSUMS: Permission-Notifications: 4325073de6e418cfbbdd8d296822c419d8ddc7ef PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 Protobuf: 0cde852566359049847168e51bd1c690e0f70056 - PTT: 8c7a44c8127e1d112e49743885a12e395734b45e + PTT: 903984c0ae48f2e7ca562f0266a76ba7cd5e5060 RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe RCTTypeSafety: 44982c5c8e43ff4141eb519a8ddc88059acd1f3a React: e1c65dd41cb9db13b99f24608e47dd595f28ca9a @@ -1054,7 +1054,7 @@ SPEC CHECKSUMS: react-native-logger: db3a4f0f66953e88422d988def9c603c0e43396a react-native-netinfo: e36c1bb6df27ab84aa933679b3f5bbf9d180b18f react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f - react-native-ptt-module: 2a05e3de558e49629d1412ee94ae139355d3ee4d + react-native-ptt-module: 65a769dc91f3e556f6305b1a25bc2cb2176c8526 react-native-safe-area-context: 01158a92c300895d79dee447e980672dc3fb85a6 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-sumo-sdk: 8a034fe724417d8c9465951630e229edef2f738f --- package-lock.json @@ -3124,9 +3124,9 @@ } }, "@walmart/push-to-talk-mini-app": { - "version": "0.3.15", - "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.3.15.tgz", - "integrity": "sha512-d1qj1tCLOIT/hztq6m4ZrRlVxQxhJtfUc0BiSOVQJRw7qKfEQcGgOyJO3p5a/mwuRapzjE/QeUNEgoFymhNuZQ==" + "version": "0.3.26", + "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.3.26.tgz", + "integrity": "sha512-DW+9uNGFaNEBjM4uZIaIyYD7lqF9nQ41jGKV63ZYTkopBMnLyxxqDo7+6by9buP5l9V/1AjliliSLFCE6ZiXEA==" }, "@walmart/react-native-collapsible": { "version": "1.5.3", @@ -12263,9 +12263,9 @@ "integrity": "sha512-PO99dptMocEfUSS3SM7gY6UqophaBxizKjnZ7FcEwa+H4ONVxTk310/JCXJ9vdNunomgpxHluKRXnApfm9Md1w==" }, "react-native-ptt-module": { - "version": "1.2.24", - "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.2.24.tgz", - "integrity": "sha512-ntOki4ETFw036WXHoM5p9CLcQOrOHZfvsYAY4VCYZTsNKNuv/+cbId9a2+1sLb+5d2RtEgXGfbCupGotJXzyWw==" + "version": "1.2.28", + "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.2.28.tgz", + "integrity": "sha512-zD0B3Q5bB/QCiTFLTQbql/1TV1fl9jwAup72KC7sRaprB7nB3xuv1femv+U/Zs26IwWSVezzbv7yF6FEaUZpgA==" }, "react-native-qrcode-svg": { "version": "6.0.6", --- package.json @@ -70,7 +70,7 @@ "@walmart/impersonation-mini-app": "1.0.14", "@walmart/inbox-mini-app": "0.0.59", "@walmart/moment-walmart": "1.0.4", - "@walmart/push-to-talk-mini-app": "0.3.15", + "@walmart/push-to-talk-mini-app": "0.3.26", "@walmart/react-native-env": "^0.1.0", "@walmart/react-native-logger": "^1.24.0", "@walmart/react-native-shared-navigation": "^0.3.0", @@ -101,7 +101,7 @@ "react-native-pdf": "^6.2.0", "react-native-permissions": "3.0.0", "react-native-popup-menu": "^0.15.9", - "react-native-ptt-module": "1.2.24", + "react-native-ptt-module": "1.2.28", "react-native-qrcode-svg": "^6.0.6", "react-native-reanimated": "^1.10.2", "react-native-safe-area-context": "^3.1.3",
PTT Version bump (#418)
PTT Version bump (#418) * PTT Version bump * PTT Version update
656c2874c5fedc3c5209611b180e3cacb8022402
--- packages/me-at-walmart-container/src/services/auth.ts @@ -74,7 +74,9 @@ export const onAuthError = async (event: AuthErrorEvent) => { } AuthLogger.error(`AUTH: ${event.category}`, event); - AuthTelemetry.logEvent(event.category.toLocaleLowerCase(), {}); + AuthTelemetry.logEvent(event.category.toLocaleLowerCase(), { + code: event.code, + }); switch (event.category) { // If failed to sign in because of invalid grant, request a sign out
chore: update auth code for auth errors
chore: update auth code for auth errors
c90663185f6006414c97c91975d097f2af578d7f
--- package-lock.json @@ -3249,9 +3249,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.21.0", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.21.0.tgz", - "integrity": "sha512-QEwa7pFCjzLakjkCcjM2ggZRTpaqXA9nZsilzFubE4vmZ1BZXwAB3hAnd69bx3+kcgx30AZYphd8jv/vmuKoOw==" + "version": "0.23.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.23.0.tgz", + "integrity": "sha512-RMs/hODuQfjzgymdTTh2EguqaqIAZJxwlC+HwL1v2hqUrTaiB+RBH4vx/rQ9sQbVMotTZrLZn68y+iF94h/mOA==" }, "@walmart/wfm-ui": { "version": "0.1.50", --- package.json @@ -83,7 +83,7 @@ "@walmart/settings-mini-app": "1.2.3", "@walmart/time-clock-mini-app": "0.3.2", "@walmart/ui-components": "1.1.14", - "@walmart/welcomeme-mini-app": "0.21.0", + "@walmart/welcomeme-mini-app": "0.23.0", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0",
welcomeMe-mini version bump
welcomeMe-mini version bump
1f4d43d53169bd850850e980fb49606c69dfaaf6
--- core/__tests__/navigation/USHallway/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -29,24 +29,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects } } /> - <Screen - component={[Function]} - name="StoreFeatureOrders" - options={ - { - "headerShown": false, - } - } - /> - <Screen - component={[Function]} - name="StoreFeatureOrderHistory" - options={ - { - "headerShown": false, - } - } - /> <Screen component={[Function]} name="Topstock" @@ -674,24 +656,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects } } /> - <Screen - component={[Function]} - name="StoreFeatureOrders" - options={ - { - "headerShown": false, - } - } - /> - <Screen - component={[Function]} - name="StoreFeatureOrderHistory" - options={ - { - "headerShown": false, - } - } - /> <Screen component={[Function]} name="Topstock"
DROP28 release request to develop test
DROP28 release request to develop test
7b3885edc83f59ebc3c9519c4eb4b997352714cc
--- package.json @@ -270,4 +270,4 @@ "engines": { "node": ">=18" } -} \ No newline at end of file +} --- targets/US/package.json @@ -91,7 +91,7 @@ "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.5.20", "@walmart/calling-mini-app": "0.5.17", - "@walmart/checkout-mini-app": "4.0.3", + "@walmart/checkout-mini-app": "4.0.6", "@walmart/compass-sdk-rn": "5.19.15", "@walmart/config-components": "4.4.5", "@walmart/core-services": "~6.5.2", --- yarn.lock @@ -6153,9 +6153,9 @@ __metadata: languageName: node linkType: hard -"@walmart/checkout-mini-app@npm:4.0.3": - version: 4.0.3 - resolution: "@walmart/checkout-mini-app@npm:4.0.3" +"@walmart/checkout-mini-app@npm:4.0.6": + version: 4.0.6 + resolution: "@walmart/checkout-mini-app@npm:4.0.6" dependencies: "@stomp/stompjs": "npm:^7.0.0" cpc-input: "npm:^1.7.28" @@ -6197,7 +6197,7 @@ __metadata: react-native-wm-telemetry: ">=6" react-redux: ^8.1.3 redux: ^4.0.5 - checksum: 10c0/2a9a862b4a89c44952d0997bcf4a07b2191864812d9ab72b78e6588c3970da76b7efa38695d0ea7f0ec9b393da93426eee2ab152363cff1c02e21457f17ec47f + checksum: 10c0/13c7cf25d06dc365704ba0db799da57ce7bfcc2de1c8b12a87666f2f94dcfe3ccd589703ff34aaefb6cd8db5b92cd0faa64277a8675cfc50bfa990cd2ece5831 languageName: node linkType: hard @@ -7007,7 +7007,7 @@ __metadata: "@walmart/avp-shared-library": "npm:0.10.1" "@walmart/backroom-mini-app": "npm:1.5.20" "@walmart/calling-mini-app": "npm:0.5.17" - "@walmart/checkout-mini-app": "npm:4.0.3" + "@walmart/checkout-mini-app": "npm:4.0.6" "@walmart/compass-sdk-rn": "npm:5.19.15" "@walmart/config-components": "npm:4.4.5" "@walmart/core-services": "npm:~6.5.2"
checkout 4.0.6
checkout 4.0.6
09836350bd31198c8fe8ea74b0dd2b8540933c84
--- __tests__/startup/SsoSagaTest.ts @@ -69,6 +69,7 @@ jest.mock('../../src/redux', () => ({ jest.mock('../../src/services/Logger', () => ({ logger: { + info: jest.fn(), error: jest.fn(), warn: jest.fn(), },
Test fix
Test fix
078674e49b78e88506ec91a1517f5ee331cae042
--- package-lock.json @@ -4806,9 +4806,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.123.0", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.123.0.tgz", - "integrity": "sha512-7pbhUKjg0q5B5h2B2rP/IVGvq/Ey6Od9baePuQZZse+U84tXjVwgE/HftzHvdVeqc3xku0UlFpmAceXV5jmHKA==" + "version": "0.123.2", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.123.2.tgz", + "integrity": "sha512-3aRtcbxEAbhQvxnIFm8v2KseydCCe56g+1OdPTwNDX9c635yfHACvhQX676saTCpKqS11TE6NqBV+ClG4dukQg==" }, "@walmart/price-changes-mini-app": { "version": "1.2.3", --- package.json @@ -91,7 +91,7 @@ "@walmart/manager-approvals-miniapp": "0.0.60", "@walmart/metrics-mini-app": "0.8.1", "@walmart/moment-walmart": "1.0.4", - "@walmart/payrollsolution_miniapp": "^0.123.0", + "@walmart/payrollsolution_miniapp": "^0.123.2", "@walmart/price-changes-mini-app": "1.2.3", "@walmart/profile-feature-app": "0.0.34", "@walmart/push-to-talk-mini-app": "1.7.14",
bump version
bump version
13b95e1bf4207ec24a8c99e97fd577a674ad9607
--- ios/AllSpark.xcodeproj/project.pbxproj @@ -474,7 +474,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-AllSpark/Pods-AllSpark-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/DMSDK/DMSDK.framework/DMSDK", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/react-native-wm-barcode/DMSDK.framework/DMSDK", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( --- ios/Podfile.lock @@ -1043,4 +1043,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 7efc314454ab8f495d11a401c27762edcf1c5e4f -COCOAPODS: 1.10.2 +COCOAPODS: 1.11.3
using cocoapods version 1.11.3
using cocoapods version 1.11.3
15bae9dc741857017ad17200723411a8f2e22ce3
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingScreen.tsx @@ -42,6 +42,7 @@ export const OnboardingScreen = () => { const [input, setInput] = useState(''); const dispatch = useDispatch(); const win = useSelector(UserSelectors.getWin); + const [showMandatoryShiftAlert, setShowMandatoryShiftAlert] = useState(false); const [selectedTeams, setSelectedTeams] = useState<string[]>([]); const [selectedShifts, setSelectedShifts] = useState<string[]>([]); const [sections, setSearchedsections] = useState<typeof allSiteTeamsSections>( @@ -85,7 +86,7 @@ export const OnboardingScreen = () => { [allSiteTeamsSections, input] ); - const handleSelection = useCallback( + const handleSelectTeam = useCallback( (item: string) => { const teamIsSelected = Boolean( selectedTeams.find((team) => team === item) @@ -103,6 +104,9 @@ export const OnboardingScreen = () => { const shiftIsSelected = Boolean( selectedShifts.find((shift) => shift === item) ); + if (selectedShifts.length !== -1) { + setShowMandatoryShiftAlert(false); + } if (shiftIsSelected) { setSelectedShifts(selectedShifts.filter((shift) => shift !== item)); } else { @@ -132,11 +136,15 @@ export const OnboardingScreen = () => { teamSelectionTelemetry.logEvent('supplychain_onboarding_event', { message: 'Supplychain onboarding event started', }); - dispatch(ManagerExperienceCreators.setSelectedTeamIDs(selectedTeams)); - dispatch(ManagerExperienceCreators.setSelectedShifts(selectedShifts)); - await AllsparkLocalStorage.set(ONBOARDING_KEY, 'true'); - upsertSupplyChainPreferences(selectedShifts, selectedTeams); - disableOnboarding(); + if (selectedShifts.length === 0) { + setShowMandatoryShiftAlert(true); + } else { + dispatch(ManagerExperienceCreators.setSelectedTeamIDs(selectedTeams)); + dispatch(ManagerExperienceCreators.setSelectedShifts(selectedShifts)); + await AllsparkLocalStorage.set(ONBOARDING_KEY, 'true'); + upsertSupplyChainPreferences(selectedShifts, selectedTeams); + disableOnboarding(); + } }, [ logger, teamSelectionTelemetry, @@ -175,6 +183,7 @@ export const OnboardingScreen = () => { filterListData={allShifts} handleSelectShift={handleSelectShift} isModal={false} + isMandatoryShiftError={showMandatoryShiftAlert} /> </View> <Divider /> @@ -182,7 +191,7 @@ export const OnboardingScreen = () => { <EditSavedTeamSection sections={sections} selectedTeams={selectedTeams} - handleSelection={handleSelection} + handleSelection={handleSelectTeam} handleSearchInput={handleSearchInput} headerTitle={t('dashboard.listSection.title')} subTitle={t('dashboard.listSection.subTitle')}
feat: added mandatory shift to onboarding
feat: added mandatory shift to onboarding