commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
266e306a157b6ad9f5a44309b23bb4091cf892e4
--- package-lock.json @@ -4962,9 +4962,9 @@ } }, "@walmart/allspark-home-mini-app": { - "version": "0.5.45", - "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.45.tgz", - "integrity": "sha512-ueo1cCBIgQMonsY2WRz5kpPiZ+Kehele8n4gQEIyeh+ks0BAU5+rxYGOzcleLVC9zFgTI5bl/TbXoewSKRBAlg==", + "version": "0.5.46", + "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.5.46.tgz", + "integrity": "sha512-65BxEGQtZDMMkDWx6hjUVljN5IKLzRfFfgpMmq9ACuWbYtRrGmJVEwM1x2nA2tt+aqZNGpLCv7O0dw92w94Mfw==", "requires": { "moment": "^2.29.0", "uuid": "^8.3.1" @@ -5234,9 +5234,9 @@ "integrity": "sha512-eIq6STW9MZJ5NiT9bsOsZDS5yZ36rS6ETP6a0A5D8VzWtBhVgyzU9gVkrrUnJmGo7MXm000DwMJW2Y0XSJeQRw==" }, "@walmart/metrics-mini-app": { - "version": "0.9.8", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.8.tgz", - "integrity": "sha512-jTy3HyV2hKtcPYQHeQZQdthViq4iNPaJ5Mp1Ky9eE/ACXp9GULobOc+C2XixT4jLqRRwYzqthoKWms/4EFojEg==", + "version": "0.9.9", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.9.9.tgz", + "integrity": "sha512-+E7ui0M+W5IfYVQU7BodE9EZF8h/7V6YvIGx7ZSxl+/+HU9AMWlruYOG4RERg6uJai49ZBQTchspxpbG/rdjOA==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", --- package.json @@ -73,7 +73,7 @@ "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@walmart/OneWalmart-MiniApp": "1.0.10", "@walmart/allspark-health-survey-mini-app": "0.0.44", - "@walmart/allspark-home-mini-app": "0.5.45", + "@walmart/allspark-home-mini-app": "0.5.46", "@walmart/allspark-neon-core": "0.1.29", "@walmart/amp-mini-app": "0.2.7", "@walmart/ask-sam-mini-app": "1.0.5", @@ -94,7 +94,7 @@ "@walmart/iteminfo-mini-app": "5.0.6", "@walmart/manager-approvals-miniapp": "0.0.62", "@walmart/me-field-mini-app": "1.1.11", - "@walmart/metrics-mini-app": "0.9.8", + "@walmart/metrics-mini-app": "0.9.9", "@walmart/mod-flex-mini-app": "1.1.0", "@walmart/moment-walmart": "1.0.4", "@walmart/payrollsolution_miniapp": "0.125.8",
bumping metrics and home mini app
bumping metrics and home mini app
761bceab21692d10a360b176bcdb68c4b5599ad6
--- yarn.lock @@ -6340,9 +6340,9 @@ __metadata: languageName: node linkType: hard -"@walmart/learning-mini-app@npm:20.0.21": - version: 20.0.21 - resolution: "@walmart/learning-mini-app@npm:20.0.21" +"@walmart/learning-mini-app@npm:20.0.23": + version: 20.0.23 + resolution: "@walmart/learning-mini-app@npm:20.0.23" peerDependencies: "@atmt/feedback-component-native": ^8.0.0 "@react-native-firebase/analytics": 17.4.2 @@ -6416,7 +6416,7 @@ __metadata: reduxsauce: ^1.2.0 reselect: ^4.0.0 wifi-store-locator: ^1.0.0-alpha2 - checksum: 10c0/d68119b8211ad31048bb2621d1ee4b5fc677d859e4b8cb8d9b2b81e5ae3fa8a5a8baedcc695b3168a57ecb940b180bb705463dbc0e8aa393543dd2792cd83e5f + checksum: 10c0/ef5aa940d4375dcc971516c07a147b7f6fa872228f98711a91f8f8b2be83a64ccf08aea3e395972dac6bc3c977e4cdb7c14b67e388abab84216c5c02131e61e4 languageName: node linkType: hard @@ -7725,7 +7725,7 @@ __metadata: "@walmart/ims-print-services-ui": "npm:2.11.1" "@walmart/inbox-mini-app": "npm:0.93.28" "@walmart/iteminfo-mini-app": "npm:7.13.2" - "@walmart/learning-mini-app": "npm:20.0.21" + "@walmart/learning-mini-app": "npm:20.0.23" "@walmart/manager-approvals-miniapp": "npm:0.2.4" "@walmart/me-at-walmart-athena-queries": "npm:6.1.4" "@walmart/me-at-walmart-common": "npm:6.1.4"
feat: :sparkles: updated yarn lock file
feat: :sparkles: updated yarn lock file
f42ddb6a46209399b8a5a9a99cda04b0f893c1cf
--- .looper.multibranch.yml @@ -2,6 +2,13 @@ inherit: job:///allspark/allspark-core/allspark-template:allspark-template.yml updateTaskStatusOnGit: true # added as per discussion on SREDP-11895 +tools: + jdk: + flavor: azul + version: 17 + nodejs: 23.6.0 + maven: 3.5.4 + cache: # overridden to fix cocoapods path - name: yarn-cache configs:
chore: increment looper node version to test build fix
chore: increment looper node version to test build fix
950c1e15391adade0166fefef338480845a674ae
--- package-lock.json @@ -81,7 +81,7 @@ "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", - "@walmart/ui-components": "1.10.1", + "@walmart/ui-components": "1.11.1", "@walmart/welcomeme-mini-app": "0.76.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6", @@ -8180,9 +8180,9 @@ "license": "GPL-3.0-or-later" }, "node_modules/@walmart/ui-components": { - "version": "1.10.1", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.10.1.tgz", - "integrity": "sha512-Y2ExddytTHFxdh8d0rEtbswld4Mu0WyKD6whiAz8AX5lWkeeMZJIY5ni76ol6G58YyZVUGpn6BhbVngM2h8w2A==", + "version": "1.11.1", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.11.1.tgz", + "integrity": "sha512-7TmHsnA4RuPz2sQNceLa5HoQliVWCXn2LBsZDv1jSwfbpRNexTRBxvVUPcMxcPD8eddEFVBPEKJyDsJKDt/b3A==", "license": "ISC", "dependencies": { "react-hook-form": "^7.33.1", @@ -34082,9 +34082,9 @@ "integrity": "sha1-QVwJoEY4zaaC39G6HDOGH7COw/Y=" }, "@walmart/ui-components": { - "version": "1.10.1", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.10.1.tgz", - "integrity": "sha512-Y2ExddytTHFxdh8d0rEtbswld4Mu0WyKD6whiAz8AX5lWkeeMZJIY5ni76ol6G58YyZVUGpn6BhbVngM2h8w2A==", + "version": "1.11.1", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.11.1.tgz", + "integrity": "sha512-7TmHsnA4RuPz2sQNceLa5HoQliVWCXn2LBsZDv1jSwfbpRNexTRBxvVUPcMxcPD8eddEFVBPEKJyDsJKDt/b3A==", "requires": { "react-hook-form": "^7.33.1", "react-native-calendars": "^1.1291.0", --- package.json @@ -123,7 +123,7 @@ "@walmart/shelfavailability-mini-app": "1.5.13", "@walmart/taskit-mini-app": "2.24.5", "@walmart/time-clock-mini-app": "2.49.0", - "@walmart/ui-components": "1.10.1", + "@walmart/ui-components": "1.11.1", "@walmart/welcomeme-mini-app": "0.76.0", "@walmart/wfm-ui": "0.2.26", "axios": "~1.2.6",
ui component version update
ui component version update
058cad01be846707c72af0a2a03475ffc16272cd
--- graphql.yml @@ -36,6 +36,11 @@ applications: queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql' tags: - 'v1' + - name: 'getSupplyChainTeamPreference' + hash: '61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839' + queryTemplate: 'packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql' + tags: + - 'v1' - name: 'getTeamByIdHome' hash: '6b4b876250309d85dd51831ace4595bd1764b3d41ef7fd65c08df03b4c4982e0' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getTeamByIdHome.graphql' @@ -73,11 +78,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' @@ -88,28 +93,28 @@ applications: queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql' tags: - 'v1' + - name: 'getSupplyChainTeamPreference' + hash: '61253c3d4d8ab6db774a903969c2f63de9113f44c1947d52c3630dd38ce30839' + queryTemplate: 'packages/me-at-walmart-athena-queries/src/getSupplyChainTeamPreferenceQuery.graphql' + tags: + - 'v1' - name: 'getTeamByIdHome' hash: '6b4b876250309d85dd51831ace4595bd1764b3d41ef7fd65c08df03b4c4982e0' 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: 'upsertSupplyChainAssociatePreference' - hash: '39c45936c3b4d0020c6192b629c29860a30a5f2f70c5297c9e34dcffbaa0c7b0' - queryTemplate: 'packages/me-at-walmart-athena-queries/src/upsertSupplyChainAssociatePreference.graphql' + - name: 'upsertManagerExperiencePreference' + hash: 'bdf7ca7ba91a0c700df0b0dbd418064d98ef1c2818688e2a1c9e478d8cc3e1ca' + queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql' tags: - 'v1'
Adding getSupplyChainTeamPreference query
Adding getSupplyChainTeamPreference query
60f7155e826ad27ce3c57a7279bde959477e7029
--- __tests__/auth/IndexTest.ts @@ -1,5 +1,5 @@ import {LoginFeature} from '../../src/auth'; -import {enUS, esMX} from '../../src/translations'; +import {enUS, esMX} from '../../src/Translations'; describe('LoginFeature', () => { it('render scrren correctly', () => { --- __tests__/permissions/IndexTest.ts @@ -1,5 +1,5 @@ import {PermissionsFeature} from '../../src/permissions'; -import {enUS, esMX} from '../../src/translations'; +import {enUS, esMX} from '../../src/Translations'; import { PERMISSION_WELCOME_SCREEN, PERMISSION_LOCATION_SCREEN, --- __tests__/whatsNew/IndextTest.ts @@ -1,5 +1,5 @@ import {WhatsNewFeature} from '../../src/whatsNew/index'; -import {enUS, esMX} from '../../src/translations'; +import {enUS, esMX} from '../../src/Translations'; describe('WhatsNewFeature', () => { it('render WhatsNewFeature correctly', () => { --- src/auth/index.ts @@ -9,7 +9,7 @@ import { lightenStatusBar, modalTransitionOptions, } from '../navigation/constants'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; export const LoginFeature = new AllsparkFeatureModule('login', { name: 'Login', --- src/biometrics/index.ts @@ -3,7 +3,7 @@ import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {biometricsSlice} from './BiometricRedux'; import {biometricSagas} from './BiometricSagas'; import {BiometricModal} from './BiometricModal'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; export const BiometricsFeature = new AllsparkFeatureModule( biometricsSlice.name, { --- src/core/index.ts @@ -11,7 +11,7 @@ import { import {AlertModal} from './AlertModal'; import {ToastModal} from './ToastModal'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; import {syncMomentWithLanguage} from './syncDeviceLanguage'; const subscriptions = [] as ListenerSubscription[]; --- src/permissions/index.ts @@ -4,7 +4,7 @@ import { PERMISSION_LOCATION_SCREEN, PERMISSION_NOTIFICATION_SCREEN, } from './constants'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; export const PermissionsFeature = new AllsparkFeatureModule('permissions', { name: 'Permissions', screens: { --- src/startup/index.ts @@ -1,6 +1,6 @@ import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {appFlow} from './AppFlow'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; export const StartupFeature = new AllsparkFeatureModule('startup', { name: 'Startup Flow', redux: { --- src/termsOfUse/index.ts @@ -1,7 +1,7 @@ import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {termsOfUseSagas} from './TermsOfUseSaga'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; export const TermsOfUseFeature = new AllsparkFeatureModule('terms-of-use', { name: 'Terms of Use', redux: { --- src/updates/index.ts @@ -3,7 +3,7 @@ import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {updateSlice} from './UpdateCheckRedux'; import {updateCheckSagas} from './UpdateCheckSaga'; import {UpdateVersionModal} from './UpdateVersionModal'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; export const UpdateCheckFeature = new AllsparkFeatureModule(updateSlice.name, { name: 'Update Check', redux: { --- src/whatsNew/index.ts @@ -1,7 +1,7 @@ import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {whatsNewSagas} from './WhatsNewSaga'; import {WhatsNewModal} from './WhatsNewModal'; -import {enUS, esMX} from '../translations'; +import {enUS, esMX} from '../Translations'; export const WhatsNewFeature = new AllsparkFeatureModule('whatsNew', { name: 'Whats New', redux: {
feat(translation): update uppercase
feat(translation): update uppercase
e0300f5f814839274808ca5f953e51baaf83f333
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.16", + "version": "1.0.17", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/roster-mini-app", - "version": "1.0.16", + "version": "1.0.17", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.16", + "version": "1.0.17", "private": false, "main": "dist/index.js", "files": [ --- src/utils/assoicateList.ts @@ -15,15 +15,28 @@ const ASC_ORDER = 1; const DESC_ORDER = -1; const NO_SORT = 0; -const checkUserIsSalariedOrTeamLead = ( - associate: Associate, - teamLeads: string[], -) => +// const checkUserIsSalariedOrTeamLead = ( +// associate: Associate, +// teamLeads: string[], +// ) => +// teamLeads +// ?.map((CCMJobDescription) => CCMJobDescription.toLowerCase()) +// .includes(associate?.jobCategoryCodeDesc?.toLowerCase() as string) || +// (associate?.payType && +// toUpper(associate?.payType?.toString()) === payTypes.SALARIED) +// ? ASC_ORDER +// : DESC_ORDER; + +const checkUserIsTeamLead = (associate: Associate, teamLeads: string[]) => teamLeads ?.map((CCMJobDescription) => CCMJobDescription.toLowerCase()) - .includes(associate?.jobCategoryCodeDesc?.toLowerCase() as string) || - (associate?.payType && - toUpper(associate?.payType?.toString()) === payTypes.SALARIED) + .includes(associate?.jobCategoryCodeDesc?.toLowerCase() as string) + ? ASC_ORDER + : DESC_ORDER; + +const checkUserIsSalaried = (associate: Associate) => + associate?.payType && + toUpper(associate?.payType?.toString()) === payTypes.SALARIED ? ASC_ORDER : DESC_ORDER; @@ -73,8 +86,9 @@ export const sortedAssociateList = ( ) => [...associatesList].sort( (associateA: Associate, associateB: Associate) => - checkUserIsSalariedOrTeamLead(associateB, teamLeads) - - checkUserIsSalariedOrTeamLead(associateA, teamLeads) || + checkUserIsTeamLead(associateB, teamLeads) - + checkUserIsTeamLead(associateA, teamLeads) || + checkUserIsSalaried(associateB) - checkUserIsSalaried(associateA) || checkUserClockedIn(associateB) - checkUserClockedIn(associateA) || checkUserAtMeal(associateB) - checkUserAtMeal(associateA) || checkUserClockedOut(associateB) - checkUserClockedOut(associateA) ||
Update version
Update version
ac6147f12972fd5dcdd4821754e29ef26cb198b7
--- packages/expo-config-plugins/src/withAppAuth.ts @@ -144,9 +144,10 @@ const appDelegateSwiftMod = async ( const bridgingHeaderContents = await fs.readFile(bridgingHeaderPath, 'utf8'); if (!bridgingHeaderContents.includes('RNAppAuthAuthorizationFlowManager.h')) { + // Append import to the existing bridging header instead of overwriting it await fs.writeFile( bridgingHeaderPath, - '#import "RNAppAuthAuthorizationFlowManager.h"' + `${bridgingHeaderContents.trimEnd()}\n#import "RNAppAuthAuthorizationFlowManager.h"\n` ); } @@ -215,7 +216,7 @@ const appDelegateImplementationMod = async ( 'utf8' ); - if (!delegateImplementationPath.includes('ClearKeychainIfNecessary')) { + if (!delegateImplContent.includes('ClearKeychainIfNecessary')) { const tempDelegateContent = mergeContents({ tag: 'rn-app-auth-keychain-invocation', src: delegateImplContent, @@ -243,23 +244,34 @@ const appDelegateImplementationMod = async ( const appDelegateHeaderMod = async ( config: ExportedConfigWithProps<AppDelegateProjectFile> ) => { - if ( - !config.modResults.contents.includes('RNAppAuthAuthorizationFlowManager.h') - ) { - config.modResults.contents = mergeContents({ + // Edit the header file directly; the withAppDelegate mod points at the implementation file + const headerPath = path.join( + config.modRequest.platformProjectRoot, + sanitizedName(config.name), + 'AppDelegate.h' + ); + + let headerContents = await fs.readFile(headerPath, 'utf8'); + + if (!headerContents.includes('RNAppAuthAuthorizationFlowManager.h')) { + const imported = mergeContents({ tag: 'rn-app-auth', - src: config.modResults.contents, + src: headerContents, newSrc: '#import <React/RCTLinkingManager.h>\n#import "RNAppAuthAuthorizationFlowManager.h"', anchor: /#import <Expo\/Expo.h>/, offset: 1, comment: '//', - }).contents; + }); - config.modResults.contents = config.modResults.contents.replace( + headerContents = imported.contents; + + headerContents = headerContents.replace( /@interface AppDelegate : EXAppDelegateWrapper/, '// @generated begin rn-app-auth\n@interface AppDelegate : EXAppDelegateWrapper <RNAppAuthAuthorizationFlowManager>\n\n@property(nonatomic, weak) id<RNAppAuthAuthorizationFlowManagerDelegate> authorizationFlowManagerDelegate;\n// @generated end rn-app-auth' ); + + await fs.writeFile(headerPath, headerContents); } return config; @@ -270,8 +282,7 @@ const withAppAuthAppDelegate: ConfigPlugin<void> = (config) => { if (cfg.modResults.language === 'swift') { cfg = await appDelegateSwiftMod(cfg); } - - if ( + else if ( cfg.modResults.language === 'objc' || cfg.modResults.language === 'objcpp' ) {
fix(plugin): allspark-6773 fixed appauth plugin (#360)
fix(plugin): allspark-6773 fixed appauth plugin (#360)
80daa91f46f9fc6adfb8b039ee2261ff9abcdda8
--- jest.config.js @@ -5,10 +5,10 @@ module.exports = { collectCoverageFrom: ['<rootDir>/src/**/*.{js,jsx,ts,tsx}'], coverageThreshold: { global: { - statements: 3.78, - branches: 0.67, - functions: 0.33, - lines: 3.96, + statements: 24.52, + branches: 7.28, + functions: 8.74, + lines: 25.51, }, }, transformIgnorePatterns: [ --- jest.config.js @@ -5,10 +5,10 @@ module.exports = { collectCoverageFrom: ['<rootDir>/src/**/*.{js,jsx,ts,tsx}'], coverageThreshold: { global: { - statements: 3.78, - branches: 0.67, - functions: 0.33, - lines: 3.96, + statements: 24.52, + branches: 7.28, + functions: 8.74, + lines: 25.51, }, }, transformIgnorePatterns: [
updating jest config on current coverage thresh
updating jest config on current coverage thresh
cf8d95c9552711acf7052f35cd82bb37592f23cd
--- packages/allspark-foundation/src/FeatureRunner/modals/TranslationModal.tsx @@ -1,4 +1,5 @@ import React, { useEffect, useState } from 'react'; +import { StyleSheet } from 'react-native'; import { BottomSheet, Radio } from '@walmart/gtp-shared-components'; import { SafeAreaView } from 'react-native-safe-area-context'; @@ -7,12 +8,6 @@ import { AllsparkTranslationClient, useAllsparkTranslation, } from '../../Translation'; -import { StyleSheet } from 'react-native'; - -const LanguageTitles = { - 'en-US': 'English (EN)', - 'es-MX': 'Espanol (ES)', -}; const styles = StyleSheet.create({ radioButton: { @@ -23,7 +18,9 @@ const styles = StyleSheet.create({ export const TranslationModal = () => { const modal = useAllsparkModal(); const { i18n } = useAllsparkTranslation(); - const [languages] = useState(AllsparkTranslationClient.languages); + const [languages] = useState( + AllsparkTranslationClient.getSupportedLanguages() + ); const [open, setOpen] = useState(true); @@ -53,8 +50,10 @@ export const TranslationModal = () => { {languages.map((language) => ( <Radio key={language} - // @ts-ignore - label={LanguageTitles[language] || language} + label={ + AllsparkTranslationClient.getLocaleConfig(language)?.descriptor || + language + } checked={i18n.language === language} onPress={() => onChangeLanguage(language)} UNSAFE_style={styles.radioButton} --- packages/allspark-foundation/src/Translation/client.ts @@ -37,7 +37,7 @@ export const TranslationClient = (config?: TranslationClientOptions) => { const initialize = async (options: TranslationClientOptions) => { const { resources, ...restOptions } = options; Object.assign(_instance.options, restOptions); - _config = _instance.options; + _config = _instance.options as TranslationClientOptions; await _instance.init(config || {}); initialized = true; @@ -108,7 +108,8 @@ export const TranslationClient = (config?: TranslationClientOptions) => { }; /** - * Returns the locale config for the current language + * Returns the locale config for given language code, if none is + * specified then the current language is used * @example * TranslationClient.getLocaleConfig(); // { dateFormat: 'MM/DD/YYYY', currency: '$', ... } */ @@ -117,6 +118,10 @@ export const TranslationClient = (config?: TranslationClientOptions) => { return _config?.localeConfig?.[language]; }; + const getSupportedLanguages = () => { + return _config?.supportedLanguages || []; + }; + return Object.assign(_instance, { initialize, isInitialized, @@ -124,6 +129,7 @@ export const TranslationClient = (config?: TranslationClientOptions) => { getFeatureClient, setDefaultNamespace, getLocaleConfig, + getSupportedLanguages, }); }; --- packages/allspark-foundation/src/Translation/types.ts @@ -11,6 +11,7 @@ export type LocaleConfig = { * Options for configuring a TranslationClient instance. */ export type TranslationClientOptions = InitOptions & { + supportedLanguages: string[]; localeConfig?: Record<string, LocaleConfig>; };
feat: add supported languages option to translation client
feat: add supported languages option to translation client
12e2dbd24c637d45d369fd5fa1e236d282d953c0
--- .looper.multibranch.yml @@ -107,13 +107,13 @@ flows: else: # - var(GRADLE_BUILD_FLAVOUR = ${ENV}) # removed - try: - - call: build-android-app - - catch: - - | - rm -rf node_modules - cd android && ./gradlew --stop && ./gradlew clean - - call: yarn-steps - - call: build-android-app + - call: build-android-app + catch: + - | + rm -rf node_modules + cd android && ./gradlew --stop && ./gradlew clean + - call: yarn-steps + - call: build-android-app catch: - var(errorMessage = ${flowErrorMessage}) - call: build-notification(failure)
chore: syntax
chore: syntax
03a8ff3630c76d07d1244c45e05385f19e3fb53d
--- __tests__/settings/sideButton/__snapshots__/SideButtonPermissionBottomSheetTest.tsx.snap @@ -69,7 +69,7 @@ exports[`Side button permission bottom sheet tests matches snapshot 1`] = ` "bottom": 0, "height": 1334, "left": 0, - "opacity": 0, + "opacity": 0.00011425836668732536, "position": "absolute", "right": 0, "top": 0, --- src/legacy/context.tsx @@ -0,0 +1,58 @@ +import React, {PropsWithChildren} from 'react'; + +import {Header, DrawerButton} from '@walmart/ui-components'; +import {AllsparkDrawerBadge} from '@walmart/allspark-foundation/Components'; +import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; +import {Banners} from '../banners'; + +/** + * @backwards-compatability + * Kept because EmergencyBanner has not yet been migrated to AllsparkBanners. + * Other banners have been modified to use AllsparkBanners. Once EmergencyBanner is + * migrated, the Header component from foundation should be used in nav stack and it will auto include banners + */ +export const LegacyHeaderContextValue = { + renderBanners: Banners, +}; + +/** + * @backwards-compatability + * Kept for those who are still using the old drawer button context + * They should move to use the `useAllsparkDrawer` hook instead. + */ +export const LegacyDrawerContext = new Proxy( + { + renderBadge: () => <AllsparkDrawerBadge.Component />, + drawerLocked: false, + lockDrawer: AllsparkNavigationClient.lockDrawer, + unlockDrawer: AllsparkNavigationClient.unlockDrawer, + toggleDrawerLocked: AllsparkNavigationClient.toggleDrawerLock, + }, + { + get: (target, p, receiver) => { + if (p === 'drawerLocked') { + return AllsparkNavigationClient.drawerLocked; + } + return Reflect.get(target, p, receiver); + }, + }, +); + +/** + * @backwards-compatability + * Combination of legacy Header and DrawerButton providers from UI components. + * With foundation these two will not be needed. Keeping for backwards compatibility + * until mini apps have transitioned. + */ +export const LegacyHeaderProvider = (props: PropsWithChildren<{}>) => { + const {children} = props; + + return ( + <Header.Provider value={LegacyHeaderContextValue}> + {/* @backwards-compatability */} + <DrawerButton.Provider value={LegacyDrawerContext}> + {children} + </DrawerButton.Provider> + </Header.Provider> + ); +}; --- src/legacy/index.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import {createSlice} from '@reduxjs/toolkit'; import {AllsparkFeatureModule} from '@walmart/allspark-foundation/Feature'; import {AllsparkEnvironment} from '@walmart/allspark-foundation/Environment'; @@ -6,8 +5,6 @@ import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; import {AllsparkTranslationClient} from '@walmart/allspark-foundation/Translation'; import {FeatureTags} from '@walmart/me-at-walmart-common'; import {getVersionSectionList} from '../settings/versions/utils'; -import {AllsparkDrawerBadge} from '@walmart/allspark-foundation/Components'; -import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation'; // @backwards-compatability - Locale data added to AllsparkTranslationClient export const LocaleReducer = createSlice({ @@ -74,24 +71,3 @@ export function UPDATE_NETWORK_TYPE(networkType: string) { } UPDATE_NETWORK_TYPE.type = 'core/network/UPDATE_NETWORK_TYPE'; - -// @backwards-compatability -// Kept for those who are still using the old drawer button context -// They should move to use the `useAllsparkDrawer` hook instead. -export const LegacyDrawerContext = new Proxy( - { - renderBadge: () => <AllsparkDrawerBadge.Component />, - drawerLocked: false, - lockDrawer: AllsparkNavigationClient.lockDrawer, - unlockDrawer: AllsparkNavigationClient.unlockDrawer, - toggleDrawerLocked: AllsparkNavigationClient.toggleDrawerLock, - }, - { - get: (target, p, receiver) => { - if (p === 'drawerLocked') { - return AllsparkNavigationClient.drawerLocked; - } - return Reflect.get(target, p, receiver); - }, - }, -); --- src/navigation/AssociateHallwayNav/DrawerNav.tsx @@ -5,7 +5,6 @@ import {createDrawerNavigator} from '@react-navigation/drawer'; import {RenderGuard} from '@walmart/allspark-utils'; import {useRbacConfig} from '@walmart/config-components'; -import {Header, DrawerButton} from '@walmart/ui-components'; import {useAllsparkDrawer} from '@walmart/allspark-foundation/Navigation'; import {ContainerActionCreators} from '@walmart/allspark-foundation/Container'; @@ -15,8 +14,7 @@ import { } from '../../features/AssociateFeatures'; import {renderSideMenuContent} from '../../navConfig/SideMenuContent'; import {ActivityMonitorGuard} from '../../PinAccess/ActivityMonitorGuard'; -import {Banners} from '../../banners'; -import {LegacyDrawerContext} from '../../legacy'; +import {LegacyHeaderProvider} from '../../legacy/context'; import {MainStackNav} from './MainStackNav'; import {DrawerStackMap} from './types'; @@ -28,12 +26,6 @@ export const styles = StyleSheet.create({ }, }); -// TODO: remove this once the new banners are in place. Header component -// from foundation should be used in nav stack and it will auto include banners -export const HeaderContextValue = { - renderBanners: Banners, -}; - // Main sliding drawer navigator const Drawer = createDrawerNavigator<DrawerStackMap>(); @@ -56,22 +48,19 @@ export const DrawerNav = () => { preRender={initAssociateFeatures} onUnmount={cleanupAssociateFeatures}> <ActivityMonitorGuard> - <Header.Provider value={HeaderContextValue}> - {/* @backwards-compatability */} - <DrawerButton.Provider value={LegacyDrawerContext}> - <Drawer.Navigator - screenOptions={{ - swipeEnabled: !drawer.locked, - headerShown: false, - drawerStyle: styles.drawerStyle, - overlayColor: 'rgba(0, 0, 0, 0.6)', - drawerType: 'front', - }} - drawerContent={renderSideMenuContent}> - <Drawer.Screen name='mainStack' component={MainStackNav} /> - </Drawer.Navigator> - </DrawerButton.Provider> - </Header.Provider> + <LegacyHeaderProvider> + <Drawer.Navigator + screenOptions={{ + swipeEnabled: !drawer.locked, + headerShown: false, + drawerStyle: styles.drawerStyle, + overlayColor: 'rgba(0, 0, 0, 0.6)', + drawerType: 'front', + }} + drawerContent={renderSideMenuContent}> + <Drawer.Screen name='mainStack' component={MainStackNav} /> + </Drawer.Navigator> + </LegacyHeaderProvider> </ActivityMonitorGuard> </RenderGuard> );
refactor: move legacy drawer and header contexts to legacy folder
refactor: move legacy drawer and header contexts to legacy folder
d0e6a1d20fefc4b9f79e08d3af27bc289ee73b7c
--- package-lock.json @@ -84,7 +84,7 @@ "@walmart/schedule-mini-app": "0.55.0", "@walmart/shelfavailability-mini-app": "1.5.17", "@walmart/taskit-mini-app": "2.47.9", - "@walmart/texting-mini-app": "2.1.1", + "@walmart/texting-mini-app": "2.1.2", "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.3.1", "@walmart/ui-components": "1.15.1", @@ -9233,9 +9233,9 @@ } }, "node_modules/@walmart/texting-mini-app": { - "version": "2.1.1", - "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.1.tgz", - "integrity": "sha512-/LT2Pc0ky5PZvNlNQF3Yd1OX/AAkVaF0TdJdRR/81m7/IvmwdTrCbahjp5560e7C/oXd+koWqr5UYplgo+XLZA==", + "version": "2.1.2", + "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.2.tgz", + "integrity": "sha512-cO7ba/6QxjQYKZ9Bm85yK1LDbwgFI7ZFAOMLu9/k1881tRHe+qoDoNaQH6advMB0yRCdxHV2v/ARg/RSWJbpZg==", "hasInstallScript": true }, "node_modules/@walmart/time-clock-mini-app": { @@ -34566,9 +34566,9 @@ } }, "@walmart/texting-mini-app": { - "version": "2.1.1", - "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.1.tgz", - "integrity": "sha512-/LT2Pc0ky5PZvNlNQF3Yd1OX/AAkVaF0TdJdRR/81m7/IvmwdTrCbahjp5560e7C/oXd+koWqr5UYplgo+XLZA==" + "version": "2.1.2", + "resolved": "https://npme.walmart.com/@walmart/texting-mini-app/-/texting-mini-app-2.1.2.tgz", + "integrity": "sha512-cO7ba/6QxjQYKZ9Bm85yK1LDbwgFI7ZFAOMLu9/k1881tRHe+qoDoNaQH6advMB0yRCdxHV2v/ARg/RSWJbpZg==" }, "@walmart/time-clock-mini-app": { "version": "2.175.2", --- package.json @@ -125,7 +125,7 @@ "@walmart/schedule-mini-app": "0.55.0", "@walmart/shelfavailability-mini-app": "1.5.17", "@walmart/taskit-mini-app": "2.47.9", - "@walmart/texting-mini-app": "2.1.1", + "@walmart/texting-mini-app": "2.1.2", "@walmart/time-clock-mini-app": "2.175.2", "@walmart/topstock-mini-app": "1.3.1", "@walmart/ui-components": "1.15.1",
update the texting mini app version
update the texting mini app version
70ae63a67e63895c5c0deacc07f99eb2aba1b3be
--- .looper.multibranch.yml @@ -4,7 +4,7 @@ inherit: "job:///metropolis/metroloop/metroloop-parent" ## Whenever you update the nodes, please update it at the two-place, below line & the global variable LOOPER_NODES ## -node: ((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22) +node: ((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22&&!MAC-DRFQLAB-MINI29) tools: android: @@ -46,7 +46,7 @@ cache: envs: global: variables: - LOOPER_NODES: "((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22)" + LOOPER_NODES: "((osx||stable_osx)&&!MAC-LAB-MINI29&&!MAC-LAB-MINI39&&!MAC-LAB-MINI32&&!MAC-LAB-MINI22&&!MAC-DRFQLAB-MINI22&&!MAC-DRFQLAB-MINI29)" GITHUB_TOKEN: "%{credentials.secret('GITHUB_TOKEN')}" TMPDIR: /tmp
excluding bad node
excluding bad node
a079bbeb9dc1fe752ef7d52004204f72777357de
--- src/navigation/AssociateHallwayNav/SideMenuContent.tsx @@ -11,6 +11,7 @@ import {SafeAreaView} from 'react-native-safe-area-context'; import {GlobalNavigation} from '@walmart/ui-components/containers'; import {Dialog} from '@walmart/ui-components'; import {colors} from '@walmart/gtp-shared-components'; +import {MyTeamHooks} from '@walmart/texting-mini-app'; import { ClockStatusSelectors, UserSelectors, @@ -32,6 +33,7 @@ import { getSideMenuNavConfig, NavConfigActionCreators, } from '../../navConfig/NavConfigRedux'; +import { isNil } from 'lodash'; const styles = StyleSheet.create({ globalNavContainer: { @@ -53,6 +55,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( const telemetry = useTelemetry<IAllsparkTelemetry>(); const badgesCount = useSelector(getInboxBadgeCount); + const unreadMessageCount = MyTeamHooks.useChannelUnreadCount(); const user = useSelector(UserSelectors.getUser); const clockedIn = useSelector(ClockStatusSelectors.getIsClockedIn); const {loading, error} = useSelector(getNavConfigState); @@ -170,6 +173,7 @@ export const SideMenuContent: React.FC<DrawerContentComponentProps> = ( onRetry={onRetry} enableTaskItAlert={!!highPriorityCount || !!signOffTaskCount} showInboxBadge={!!badgesCount} + enablePttAlert={!isNil(unreadMessageCount) ? unreadMessageCount : undefined} enableTimeClock={getIsClockingEnabled} />
adding meganav count
adding meganav count
d620d08ff8c9313328450997734fb05396b87630
--- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/Component/TeamSelectionLoader.tsx @@ -0,0 +1,50 @@ +import { colors, Skeleton } from '@walmart/gtp-shared-components'; +import React from 'react'; +import { Header } from '../../../Hub/Header'; +import { + HeaderSubText, + HeaderTitle, +} from '../Constants/TeamSelectionConstants'; +import { teamSelectionLoaderStyles as styles } from '../styles'; +import { View } from 'react-native'; + + + +export const TeamSelectionLoader = () => { + const teamListLoader = new Array(6).fill( + <View style={styles.teamRow}> + <Skeleton height={40} width={40} UNSAFE_style={{ marginRight: 16 }} /> + <Skeleton height={24} width={136} /> + <Skeleton height={20} width={20} UNSAFE_style={{ marginLeft: 'auto' }} /> + </View> + ); + + return ( + <View> + <Header + title={HeaderTitle} + subText={HeaderSubText} + backgroundColor={colors.white} + textColor={colors.gray['160']} + /> + <View + //TODO: Add a separate component instead of a view + style={{ + height: 8, + backgroundColor: colors.gray['20'], + }} + /> + <View style={styles.container}> + <View style={styles.teamListHeader}> + <Skeleton + height={28} + width={136} + UNSAFE_style={{ marginBottom: 4 }} + /> + <Skeleton height={20} width={230} /> + </View> + {teamListLoader} + </View> + </View> + ); +}; --- packages/allspark-foundation/src/Components/Onboarding/TeamSelection/styles.ts @@ -131,3 +131,22 @@ export const FooterButtonComponentStyle = StyleSheet.create({ textAlign: 'center', }, }); + +export const teamSelectionLoaderStyles = StyleSheet.create({ + container: { + flexDirection: 'column', + width: '100%', + paddingHorizontal: 16, + paddingTop: 24, + backgroundColor: colors.white, + }, + + teamListHeader: { + marginBottom: 32, + }, + teamRow: { + flexDirection: 'row', + alignItems: 'center', + marginBottom: 32, + }, +});
Team selection screen - loading view
Team selection screen - loading view
0a5a658ad55ad5d160980be473906b0ca78af33a
--- src/components/Roster/index.tsx @@ -75,7 +75,7 @@ const styles = StyleSheet.create({ * @property {ActionButton[]} associateActions - A list of pressable buttons that can be used to execute any action in an associate entity * @property {ActionButton[]} teamActions - A list of pressable buttons that can be used to execute any action in a team entity */ -export const Roster: React.FC<RosterProps> = (props) => { +export const Roster: React.FC<RosterProps> = () => { const {bottom: bottomInset} = useSafeAreaInsets(); const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const flashListRef: any = useRef(null); --- src/containers/StoreChatCard.tsx @@ -21,7 +21,6 @@ import { useStartStoreText, useUserIsInRoster, useSiteTranslationContext, - useTotalSiteOrTotalStore, } from '../hooks'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../translations'; @@ -57,7 +56,6 @@ export const StoreChatCard = (props: {style?: StyleProp<ViewStyle>}) => { const translationContext = useSiteTranslationContext(); const clockedInCount = (rosterData as any)?.filter(associateIsClockedIn)?.length ?? 0; - const channelNameSiteOrStore: string = useTotalSiteOrTotalStore(); const onViewTeam = () => { navigation.navigate('myTeam.viewTeam', {teamRoster: rosterData}); --- src/redux/reducer.tsx @@ -1,6 +1,5 @@ import {createSlice, PayloadAction} from '@reduxjs/toolkit'; - export const rosterSlice = createSlice({ name: 'roster', initialState: {
fixing lint issues
fixing lint issues
289ddbed5bc3e996dc19d801b186f1c564fd5f45
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.8.3-alpha.1", + "version": "2.8.3", "main": "dist/index.js", "files": [ "dist"
feat(ci): updated version
feat(ci): updated version
71b1b390d5b181e85adec30c867a09f7a34b3b6b
--- src/presence/sagas.ts @@ -43,13 +43,18 @@ export function* DoNotDisturbAutoResetSaga() { } export function* GoOnlineOnClockOut(action: ClockCheckSuccess) { - const clockStatus = action?.payload?.clockStatus; - if (clockStatus === ClockStatusEnum.clockedOut.toString()) { - const lastOfflineTime: number = yield call(getLastOfflineTime); - if (!isNil(lastOfflineTime)) { - const userId: string = yield select(getEncryptedUserId); - const storeId: string = yield select(SiteSelectors.getUserWorkingSite); - yield call(goOnlineForUser, storeId, userId); + const dndAutoSwitchFeatureFlag: boolean = yield select( + DNDAutoSwitchFeatureFlag, + ); + if (dndAutoSwitchFeatureFlag) { + const clockStatus = action?.payload?.clockStatus; + if (clockStatus === ClockStatusEnum.clockedOut.toString()) { + const lastOfflineTime: number = yield call(getLastOfflineTime); + if (!isNil(lastOfflineTime)) { + const userId: string = yield select(getEncryptedUserId); + const storeId: string = yield select(SiteSelectors.getUserWorkingSite); + yield call(goOnlineForUser, storeId, userId); + } } } } --- src/presence/sagas.ts @@ -43,13 +43,18 @@ export function* DoNotDisturbAutoResetSaga() { } export function* GoOnlineOnClockOut(action: ClockCheckSuccess) { - const clockStatus = action?.payload?.clockStatus; - if (clockStatus === ClockStatusEnum.clockedOut.toString()) { - const lastOfflineTime: number = yield call(getLastOfflineTime); - if (!isNil(lastOfflineTime)) { - const userId: string = yield select(getEncryptedUserId); - const storeId: string = yield select(SiteSelectors.getUserWorkingSite); - yield call(goOnlineForUser, storeId, userId); + const dndAutoSwitchFeatureFlag: boolean = yield select( + DNDAutoSwitchFeatureFlag, + ); + if (dndAutoSwitchFeatureFlag) { + const clockStatus = action?.payload?.clockStatus; + if (clockStatus === ClockStatusEnum.clockedOut.toString()) { + const lastOfflineTime: number = yield call(getLastOfflineTime); + if (!isNil(lastOfflineTime)) { + const userId: string = yield select(getEncryptedUserId); + const storeId: string = yield select(SiteSelectors.getUserWorkingSite); + yield call(goOnlineForUser, storeId, userId); + } } } }
applying feature flag for auto switch to clockStatus event
applying feature flag for auto switch to clockStatus event
4a28a33b08ff34b9598c9571ad427738a00aa630
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 14 + versionCode 15 versionName "1.0.1" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>14</string> + <string>15</string> <key>LSApplicationQueriesSchemes</key> <array> <string>invmgmt</string> --- ios/AllSparkTests/Info.plist @@ -19,6 +19,6 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>14</string> + <string>15</string> </dict> </plist>
Incrementing build number
Incrementing build number
78f07a2931c1d0ad5149be9e5d42b969a09d7f14
--- package.json @@ -97,7 +97,7 @@ "@walmart/calling-mini-app": "0.8.11", "@walmart/candidate-authentication-lib": "0.0.8", "@walmart/checkout-mini-app": "4.17.0", - "@walmart/compass-sdk-rn": "6.4.4", + "@walmart/compass-sdk-rn": "6.4.5", "@walmart/config-components": "4.11.3", "@walmart/core-services": "~6.5.2", "@walmart/core-services-allspark": "workspace:^", @@ -430,7 +430,7 @@ "@react-navigation/elements": "^1.3.31", "@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-utils": "6.8.0", - "@walmart/compass-sdk-rn": "6.4.4", + "@walmart/compass-sdk-rn": "6.4.5", "@walmart/core-services-allspark": "workspace:^", "@walmart/core-widget-registry": "workspace:^", "@walmart/me-at-walmart-common": "workspace:^", --- yarn.lock @@ -7967,13 +7967,13 @@ __metadata: languageName: node linkType: hard -"@walmart/compass-sdk-rn@npm:6.4.4": - version: 6.4.4 - resolution: "@walmart/compass-sdk-rn@npm:6.4.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcompass-sdk-rn%2F-%2F%40walmart%2Fcompass-sdk-rn-6.4.4.tgz" +"@walmart/compass-sdk-rn@npm:6.4.5": + version: 6.4.5 + resolution: "@walmart/compass-sdk-rn@npm:6.4.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcompass-sdk-rn%2F-%2F%40walmart%2Fcompass-sdk-rn-6.4.5.tgz" peerDependencies: react: "*" react-native: "*" - checksum: 10c0/e847b44d9686399a5761be6eed5de08880e69f9b2e44f4daad2cf1c560cdad76c970cad167965753cfb200467ae7dfc7f0497fc4d0b196df5757c93eb28554c1 + checksum: 10c0/96c2eef21a56c1854b0bf2b4fcf6a5d4575db76d4ad4af047b467e96abaeb8492358d57fa2c73e2a7b09ae8350c509b15d14b5b1c1ea0160d36ba8370a469eaf languageName: node linkType: hard @@ -8690,7 +8690,7 @@ __metadata: "@walmart/calling-mini-app": "npm:0.8.11" "@walmart/candidate-authentication-lib": "npm:0.0.8" "@walmart/checkout-mini-app": "npm:4.17.0" - "@walmart/compass-sdk-rn": "npm:6.4.4" + "@walmart/compass-sdk-rn": "npm:6.4.5" "@walmart/config-components": "npm:4.11.3" "@walmart/core-services": "npm:~6.5.2" "@walmart/core-services-allspark": "workspace:^"
fix(compass): COM-5395 Android local build compilation error fix (#4717)
fix(compass): COM-5395 Android local build compilation error fix (#4717)
e556cb8ec165c9e306d2a32bdaad396617b63930
--- package-lock.json @@ -5510,9 +5510,9 @@ "integrity": "sha512-Tz8PRLTpf4goLTBXayZxsBRuy/8+fnxjt+m7g3kfu0NRG58n/MgKi9krclf+LSLBhYTJcL5sKg8ckhA90dHlYQ==" }, "@walmart/receipt-check-miniapp": { - "version": "1.8.7", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.8.7.tgz", - "integrity": "sha512-WnjzCALrddV6fgZ8V11WOpfDdfdjLnH8H5H+xJPAvHHECEnYY/blGjobnA2zdEy0OBsNr9X2R5DvBHg4Pr0xug==", + "version": "1.8.8", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.8.8.tgz", + "integrity": "sha512-TNJeTC99+azVGA+ma2pJ8Ikrx3aTteAej2aUP4h9DBDXRW3UddIBxUfdp3QqUeWC59+D7Cx15cZH0lV5s+lBlw==", "requires": { "@walmart/tcnumber": "^2.3.1", "@xstate/react": "^3.0.1", --- package.json @@ -114,7 +114,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "^0.3.7", "@walmart/react-native-sumo-sdk": "2.2.2-beta.2", - "@walmart/receipt-check-miniapp": "1.8.7", + "@walmart/receipt-check-miniapp": "1.8.8", "@walmart/redux-store": "2.0.4", "@walmart/refrigeration-alarms-mini-app": "1.35.0", "@walmart/schedule-mini-app": "0.25.0",
receipt check bugs
receipt check bugs
2dbf8a9bc311a5f800af51bdb71276643c98b628
--- packages/allspark-foundation-hub/__tests__/Hub/Container/HubDashboard.test.tsx @@ -4,7 +4,6 @@ import { HubDashboard } from '../../../src/Store/Modules/Hub'; import { cleanup, fireEvent, render } from '../../utils'; import { UserSelectors } from '@walmart/allspark-foundation/User'; import { - ManagerExperienceSelectors, hubContainerEnabled, hubOnboardingSuccessBottomSheetEnabled, hubTeamSwitcherEnabled, @@ -18,6 +17,7 @@ import * as NavigationUtil from '@react-navigation/native'; import * as safeAreaContext from 'react-native-safe-area-context'; import { useUserPersonaType } from '../../../src/Shared/Hooks/useUserPersonaType'; +import { ManagerExperienceSelectors } from '../../../src/Container/Redux'; jest.mock('@react-navigation/native', () => ({ ...jest.requireActual('@react-navigation/native'), @@ -39,12 +39,10 @@ jest.mock('../../../src/Store/Hooks/useUserPersonaType', () => ({ jest.mock('../../../src/Store/Redux/selectors', () => ({ ...jest.requireActual('../../../src/Store/Redux/selectors'), - ManagerExperienceSelectors: { - getDefaultWidgets: jest.fn(), + StoreManagerExperienceSelectors: { getSelectedTeamIDs: jest.fn(), getUserOnboardingError: jest.fn(), getUserTeamSelectionError: jest.fn(), - getHubScreenName: jest.fn(), getSelectedTeamPreference: jest.fn(), getUserTeamSelectionComplete: jest.fn(), getUserOnboardingComplete: jest.fn(), --- packages/allspark-foundation-hub/__tests__/Hub/TeamSwitcher.test.tsx @@ -8,7 +8,7 @@ import { useQuery } from '@apollo/client'; import { fireEvent, render } from '../utils'; import { mockGetTeamsByStoreQuery } from '../__mocks__/data/getTeamsByStoreMock'; import { - ManagerExperienceSelectors, + StoreManagerExperienceSelectors, teamSwitcherEnabled, } from '../../src/Store/Redux'; import { UserSelectors } from '@walmart/allspark-foundation'; @@ -26,11 +26,11 @@ jest.doMock('react-redux', () => { return []; case UserSelectors.getDomain: return 'homeoffice'; - case ManagerExperienceSelectors.getSelectedTeamPreference: + case StoreManagerExperienceSelectors.getSelectedTeamPreference: return 'tree'; - case ManagerExperienceSelectors.getUserTeamSelectionComplete: + case StoreManagerExperienceSelectors.getUserTeamSelectionComplete: return true; - case ManagerExperienceSelectors.getUserOnboardingComplete: + case StoreManagerExperienceSelectors.getUserOnboardingComplete: return true; default: return null; --- packages/allspark-foundation-hub/__tests__/TeamOnboarding/TeamSelectionList.test.tsx @@ -48,7 +48,7 @@ jest.mock('../../src/Store/Redux', () => ({ userTeamSelectionFailed: jest.fn(), userOnboardingFailed: jest.fn(), }, - ManagerExperienceSelectors: { + StoreManagerExperienceSelectors: { getUserIsAlreadyOnboarded: jest.fn(), }, teamSelectionHeaderEnabled: jest.fn(), --- packages/allspark-foundation-hub/__tests__/__mocks__/@walmart/allspark-foundation/allspark-foundation-hub/Store/Redux/index.js @@ -1,10 +1,8 @@ module.exports = { - ManagerExperienceSelectors: { - getDefaultWidgets: jest.fn(), + StoreManagerExperienceSelectors: { getSelectedTeamIDs: jest.fn(), getUserOnboardingError: jest.fn(), getUserTeamSelectionError: jest.fn(), - getHubScreenName: jest.fn(), getSelectedTeamPreference: jest.fn(), getUserTeamSelectionComplete: jest.fn(), getUserOnboardingComplete: jest.fn(), --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.2.19", + "version": "1.2.20", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation-hub/src/Container/AllsparkHubContainer.tsx @@ -86,10 +86,10 @@ export const managerExperienceFeature = new AllsparkFeatureModule(FEATURE_ID, { redux: { //@ts-ignore reducer: combineReducers({ + [managerExperienceSlice.name]: managerExperienceSlice.reducer, [storeManagerExperienceSlice.name]: storeManagerExperienceSlice.reducer, [supplyChainManagerExperienceSlice.name]: supplyChainManagerExperienceSlice.reducer, - [managerExperienceSlice.name]: managerExperienceSlice.reducer, }), }, }); --- packages/allspark-foundation-hub/src/Shared/Common/constant.ts @@ -1,7 +1,7 @@ export const FEATURE_ID = 'managerExperience'; export const MANAGER_EXPERIENCE_CONTAINER_SLICE = 'managerExperienceSlice'; export const STORE_MANAGER_EXPERIENCE_SLICE = 'storeManagerExperienceSlice'; -export const SC_MANAGER_EXPERIENCE_SLICE = 'supplyChainManagerExperience'; +export const SC_MANAGER_EXPERIENCE_SLICE = 'supplyChainManagerExperienceSlice'; export const FEATURE_NAME = 'Manager Experience'; export const EMP_TYPE_SALARIED = 'S'; export const EMP_TYPE_HOURLY = 'H'; --- packages/allspark-foundation-hub/src/Store/Redux/reducer.ts @@ -7,8 +7,6 @@ export const STORE_INITIAL_STATE: StoreManagerExperienceState = { selectedTeamPreference: '', selectedTeamIDs: [], selectedShifts: [], - hubScreenName: '', - defaultWidgets: [], userIsAlreadyOnboarded: false, userOnboardingComplete: false, userOnboardingInProgress: false, @@ -35,12 +33,6 @@ export const storeManagerExperienceSlice = createSlice({ setUserIsAlreadyOnboarded: (state, action: PayloadAction<boolean>) => { state.userIsAlreadyOnboarded = action.payload; }, - setHubScreenName: (state, action: PayloadAction<string>) => { - state.hubScreenName = action.payload; - }, - setDefaultWidgets: (state, action: PayloadAction<string[]>) => { - state.defaultWidgets = action.payload; - }, startUserOnboarding: (state) => { state.userOnboardingInProgress = true; state.userOnboardingComplete = false; --- packages/allspark-foundation-hub/src/Store/Redux/types.ts @@ -2,8 +2,6 @@ export interface StoreManagerExperienceState { selectedTeamPreference: string; selectedTeamIDs: string[]; selectedShifts: string[]; - hubScreenName: string; - defaultWidgets: string[]; userIsAlreadyOnboarded: boolean; userOnboardingComplete: boolean; userOnboardingInProgress: boolean; --- packages/allspark-foundation-hub/src/SupplyChain/Redux/reducer.ts @@ -10,8 +10,6 @@ import { SC_MANAGER_EXPERIENCE_SLICE } from '../../Shared'; export const SC_INITIAL_STATE: SupplyChainManagerExperienceState = { selectedTeamIDs: [], selectedShifts: [], - defaultWidgets: ['Roster'], - hubScreenName: '', allSiteTeamsSections: [], allSiteTeams: [], mySupplyChainTeamsData: undefined, @@ -34,12 +32,6 @@ export const supplyChainManagerExperienceSlice = createSlice({ const shifts = [...action.payload]; state.selectedShifts = shifts.sort(); }, - setDefaultWidgets: (state, action: PayloadAction<string[]>) => { - state.defaultWidgets = action.payload; - }, - setHubScreenName: (state, action: PayloadAction<string>) => { - state.hubScreenName = action.payload; - }, setAllSiteTeamsSections: ( state, action: PayloadAction<AllTeamsSections[]> --- packages/allspark-foundation-hub/src/SupplyChain/Redux/types.ts @@ -6,8 +6,6 @@ import { export type SupplyChainManagerExperienceState = { selectedTeamIDs: string[]; selectedShifts: string[]; - defaultWidgets: string[]; - hubScreenName: string; allSiteTeamsSections: AllTeamsSections[]; mySupplyChainTeamsData: null | {} | undefined; allSiteTeams: SupplyChainTeam[];
Update hub version
Update hub version
d5a431c6756ca97ba5ca7c6f68a7b7761e84d634
--- env.teflon.js @@ -5,15 +5,9 @@ export default { pingFedEnv: 'CERT', redirectUri: 'com.walmart.stores.allspark.beta://SSOLogin', sumoOptions: { - appKey: 'cb663e07-7bcc-4039-ae97-8fb8e8a9ff77', - appSecret: - 'Y2I2NjNlMDctN2JjYy00MDM5LWFlOTctOGZiOGU4YTlmZjc3QWxsU3BhcmtfZGV2', + appUUID: 'cb663e07-7bcc-4039-ae97-8fb8e8a9ff77', consumerId: 'b5fc6fe0-5927-44a6-a693-6e922e830b04', - environment: 'qa', - sumoSenderId: '572613464107', - logLevel: 'debug', - autoSetProfile: false, - skipNotificationPermissionPrompt: true, + environment: 'STAGE', }, splunk: { url: 'https://analytics.mobile.walmart.com/analytics/allspark', @@ -26,8 +20,9 @@ export default { internalBffUrl: 'https://api-proxy-es2.stg-us-azure.soa-api-proxy.platform.prod.us.walmart.net', externalBffUrl: 'https://developer.api.us.stg.walmart.com', - bffService: '/api-proxy/service/store/systems-bff/v0', + bffService: '/api-proxy/service/store/systems-bff/v1', allsparkService: 'https://developer.api.stg.walmart.com/api-proxy/service/allspark/api/v1', rbacAppId: 'ec9f5c40-88be-4e90-8807-a4f15f11e84c', }; +
updated teflon env
updated teflon env
f8b0f9c38b739be51c3627541cf134eafb3e81f9
--- .gitignore @@ -100,4 +100,3 @@ lib/ # custom build.context.json src/env.ts -.github/instructions/wmt-copilot.instructions.md
fix(drop34): gitignore reset
fix(drop34): gitignore reset
725e698d9e18a7884da2c7f852f3bbcfa28eaada
--- targets/US/package.json @@ -141,7 +141,7 @@ "@walmart/redux-store": "~6.3.28", "@walmart/returns-mini-app": "4.15.0", "@walmart/rfid-scan-mini-app": "2.7.1", - "@walmart/rn-receiving-mini-app": "2.4.75", + "@walmart/rn-receiving-mini-app": "2.4.76", "@walmart/roster-mini-app": "2.9.0", "@walmart/schedule-mini-app": "1.13.0", "@walmart/shelfavailability-mini-app": "1.5.41", --- yarn.lock @@ -7487,9 +7487,9 @@ __metadata: languageName: node linkType: hard -"@walmart/loadquality-mini-app@npm:1.0.196": - version: 1.0.196 - resolution: "@walmart/loadquality-mini-app@npm:1.0.196" +"@walmart/loadquality-mini-app@npm:1.0.198": + version: 1.0.198 + resolution: "@walmart/loadquality-mini-app@npm:1.0.198" dependencies: "@walmart/atlas-rn-ui-components": "npm:1.1.35" peerDependencies: @@ -7520,7 +7520,7 @@ __metadata: react-native-svg: ">=14.0.0" react-native-svg-transformer: ">=1.3.0" react-native-vision-camera: "*" - checksum: 10c0/e80a3571ca209964421487796fe3a5788af9c923c0778f5e9e112306772221869b8a48dcc2bde9f1fead5e634a616a810cba8b43b7d7415915a3f9f303b01d14 + checksum: 10c0/ea88c09a0badd1c06947112f011360dffcf68a5cbff162921ad9829b01bb91e7390b116538f909c6a74fe9722b13ca027c4cf32b6c264e6c79f028d4a8209f66 languageName: node linkType: hard @@ -7900,7 +7900,7 @@ __metadata: "@walmart/redux-store": "npm:~6.3.28" "@walmart/returns-mini-app": "npm:4.15.0" "@walmart/rfid-scan-mini-app": "npm:2.7.1" - "@walmart/rn-receiving-mini-app": "npm:2.4.75" + "@walmart/rn-receiving-mini-app": "npm:2.4.76" "@walmart/roster-mini-app": "npm:2.9.0" "@walmart/schedule-mini-app": "npm:1.13.0" "@walmart/shelfavailability-mini-app": "npm:1.5.41" @@ -8620,12 +8620,12 @@ __metadata: languageName: node linkType: hard -"@walmart/rn-receiving-mini-app@npm:2.4.75": - version: 2.4.75 - resolution: "@walmart/rn-receiving-mini-app@npm:2.4.75" +"@walmart/rn-receiving-mini-app@npm:2.4.76": + version: 2.4.76 + resolution: "@walmart/rn-receiving-mini-app@npm:2.4.76" dependencies: "@walmart/atlas-rn-ui-components": "npm:1.1.53" - "@walmart/loadquality-mini-app": "npm:1.0.196" + "@walmart/loadquality-mini-app": "npm:1.0.198" peerDependencies: "@react-native-clipboard/clipboard": ">=1.14.0" "@react-native/metro-config": ">=0.73.0" @@ -8651,7 +8651,7 @@ __metadata: react-native-svg: ">=14.1.0" react-native-svg-transformer: ">=1.3.0" react-native-vision-camera: "*" - checksum: 10c0/c382814c61cb68f30a1f1f9cd0a6fc46b7966e73414cef909de315f66999660f9343b3566e4cfaebd6ca0459cbe81f269302c2901b4279ae582613130411756b + checksum: 10c0/7a95693ffd64e02b87cbc47cd3538d845fbf5c945f8bce4274304691b3980e187a8c68b8d1dda87d4d54597478f9444b350420eb5ca2957b28c9c83887cfbce1 languageName: node linkType: hard
Receiving - 2.4.76 - LQ version update
Receiving - 2.4.76 - LQ version update
a8b74f1ac2c24a761c31a0f8fe0ec750f15d6c82
--- package.json @@ -322,7 +322,7 @@ } }, "transformIgnorePatterns": [ - "<rootDir>/node_modules/(?!(react-native|@walmart/core-utils|@walmart/core-services|@walmart/core-services-allspark|@walmart/gtp-shared-components|@react-native-community/picker|@walmart/redux-store|@react-native-firebase|react-native-gesture-handler|@react-native|@living-design|@react-native-community/datetimepicker|@testing-library|jest-diff|jest-matcher-utils)/)" + "<rootDir>/node_modules/(?!(react-native|@walmart/core-utils|@walmart/allspark-utils|@walmart/core-services|@walmart/core-services-allspark|@walmart/gtp-shared-components|@react-native-community/picker|@walmart/redux-store|@react-native-firebase|react-native-gesture-handler|@react-native|@living-design|@react-native-community/datetimepicker|@testing-library|jest-diff|jest-matcher-utils)/)" ], "moduleNameMapper": { "@walmart/react-native-logger/(.*)": "<rootDir>/__tests__/__mocks__/@walmart/react-native-logger.js",
Update package.json
Update package.json
2b6a8e1498f3df685ce8e7cdbc41c25a74208fa3
--- .looper-pr.yml @@ -8,7 +8,7 @@ tools: flows: npm-install: - (name Enable Corepack) 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 - (name Yarn Install) yarn install @@ -20,7 +20,7 @@ flows: envs: global: variables: - APP_NAME: feature-app-template-typescript + APP_NAME: associate-exp-hub-mini-app STAGES_TO_RUN: LINT: true UNITTEST: true --- app.config.US.ts @@ -27,8 +27,8 @@ const bundleIdentifier = AppVariant.select({ const buildNumber = process.env.BUILD_NUMBER || '1'; const CONFIG: ExpoConfig = { - name: 'FeatureApp', - slug: 'FeatureApp', + name: 'AssociateExpHub', + slug: 'AssociateExpHub', version: pkg.version, android: { versionCode: Number(buildNumber), --- package.json @@ -1,5 +1,5 @@ { - "name": "@walmart/feature-app-template", + "name": "@walmart/associate-exp-hub-mini-app", "version": "0.0.1", "main": "main.js", "files": [ --- yarn.lock @@ -6715,68 +6715,9 @@ __metadata: languageName: node linkType: hard -"@walmart/config-components@npm:4.6.5": - version: 4.6.5 - resolution: "@walmart/config-components@npm:4.6.5" - peerDependencies: - "@react-native-firebase/app": ">=15.1.1" - "@react-native-firebase/database": ">=15.1.1" - "@react-native-firebase/perf": ">15.1.1" - "@walmart/allspark-foundation": "*" - jwt-decode: ">=3.0" - react: "*" - react-native: "*" - react-native-device-info: ">=10.1.0" - redux: ">=4.2.0" - reduxsauce: ">=1" - reselect: ">=4" - checksum: 10c0/70f52b03d0535d753e5688768e6a527af6d7748db943d351bd533d4aa3daee539690b4cf7f5bfd208299b320b8a1065e85f64eb711ba4fcfa08a0c2298bf4f58 - languageName: node - linkType: hard - -"@walmart/core-services-allspark@npm:6.26.0-alpha.1": - version: 6.26.0-alpha.1 - resolution: "@walmart/core-services-allspark@npm:6.26.0-alpha.1" - peerDependencies: - "@walmart/allspark-foundation": "*" - "@walmart/me-at-walmart-common": "*" - "@walmart/me-at-walmart-container": "*" - checksum: 10c0/ff3f46987033f18a77b393820b69dcf97c34e748ba493d8ec3164f5e24d6c53c7622873bf0093032a091ab2ea143eb7ee960b40044c872d20b18717714d6a9c2 - languageName: node - linkType: hard - -"@walmart/core-services@npm:6.5.3": - version: 6.5.3 - resolution: "@walmart/core-services@npm:6.5.3" - peerDependencies: - "@walmart/allspark-foundation": "*" - "@walmart/allspark-utils": "*" - "@walmart/me-at-walmart-common": "*" - checksum: 10c0/93a98b879fe7d61d0a404522e9db76afd7cf97d0f92094a3a6fdb51ffe6f55828070a42c0c457a8048bb00094ddd6ab551542b0222425c4040fcbf3a8bc0f564 - languageName: node - linkType: hard - -"@walmart/core-utils@npm:6.3.10": - version: 6.3.10 - resolution: "@walmart/core-utils@npm:6.3.10" - peerDependencies: - "@walmart/allspark-utils": "*" - checksum: 10c0/e6cd72b6ed7efe0f6bffe02f154766fc90ccb24550c6ccee6908cae14a03528aaf609bd7ab988f1dba05f788758009be20e3e139ccd28a0c2c7466fbb9cfaeae - languageName: node - linkType: hard - -"@walmart/expo-config-plugins@npm:0.1.4": - version: 0.1.4 - resolution: "@walmart/expo-config-plugins@npm:0.1.4" - dependencies: - fs-extra: "npm:^11.2.0" - checksum: 10c0/d9d2840c19d61e6ecb8a6193f79e849f056e8a1d64f1780f0697137599bf9058358f0278d3195094f162e57392cb2bb17930415bf1d4f16b63217c5afda05a9c - languageName: node - linkType: hard - -"@walmart/feature-app-template@workspace:.": +"@walmart/associate-exp-hub-mini-app@workspace:.": version: 0.0.0-use.local - resolution: "@walmart/feature-app-template@workspace:." + resolution: "@walmart/associate-exp-hub-mini-app@workspace:." dependencies: "@babel/core": "npm:^7.22.10" "@babel/preset-env": "npm:^7.22.10" @@ -6884,6 +6825,65 @@ __metadata: languageName: unknown linkType: soft +"@walmart/config-components@npm:4.6.5": + version: 4.6.5 + resolution: "@walmart/config-components@npm:4.6.5" + peerDependencies: + "@react-native-firebase/app": ">=15.1.1" + "@react-native-firebase/database": ">=15.1.1" + "@react-native-firebase/perf": ">15.1.1" + "@walmart/allspark-foundation": "*" + jwt-decode: ">=3.0" + react: "*" + react-native: "*" + react-native-device-info: ">=10.1.0" + redux: ">=4.2.0" + reduxsauce: ">=1" + reselect: ">=4" + checksum: 10c0/70f52b03d0535d753e5688768e6a527af6d7748db943d351bd533d4aa3daee539690b4cf7f5bfd208299b320b8a1065e85f64eb711ba4fcfa08a0c2298bf4f58 + languageName: node + linkType: hard + +"@walmart/core-services-allspark@npm:6.26.0-alpha.1": + version: 6.26.0-alpha.1 + resolution: "@walmart/core-services-allspark@npm:6.26.0-alpha.1" + peerDependencies: + "@walmart/allspark-foundation": "*" + "@walmart/me-at-walmart-common": "*" + "@walmart/me-at-walmart-container": "*" + checksum: 10c0/ff3f46987033f18a77b393820b69dcf97c34e748ba493d8ec3164f5e24d6c53c7622873bf0093032a091ab2ea143eb7ee960b40044c872d20b18717714d6a9c2 + languageName: node + linkType: hard + +"@walmart/core-services@npm:6.5.3": + version: 6.5.3 + resolution: "@walmart/core-services@npm:6.5.3" + peerDependencies: + "@walmart/allspark-foundation": "*" + "@walmart/allspark-utils": "*" + "@walmart/me-at-walmart-common": "*" + checksum: 10c0/93a98b879fe7d61d0a404522e9db76afd7cf97d0f92094a3a6fdb51ffe6f55828070a42c0c457a8048bb00094ddd6ab551542b0222425c4040fcbf3a8bc0f564 + languageName: node + linkType: hard + +"@walmart/core-utils@npm:6.3.10": + version: 6.3.10 + resolution: "@walmart/core-utils@npm:6.3.10" + peerDependencies: + "@walmart/allspark-utils": "*" + checksum: 10c0/e6cd72b6ed7efe0f6bffe02f154766fc90ccb24550c6ccee6908cae14a03528aaf609bd7ab988f1dba05f788758009be20e3e139ccd28a0c2c7466fbb9cfaeae + languageName: node + linkType: hard + +"@walmart/expo-config-plugins@npm:0.1.4": + version: 0.1.4 + resolution: "@walmart/expo-config-plugins@npm:0.1.4" + dependencies: + fs-extra: "npm:^11.2.0" + checksum: 10c0/d9d2840c19d61e6ecb8a6193f79e849f056e8a1d64f1780f0697137599bf9058358f0278d3195094f162e57392cb2bb17930415bf1d4f16b63217c5afda05a9c + languageName: node + linkType: hard + "@walmart/gtp-shared-components@npm:2.2.4": version: 2.2.4 resolution: "@walmart/gtp-shared-components@npm:2.2.4"
feat(ui): update package name
feat(ui): update package name
cc383ff02b44734e589fed6ef99d6d6954b60eb2
--- src/components/Roster/index.ts --- src/screens/RosterScreenOld.tsx @@ -27,6 +27,7 @@ import { associateIsAbsent, } from '../utils'; import {analytics} from '../logger/Analytics'; +import {AssociateRosterItem} from '../components/Roster/types'; const styles = StyleSheet.create({ screen: { @@ -70,7 +71,7 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => { }, [data?.getDailyRoster]); const clockedInCount = rosterData?.filter(associateIsClockedIn)?.length ?? 0; const absentCount = rosterData?.filter(associateIsAbsent)?.length ?? 0; - const [associates, setAssociates] = useState<Associate[]>([]); + const [associates, setAssociates] = useState<AssociateRosterItem[]>([]); const teamLeads = useSelector(teamLeadJobDescriptions) as string[]; const [pullToRefresh, setPullToRefresh] = useState(false); const loaderOffSet = 10; @@ -97,7 +98,9 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => { useEffect(() => { if (data?.getDailyRoster) { - setAssociates(sortedAssociateList(allAssociates, teamLeads)); + setAssociates( + sortedAssociateList(allAssociates as AssociateRosterItem[], teamLeads), + ); } }, [allAssociates]); @@ -111,7 +114,10 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => { const userIsInRoster = useUserIsInRoster(); - const onFilter = (filteredAssociates: Associate[], filterId: FilterValue) => { + const onFilter = ( + filteredAssociates: AssociateRosterItem[], + filterId: FilterValue, + ) => { selectedFilter.current = filterId; setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); }; @@ -183,11 +189,13 @@ export const RosterScreen: React.FC<RosterScreenProps> = () => { /> {/* @todo - determine if this should be shown on empty state */} - {!!associates.length && <RosterHeader associates={associates} />} + {!!associates.length && ( + <RosterHeader associates={associates as Associate[]} /> + )} </> } ListEmptyComponent={ListEmptyComponent} - data={associates} + data={associates as Associate[]} extraData={extraData} refreshing={loading} estimatedItemSize={100} --- src/screens/ViewTeamScreen.tsx @@ -14,6 +14,7 @@ import {teamLeadJobDescriptions} from '../redux/selectors'; import {TEXTING_I18N_NAMESPACE} from '../translations'; import {useTranslation} from 'react-i18next'; import {sortedAssociateList} from '../utils'; +import { AssociateRosterItem } from "../components/Roster/types"; const styles = StyleSheet.create({ associateRosterItemStyle: {marginHorizontal: 16, height: 100}, @@ -33,7 +34,7 @@ export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => { const {bottom: bottomInset} = useSafeAreaInsets(); - const [associates, setAssociates] = useState<Associate[]>([]); + const [associates, setAssociates] = useState<AssociateRosterItem[]>([]); const teamLeads = useSelector(teamLeadJobDescriptions); @@ -53,7 +54,7 @@ export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => { } }, [teamData, navigation, translationContext, t]); - const onFilter = (filteredAssociates: Associate[]) => { + const onFilter = (filteredAssociates: AssociateRosterItem[]) => { setAssociates(sortedAssociateList(filteredAssociates, teamLeads)); }; @@ -79,7 +80,7 @@ export const ViewTeamScreen: React.FC<ViewTeamScreenProps> = (props) => { /> </> } - data={associates} + data={associates as Associate[]} renderItem={renderAssociateRosterItem} estimatedItemSize={100} showsVerticalScrollIndicator={false} --- src/utils/index.ts @@ -1,3 +1,2 @@ export * from './user'; export * from './assoicateList'; -export * from './timestamps'; --- src/utils/timestamps.ts @@ -1,29 +0,0 @@ -import firestore from '@react-native-firebase/firestore'; -import moment from 'moment-timezone'; -import {LastMessageTimeStamp} from '../types'; -import {TFunction} from 'i18next'; - -export const daysAgoTimestamp = (numDays: number) => { - return firestore.Timestamp.fromDate( - new Date(Date.now() - numDays * 24 * 60 * 60 * 1000), - ); -}; - -export const channelRowTimeStamp = ( - lastMessageTimeStamp: LastMessageTimeStamp, - t: TFunction, -): string => { - const messageTimeStamp = moment(lastMessageTimeStamp); - const currentDate = moment(); - if (messageTimeStamp.isSame(currentDate, 'day')) { - return messageTimeStamp.format('hh:mm a'); - } else if ( - messageTimeStamp.isSame(currentDate.clone().subtract(1, 'days'), 'day') - ) { - return t('timestamp.yesterday'); - } else { - return t( - `timestamp.${messageTimeStamp.format('dddd').toLocaleLowerCase()}`, - ); - } -};
fixing ts issue on old roster screen while preserving logic
fixing ts issue on old roster screen while preserving logic
d32748d8503ba62c17be6ab3547f84959f276eb5
--- package-lock.json @@ -4963,9 +4963,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.63.0", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.63.0.tgz", - "integrity": "sha512-Vmg+D2rF7hJQ86xsAJv0O2UE535UbjgertmvjihRYZgWyFHNQfS2zu+50wO7usK1yvZyyAs1njy85WX2yP7wVw==" + "version": "0.63.0-rc.0", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.63.0-rc.0.tgz", + "integrity": "sha512-9okNlrhVKa2QBkenNLb/iu2lW7+TcbxmH6OWFs2qPWFHzasArzPMxlmfmg4rNX4in+42/4JZQR3Tp4p7VBNf2w==" }, "@walmart/wfm-ui": { "version": "0.2.14", @@ -16405,7 +16405,7 @@ "nano-time": { "version": "1.0.0", "resolved": "https://npme.walmart.com/nano-time/-/nano-time-1.0.0.tgz", - "integrity": "sha512-flnngywOoQ0lLQOTRNexn2gGSNuM9bKj9RZAWSzhQ+UJYaAFG9bac4DW9VHjUAzrOaIcajHybCTHe/bkvozQqA==", + "integrity": "sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=", "requires": { "big-integer": "^1.6.16" } @@ -19178,7 +19178,7 @@ "remove-accents": { "version": "0.4.2", "resolved": "https://npme.walmart.com/remove-accents/-/remove-accents-0.4.2.tgz", - "integrity": "sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA==" + "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=" }, "remove-trailing-separator": { "version": "1.1.0", --- package.json @@ -106,7 +106,7 @@ "@walmart/taskit-mini-app": "0.21.0", "@walmart/time-clock-mini-app": "0.5.2", "@walmart/ui-components": "1.4.0-rc.0", - "@walmart/welcomeme-mini-app": "0.63.0", + "@walmart/welcomeme-mini-app": "0.63.0-rc.0", "@walmart/wfm-ui": "0.2.14", "axios": "^0.26.1", "axios-cache-adapter": "2.7.3",
bumping welcomeme
bumping welcomeme
cb652c44acb9af68e2d8afdf273e172e59c3f5ca
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.19.12](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.19.11...@walmart/allspark-foundation-hub@1.19.12) (2025-10-28) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.19.11](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.19.10...@walmart/allspark-foundation-hub@1.19.11) (2025-10-28) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.19.11", + "version": "1.19.12", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/allspark-foundation/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. +# [7.6.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.5.2...@walmart/allspark-foundation@7.6.0) (2025-10-28) + +### Features + +- **developerMenu:** class implementation for developer menu ([#402](https://gecgithub01.walmart.com/allspark/allspark/issues/402)) ([7ff5e23](https://gecgithub01.walmart.com/allspark/allspark/commit/7ff5e23ce78b0c2aabc8cc4472edc0ccfc16fcd0)) + ## [7.5.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation@7.5.1...@walmart/allspark-foundation@7.5.2) (2025-10-28) ### Bug Fixes --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "7.5.2", + "version": "7.6.0", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/me-at-walmart-geolocation/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.3.11](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-geolocation@1.3.10...@walmart/me-at-walmart-geolocation@1.3.11) (2025-10-28) + +**Note:** Version bump only for package @walmart/me-at-walmart-geolocation + ## [1.3.10](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-geolocation@1.3.9...@walmart/me-at-walmart-geolocation@1.3.10) (2025-10-28) **Note:** Version bump only for package @walmart/me-at-walmart-geolocation --- packages/me-at-walmart-geolocation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-geolocation", - "version": "1.3.10", + "version": "1.3.11", "description": "Geofencing, location tracking and location services for me@ apps", "author": "m0n09mr <maksym.novakh@walmart.com>", "main": "./lib/cjs/index.js",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation@7.6.0 - @walmart/allspark-foundation-hub@1.19.12 - @walmart/me-at-walmart-geolocation@1.3.11
1f5e4190341fd64258c3cc954a7ea908e8a2275c
--- env.beta.js @@ -7,7 +7,7 @@ export default { pingFedEnv: 'PROD', redirectUri: 'com.walmart.stores.allspark.beta://SSOLogin', sumoOptions: { - appUUID: 'f0582cce-810e-4c6b-9280-77c4979e22ae', + appUUID: '0226b4c0-f1f5-4931-9fb6-f80f1f9a2e3e', consumerId: '364a55bb-7f04-4a7c-a800-1d91c08fe5f2', environment: 'PROD', },
Change sumo appUUID in beta flavor
Change sumo appUUID in beta flavor
321132c430c51b103fdadf3278ecb6f1dcef0b2a
--- package-lock.json @@ -59,7 +59,7 @@ "@walmart/manager-approvals-miniapp": "0.2.2", "@walmart/me-field-mini-app": "1.3.0", "@walmart/metrics-mini-app": "0.11.5", - "@walmart/mod-flex-mini-app": "1.9.0", + "@walmart/mod-flex-mini-app": "1.9.2", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.35", @@ -5563,9 +5563,9 @@ "license": "MIT" }, "node_modules/@walmart/mod-flex-mini-app": { - "version": "1.9.0", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.0.tgz", - "integrity": "sha512-QWGKlfNA3pnHTun4ZTpx/ya3fKLfZUzK8CJn0HytpZeAp83YyZHrROgtG2hyo6qz0CeUZNc72xLjumOd+kQq1Q==", + "version": "1.9.2", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.2.tgz", + "integrity": "sha512-+X2BsC1S4w5kteYMe2K35FKzuawJBR97saKQoOMcLwmXRE3QMWUs1PlB1/eUN5NehrMF4m/e7vvmUz9HL3QKdQ==", "hasInstallScript": true, "peerDependencies": { "@react-native-community/async-storage": "^1.11.0", @@ -5577,7 +5577,7 @@ "@walmart/core-services-allspark": "^1.3.1", "@walmart/functional-components": "^2.0.2", "@walmart/gtp-shared-components": "^2.0.4", - "@walmart/ims-print-services-ui": "^2.0.6", + "@walmart/ims-print-services-ui": "^2.2.3", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.31.0-rc.0", "@walmart/react-native-scanner-3.0": "^0.1.30-rc.1", @@ -25373,9 +25373,9 @@ } }, "@walmart/mod-flex-mini-app": { - "version": "1.8.6", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.8.6.tgz", - "integrity": "sha512-XEi9JkU4vlxFgD/a9E0drNkYlRSefw6UbQTFbACSJy21zeMMB9haz1u6cVWo/Me14JYYZtiPk1A/1kLlc/aUuQ==" + "version": "1.9.2", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.9.2.tgz", + "integrity": "sha512-+X2BsC1S4w5kteYMe2K35FKzuawJBR97saKQoOMcLwmXRE3QMWUs1PlB1/eUN5NehrMF4m/e7vvmUz9HL3QKdQ==" }, "@walmart/moment-walmart": { "version": "1.0.4" --- package.json @@ -101,7 +101,7 @@ "@walmart/manager-approvals-miniapp": "0.2.2", "@walmart/me-field-mini-app": "1.3.0", "@walmart/metrics-mini-app": "0.11.5", - "@walmart/mod-flex-mini-app": "1.9.0", + "@walmart/mod-flex-mini-app": "1.9.2", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.35",
update modflex package 1.9.2
update modflex package 1.9.2
c901896bf5517dc5dffffc21c0af1b24e7cacd47
--- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -211,6 +211,11 @@ export const MainStackNav = () => { component={Components.VoiceMessagingScreen} /> + <MainStack.Screen + name='PttTexting' + component={Components.TextingScreen} + /> + <MainStack.Screen name='WhatsNewModal' component={WhatsNewModal} /> <MainStack.Screen
fixing the blue button. Missing texting screen in container
fixing the blue button. Missing texting screen in container
2ff36ac28d80f098c5e468d75db0575fe7938881
--- targets/US/android/app/src/main/java/com/walmart/stores/allspark/beta/MainApplication.kt @@ -18,8 +18,10 @@ import expo.modules.ApplicationLifecycleDispatcher import expo.modules.ReactNativeHostWrapper import com.microsoft.codepush.react.CodePush import com.walmart.ssmp.platform.core.PlatformCoreApplication +import dagger.hilt.android.HiltAndroidApp import java.util.ArrayList +@HiltAndroidApp // This is needed for the sumo sdk class MainApplication : PlatformCoreApplication(), ReactApplication { private lateinit var intentWakeupReceiver: IntentWakeupReceiver override val reactNativeHost: ReactNativeHost = @@ -54,7 +56,7 @@ class MainApplication : PlatformCoreApplication(), ReactApplication { intentWakeupReceiver = IntentWakeupReceiver() val filter = IntentFilter("com.walmart.squiggly.intent.action.PTT_PRESS") filter.addAction("com.walmart.stores.allspark.beta.intent.action.PTT_PRESS") - if (Build.VERSION.SDK_INT >= 34) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { this.applicationContext.registerReceiver(intentWakeupReceiver, filter, RECEIVER_EXPORTED) } else { this.applicationContext.registerReceiver(intentWakeupReceiver, filter) --- targets/US/src/App.tsx @@ -13,7 +13,7 @@ import {onPreRegister} from './preRegister'; /** * Setup as a class to access codepush status changes. */ -export class UsAppBase extends Component { +class UsAppBase extends Component { /** * Log codepush status changes. */ --- targets/US/src/preRegister.ts @@ -1,8 +1,38 @@ import {AllsparkNotificationClient} from '@walmart/allspark-foundation/Notification'; +import {ComponentType} from 'react'; +import {Text, TextInput, TextInputProps} from 'react-native'; + +// Set up font scaling for the app to avoid issues with settings overriding the app's font styles. +export const setFontScaling = () => { + // Override Text scaling + if ((Text as ComponentType).defaultProps == null) { + (Text as ComponentType).defaultProps = { + allowFontScaling: false, + }; + } + + // Override Text scaling in input fields + if ((TextInput as ComponentType<TextInputProps>).defaultProps == null) { + (TextInput as ComponentType<TextInputProps>).defaultProps = { + allowFontScaling: false, + }; + } +}; export const onPreRegister = () => { + // Set up font scaling for the app to avoid issues with settings overriding the app's font styles. + setFontScaling(); + /** * Pause notifications while the app is starting up. */ AllsparkNotificationClient.pauseNotifications(); + + /** + * Setup calling mini app. + * Requiring directly to avoid side effects. + * @todo: Have calling expose rootSetup directly. Something like: + * import { setupCalling } from '@walmart/calling-mini-app/Setup'; + */ + require('@walmart/calling-mini-app/dist/rootSetup/index').setupCalling(); };
chore: add missing US preregister logic. add hilt to main application kt
chore: add missing US preregister logic. add hilt to main application kt
b8aec1fad44f642061cce7b876b2c5af3fdcf89d
--- packages/allspark-foundation/__mocks__/react-native-gesture-handler.js @@ -1,5 +0,0 @@ -module.exports = { - GestureHandlerRootView: ({ children }: { children: React.ReactNode }) => children, - PanGestureHandler: jest.fn(), - }; - \ No newline at end of file --- packages/allspark-foundation/__mocks__/react-native-safe-area-context.js @@ -1,5 +1,14 @@ +const inset = { + top: 0, + right: 0, + bottom: 0, + left: 0, +}; + module.exports = { + ...jest.requireActual('react-native-safe-area-context'), SafeAreaView: 'SafeAreaView', - useSafeAreaInsets: jest.fn(() => ({top: 0, bottom: 0, right: 0, left: 0})), - SafeAreaProvider: ({ children }: { children: React.ReactNode }) => children, + useSafeAreaInsets: jest.fn(() => inset), + SafeAreaProvider: ({ children }) => children, + useSafeAreaFrame: jest.fn(() => ({ x: 0, y: 0, width: 0, height: 0 })), }; --- packages/allspark-foundation/__tests__/Container/__snapshots__/AllsparkContainer.test.tsx.snap @@ -1,3 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`AllsparkContainer renders the Provider component and triggers the root setup 1`] = `<LivingDesignProvider />`; +exports[`AllsparkContainer renders the Provider component and triggers the root setup 1`] = ` +<View + style={ + { + "flex": 1, + } + } +> + <LivingDesignProvider /> +</View> +`; --- packages/allspark-foundation/__tests__/FeatureRunner/navigation.test.ts @@ -1,37 +0,0 @@ -import { createFeatureRunnerNavigation } from '../../src/FeatureRunner/navigation'; -import { AllsparkFeatureModule } from '../../src/Feature'; - -jest.mock('../../src/Permissions', () => { - const initVal = jest.requireActual('../../src/Permissions'); - return { - ...initVal, - PERMISSIONS: { - ANDROID: {}, - IOS: {}, - WINDOWS: {}, - }, - }; -}); - -jest.mock('../../src/Feature', () => ({ - AllsparkFeatureModule: jest.fn().mockImplementation(() => ({ - buildAllScreens: jest.fn().mockReturnValue([]), - })), -})); - -describe('createFeatureRunnerNavigation', () => { - const mockFeature = new AllsparkFeatureModule(); - afterEach(() => { - jest.clearAllMocks(); - }); - it('should be defined', () => { - const result = createFeatureRunnerNavigation(mockFeature); - expect(result).toBeDefined(); - }); - it('should call buildAllScreens with correct arguments', () => { - createFeatureRunnerNavigation(mockFeature); - expect(mockFeature.buildAllScreens).toHaveBeenCalledWith({ - Navigator: undefined, - }); - }); -}); \ No newline at end of file --- packages/allspark-foundation/__tests__/FeatureRunner/navigation.test.tsx @@ -0,0 +1,116 @@ +import { AllsparkNavigationClient } from '../../src/Navigation'; +import { + createFeatureRunnerNavigation, + PluginComponentContainer, +} from '../../src/FeatureRunner/navigation'; +import { AllsparkFeatureModule } from '../../src/Feature'; + +jest.mock('../../src/Permissions', () => { + const initVal = jest.requireActual('../../src/Permissions'); + return { + ...initVal, + PERMISSIONS: { + ANDROID: {}, + IOS: {}, + WINDOWS: {}, + }, + }; +}); + +jest.mock('../../src/Feature', () => ({ + ...jest.requireActual('../../src/Feature'), + AllsparkFeatureModule: jest.fn().mockImplementation(() => ({ + buildAllScreens: jest.fn().mockReturnValue([]), + })), +})); + +jest.mock('@react-navigation/native', () => { + return { + ...jest.requireActual('@react-navigation/native'), + }; +}); + +jest.mock('@react-navigation/drawer', () => { + return { + ...jest.requireActual('@react-navigation/drawer'), + }; +}); + +jest.mock('@react-navigation/stack', () => { + return { + ...jest.requireActual('@react-navigation/stack'), + }; +}); + +// jest.mock('react-redux', () => ({ +// useSelector: jest.fn(), +// })); +jest.mock('../../src/Environment', () => ({ + AllsparkEnvironment: { + resolveDerivedValue: jest.fn(), + }, +})); +jest.mock('../../src/Navigation', () => ({ + AllsparkNavigationClient: { + addModal: jest.fn(), + openModal: jest.fn(), + }, +})); +jest.mock('../../src/Components', () => ({ + ...jest.requireActual('../../src/Components'), + PluginComponentContainer: { + add: jest.fn(), + }, +})); +jest.mock('../../src/FeatureRunner/screens/Home', () => ({ + Home: () => 'HomeScreen', +})); +jest.mock('../../src/FeatureRunner/screens/Login', () => ({ + Login: () => 'LoginScreen', +})); + +const spyAdd = jest.spyOn(PluginComponentContainer, 'add'); +const mockFeature = new AllsparkFeatureModule('TestFeature', { + name: 'TestFeature', +}); +describe('createFeatureRunnerNavigation', () => { + afterEach(() => { + jest.clearAllMocks(); + }); + it('should be defined', () => { + const result = createFeatureRunnerNavigation(mockFeature); + expect(result).toBeDefined(); + }); + it('should call buildAllScreens with correct arguments', () => { + createFeatureRunnerNavigation(mockFeature); + expect(mockFeature.buildAllScreens).toHaveBeenCalledWith( + expect.objectContaining({ + Navigator: expect.objectContaining({ + Group: expect.any(Function), + Screen: expect.any(Function), + Navigator: expect.any(Function), + }), + }) + ); + }); + const mockPlugins = [ + { name: 'Plugin1', component: () => 'PluginComponent', menuOption: {} }, + ]; + + beforeEach(() => { + jest.clearAllMocks(); + }); + + it('registers plugins to PluginComponentContainer and DynamicSideMenu', () => { + createFeatureRunnerNavigation(mockFeature, [], mockPlugins); + expect(spyAdd).toHaveBeenCalledWith('Plugin1', expect.any(Function)); + }); + + it('adds ClockModal to AllsparkNavigationClient', () => { + createFeatureRunnerNavigation(mockFeature); + expect(AllsparkNavigationClient.addModal).toHaveBeenCalledWith( + 'container.clock', + expect.objectContaining({ modal: expect.any(Function) }) + ); + }); +}); --- packages/allspark-foundation/__tests__/utils/setup.js @@ -1,6 +1,17 @@ +// Silence the warning: Animated: `useNativeDriver` is not supported because the native animated module is missing +import { jest } from '@jest/globals'; + jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter'); const { NativeModules } = require('react-native'); +// Include this line for mocking react-native-gesture-handler +import 'react-native-gesture-handler/jestSetup'; + +// Include this section for mocking react-native-reanimated +import { setUpTests } from 'react-native-reanimated'; + +setUpTests(); + // Stub out NativeModules NativeModules.RNCNetInfo = {}; NativeModules.RNGestureHandlerModule = {}; --- packages/allspark-foundation/jest.config.js @@ -9,6 +9,9 @@ module.exports = { globals: { __DEV__: true, }, - setupFiles: ['<rootDir>/__tests__/utils/setup.js'], + setupFiles: [ + '<rootDir>/__tests__/utils/setup.js', + '<rootDir>/../../node_modules/react-native-gesture-handler/jestSetup.js', + ], testPathIgnorePatterns: ['__mocks__/', '__tests__/utils/'], };
Reapply "test: createFeatureRunnerNavigation"
Reapply "test: createFeatureRunnerNavigation" This reverts commit ff66efa8708667f149e6128498470ccbf7297cf4.
f3aedb25ff429a0861aa5ca06954512b6af39eab
--- package.json @@ -88,7 +88,7 @@ "@walmart/counts-component-miniapp": "0.1.2", "@walmart/emergency-mini-app": "1.19.0", "@walmart/exception-mini-app": "1.0.16", - "@walmart/facilities-management-miniapp": "0.5.25", + "@walmart/facilities-management-miniapp": "0.5.26", "@walmart/feedback-all-spark-miniapp": "0.9.10", "@walmart/financial-wellbeing-feature-app": "1.1.2", "@walmart/functional-components": "2.0.6",
Bumped up FCM to "0.5.26"
Bumped up FCM to "0.5.26" Bumped up FCM to "0.5.26"
88070140c2078fb2cbb77dca6e09370470a42d7d
--- src/components/AssociateList/AssociateListItem.tsx @@ -38,7 +38,7 @@ export const AssociateListItem = ({ handleViewSchedule, }: AssociateListItemProps) => { const {t} = translationClient.useTranslation(); - const siteId = useSelector(UserSelectors.getSiteId); + const siteId = useSelector(UserSelectors.getWorkingSite); const encryptedId = encryptUserId(associate?.associateId ?? ''); const isClockedIn = associateIsClockedIn(associate); --- src/hooks/roster.ts @@ -55,7 +55,7 @@ export const useSupplyChainShifts = () => { export const useDailyRoster = (shouldSkipQuery: boolean = false) => { const [error, setError] = useState<any>(undefined); const storeId: string | undefined = useSelector( - UserSelectors.getSiteId, + UserSelectors.getWorkingSite, )?.toString(); const countryCode: string | undefined = useSelector( UserSelectors.getCountryCode, --- src/hooks/teams.ts @@ -15,7 +15,9 @@ import {useSupplyChainTeamsByBusinessUnitQuery} from '../queries/supplyChainTeam import {translationClient} from '../common'; export const useSupplyChainTeamById = (teamId: string) => { - const storeNbr: string | undefined = useSelector(UserSelectors.getSiteId); + const storeNbr: string | undefined = useSelector( + UserSelectors.getWorkingSite, + ); const countryCode: string | undefined = useSelector( UserSelectors.getCountryCode, ); @@ -53,7 +55,7 @@ export const useSupplyChainTeamById = (teamId: string) => { export const useSupplyChainTeamsByBusinessUnit = () => { const businessUnitNumber: string | undefined = useSelector( - UserSelectors.getSiteId, + UserSelectors.getWorkingSite, ); const countryCode: string | undefined = useSelector( UserSelectors.getCountryCode, @@ -83,7 +85,9 @@ export const useSupplyChainTeamsByBusinessUnit = () => { }; export const useGetTeamById = (teamId: string) => { - const storeNbr: string | undefined = useSelector(UserSelectors.getSiteId); + const storeNbr: string | undefined = useSelector( + UserSelectors.getWorkingSite, + ); const countryCode: string | undefined = useSelector( UserSelectors.getCountryCode, ); @@ -120,7 +124,9 @@ export const useGetTeamById = (teamId: string) => { }; export const useGetTeamsByStore = () => { - const storeNbr: string | undefined = useSelector(UserSelectors.getSiteId); + const storeNbr: string | undefined = useSelector( + UserSelectors.getWorkingSite, + ); const countryCode: string | undefined = useSelector( UserSelectors.getCountryCode, ); --- src/screens/RosterDetailScreen/StoreRosterDetailScreen.tsx @@ -85,7 +85,7 @@ export const StoreRosterDetailScreen = ({route}: RosterDetailScreenProps) => { const {bottom: bottomInset} = useSafeAreaInsets(); const navigation = useNavigation<StackNavigationProp<RosterNavParamsMap>>(); const teamLeads = useSelector(teamLeadJobDescriptions) as string[]; - const storeId = useSelector(UserSelectors.getSiteId); + const storeId = useSelector(UserSelectors.getWorkingSite); const siteTranslationContext = useTotalSiteOrTotalStore(); const translationContext = useSiteTranslationContext(); const countryCode: string | undefined = useSelector( --- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -87,7 +87,7 @@ export const SupplyChainRosterDetailScreen = ({ const {bottom: bottomInset} = useSafeAreaInsets(); const navigation = useNavigation<StackNavigationProp<RosterNavParamsMap>>(); const teamLeads = useSelector(teamLeadJobDescriptions) as string[]; - const storeId = useSelector(UserSelectors.getSiteId); + const storeId = useSelector(UserSelectors.getWorkingSite); const siteTranslationContext = useTotalSiteOrTotalStore(); const translationContext = useSiteTranslationContext(); const countryCode: string | undefined = useSelector(
Update roster site id return
Update roster site id return
7c3c392047619255a74c0754b08a6295a33f6e3a
--- package.json @@ -89,7 +89,7 @@ "@walmart/counts-component-miniapp": "0.0.42", "@walmart/emergency-mini-app": "1.17.0", "@walmart/exception-mini-app": "1.0.14", - "@walmart/facilities-management-miniapp": "0.5.14", + "@walmart/facilities-management-miniapp": "0.5.15", "@walmart/feedback-all-spark-miniapp": "0.9.9", "@walmart/financial-wellbeing-feature-app": "1.0.64", "@walmart/functional-components": "2.0.6",
Update package.json
Update package.json
6e486254f18fcc360c8e2f2a30f288c2010059c3
--- __tests__/screens/ClockedOutScreenGuardTest.tsx @@ -0,0 +1,6 @@ +// eslint-disable-next-line @typescript-eslint/no-unused-vars +import React from 'react'; + +describe('ClockedOutScreenGuard', () => { + it('all application screens disabled when user clocked out', () => {}); +}); --- __tests__/screens/ClockedOutScreenGuardTest.tsx @@ -0,0 +1,6 @@ +// eslint-disable-next-line @typescript-eslint/no-unused-vars +import React from 'react'; + +describe('ClockedOutScreenGuard', () => { + it('all application screens disabled when user clocked out', () => {}); +});
adding test case to fill in later
adding test case to fill in later
243809ca26a7e78e2bc61ed2aceeaff9d5cfaa28
--- packages/allspark-foundation/README.md @@ -70,6 +70,7 @@ To create a new container app, start with the [AllsparkContainer](./src/Containe To create a feature runner, start with the [AllsparkFeatureRunner](./src/FeatureRunner/README.md#allspark-feature-runner) documentation. + ## FAQ ### How to resolve dependency conflicts during `npm install`? @@ -78,7 +79,7 @@ If dependency conflicts come up during install, you can try the following: - Add an override to your `package.json` to force a specific version of the dependency. Default to the version listed by the foundation package and try to be as specific with your override as possible. - ``` json + ``` js "overrides": { "dependency-name": "1.2.3", // <-- overrides everywhere "dependency-name@<1": "1.2.3", // <-- overrides where version is less than 1 @@ -90,7 +91,7 @@ If dependency conflicts come up during install, you can try the following: - If the library causing the conflict is internal, ask the maintainer to update their dependency or loosen their version range. - ```json + ```js // library with issue "dependency-name": "~1.2.3"
Update README.md
Update README.md
ca0168e240780b651bd6fb0c32f3d172784e197d
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.17.0", + "version": "1.18.0", "main": "dist/index.js", "files": [ "dist"
Update the roster mini app version
Update the roster mini app version
b20d23ba813c824d12e32831bdc57f2dc12a298f
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 105 + versionCode 106 versionName "1.0.8" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>105</string> + <string>106</string> <key>FirebaseAutomaticScreenReportingEnabled</key> <false /> <key>LSApplicationQueriesSchemes</key>
Incrementing build number
Incrementing build number
1d594755a5e56989dafd484c9f05287c24e4061d
--- scripts/updateAndroidProjectConfig.sh @@ -55,20 +55,20 @@ sed -i.bak -e "s/scheme=\"${BETA_PACKAGE}\"/scheme=\"${PACKAGE}\"/g" -e "s/schem BUILD_CONFIG="${PACKAGE}.BuildConfig" echo "Updating BuildConfig import to ${BUILD_CONFIG} in ${MAIN_APPLICATION}" -# sed -i.bak "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/" ${MAIN_APPLICATION} && rm ${MAIN_APPLICATION}.bak -sed -E -i'' "s/import ${BETA_BUILD_CONFIG}|import ${PROD_BUILD_CONFIG}/import ${BUILD_CONFIG}/" ${MAIN_APPLICATION} +sed -Ei '.bak' "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/" ${MAIN_APPLICATION} && rm ${MAIN_APPLICATION}.bak +# sed -E -i'' "s/import ${BETA_BUILD_CONFIG}|import ${PROD_BUILD_CONFIG}/import ${BUILD_CONFIG}/" ${MAIN_APPLICATION} echo "Updating BuildConfig import to ${BUILD_CONFIG} in ${MAIN_ACTIVITY}" -# sed -i.bak "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/" ${MAIN_ACTIVITY} && rm ${MAIN_ACTIVITY}.bak -sed -E -i'' "s/import ${BETA_BUILD_CONFIG}|import ${PROD_BUILD_CONFIG}/import ${BUILD_CONFIG}/" ${MAIN_ACTIVITY} +sed -Ei '.bak' "s/import ${BETA_BUILD_CONFIG};|import ${PROD_BUILD_CONFIG};/import ${BUILD_CONFIG};/" ${MAIN_ACTIVITY} && rm ${MAIN_ACTIVITY}.bak +# sed -E -i'' "s/import ${BETA_BUILD_CONFIG}|import ${PROD_BUILD_CONFIG}/import ${BUILD_CONFIG}/" ${MAIN_ACTIVITY} echo "Updating CodePushDeploymentKey to ${CODE_PUSH_KEY} in ${STRINGS_XML}" # sed -i.bak "s/${DEV_CODE_PUSH_KEY}|${BETA_CODE_PUSH_KEY}|${PROD_CODE_PUSH_KEY}/${CODE_PUSH_KEY}/" ${STRINGS_XML} && rm ${STRINGS_XML}.bak sed -i.bak -e "s/${DEV_CODE_PUSH_KEY}/${CODE_PUSH_KEY}/g" -e "s/${BETA_CODE_PUSH_KEY}/${CODE_PUSH_KEY}/g" -e "s/${PROD_CODE_PUSH_KEY}/${CODE_PUSH_KEY}/g" ${STRINGS_XML} && rm ${STRINGS_XML}.bak echo "Updating Manifest path in react-native.config.js to ${RN_CONFIG_MANIFEST_PATH} in ${RN_CONFIG_JS}" -# sed -i.bak "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}|android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/" ${RN_CONFIG_JS} && rm ${RN_CONFIG_JS} -sed -E -i'' "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}|android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/" ${RN_CONFIG_JS} +sed -Ei '.bak' "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}|android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/" ${RN_CONFIG_JS} && rm ${RN_CONFIG_JS} +# sed -E -i'' "s/android: ${RN_CONFIG_PROD_APP_MANIFEST_PATH}|android: ${RN_CONFIG_DEV_BETA_APP_MANIFEST_PATH}/android: ${RN_CONFIG_MANIFEST_PATH}/" ${RN_CONFIG_JS} echo "Printing ${MAIN_ACTIVITY}" cat ${MAIN_ACTIVITY}
Added changes
Added changes
7d9ab76be29c808f81771358cbfd4efaf2a76fc4
--- src/navigation/ErrorLogBoundary.ts @@ -1,16 +1,16 @@ import {Component, PropsWithChildren} from 'react'; import {Logger} from '../core/Logger'; import {AllsparkReduxStore} from '@walmart/allspark-foundation/Redux'; -import {EnvironmentSelectors} from '@walmart/allspark-foundation/Environment'; export class ErrorLogBoundary extends Component<PropsWithChildren<{}>> { componentDidCatch(e: Error) { Logger.error('BOUNDARY_ERROR', { message: e.message, }); - const deploymentEnv = AllsparkReduxStore.select( - EnvironmentSelectors.getState, - ).deployment; + // const deploymentEnv = AllsparkReduxStore.select( + // EnvironmentSelectors.getState, + // ).deployment; + const deploymentEnv = AllsparkReduxStore.getState().environment.deployment; // We will let app crash by rethrowing the error if (deploymentEnv !== 'prod') { throw new Error(e.message);
update error boundary
update error boundary
a9819b983c05865e7446ce7d2dae99dee0a00197
--- package-lock.json @@ -3652,9 +3652,9 @@ } }, "@walmart/welcomeme-mini-app": { - "version": "0.30.2", - "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.30.2.tgz", - "integrity": "sha512-OWs7Hiq9vYh8V3GeoMjrerp7QT1T4gYH4Gd5PDHVSoOr0oW1P47+ZLHCetRt1SYLHPa05vB9kMBxk/O9ga+3Mw==" + "version": "0.30.3", + "resolved": "https://npme.walmart.com/@walmart/welcomeme-mini-app/-/welcomeme-mini-app-0.30.3.tgz", + "integrity": "sha512-+11ew8A3ITZO8CFcSnot7+8Csn6nhYTSgVjWiMtRg2qEabRKfw28bLMAkKgla0FfiIneHYRzxYOOAgvQ+WlrQA==" }, "@walmart/wfm-ui": { "version": "0.1.50", --- package.json @@ -99,7 +99,7 @@ "@walmart/shelfavailability-mini-app": "0.3.89", "@walmart/time-clock-mini-app": "0.4.10", "@walmart/ui-components": "1.1.57", - "@walmart/welcomeme-mini-app": "0.30.2", + "@walmart/welcomeme-mini-app": "0.30.3", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0",
version bump
version bump
d5c9de368b77c2eeaee8cee31bf9b222066c307c
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/myteam-mini-app", - "version": "1.10.0", + "version": "1.10.0-alpha.1", "main": "dist/index.js", "files": [ "dist" @@ -97,9 +97,9 @@ "@walmart/react-native-shared-navigation": "6.1.4", "@walmart/react-native-sumo-sdk": "2.6.0", "@walmart/redux-store": "3.7.0", - "@walmart/roster-mini-app": "2.8.2", + "@walmart/roster-mini-app": "2.8.3-alpha.1", "@walmart/ui-components": "1.15.1", - "@walmart/wmconnect-mini-app": "2.5.4", + "@walmart/wmconnect-mini-app": "2.5.4-alpha.1", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", --- yarn.lock @@ -6276,9 +6276,9 @@ __metadata: "@walmart/react-native-shared-navigation": "npm:6.1.4" "@walmart/react-native-sumo-sdk": "npm:2.6.0" "@walmart/redux-store": "npm:3.7.0" - "@walmart/roster-mini-app": "npm:2.8.2" + "@walmart/roster-mini-app": "npm:2.8.3-alpha.1" "@walmart/ui-components": "npm:1.15.1" - "@walmart/wmconnect-mini-app": "npm:2.5.4" + "@walmart/wmconnect-mini-app": "npm:2.5.4-alpha.1" babel-jest: "npm:^29.2.1" chance: "npm:^1.1.11" eslint: "npm:8.22.0" @@ -6458,9 +6458,9 @@ __metadata: languageName: node linkType: hard -"@walmart/roster-mini-app@npm:2.8.2": - version: 2.8.2 - resolution: "@walmart/roster-mini-app@npm:2.8.2" +"@walmart/roster-mini-app@npm:2.8.3-alpha.1": + version: 2.8.3-alpha.1 + resolution: "@walmart/roster-mini-app@npm:2.8.3-alpha.1" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6502,7 +6502,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/3a787b4eff1d373d1558eb8c274aa87dd67d65a3a6f830f74981e4b4b6d560119308f3b1a0e8843a212c20f06525d59663afdca3f2d9034a3a14e34688e01553 + checksum: 10c0/38202cd1811370dab7a63a4088f3eba61d811917d72ce585bf23508d45b8792c782d0d19407fd2864527d6270a108b82409940629885846f774fec005a6e183d languageName: node linkType: hard @@ -6526,9 +6526,9 @@ __metadata: languageName: node linkType: hard -"@walmart/wmconnect-mini-app@npm:2.5.4": - version: 2.5.4 - resolution: "@walmart/wmconnect-mini-app@npm:2.5.4" +"@walmart/wmconnect-mini-app@npm:2.5.4-alpha.1": + version: 2.5.4-alpha.1 + resolution: "@walmart/wmconnect-mini-app@npm:2.5.4-alpha.1" peerDependencies: "@react-native-async-storage/async-storage": ^1.21.0 "@react-native-community/netinfo": ^11.0.1 @@ -6568,7 +6568,7 @@ __metadata: redux: ^4.2.1 redux-saga: ^1.2.3 wifi-store-locator: 1.4.1 - checksum: 10c0/7442a7563e90f10f0caff7d6b1e81c5801433abcd99ab69d0e84405bbb6c3ae3cc517333789abe61765aa6dddc231ce94dce03a9688f5f0c14c700a1e103a0c4 + checksum: 10c0/553b7fa558c761c6498e42517aee029ae427d82e6b317c0289e856f1bddf61193d9569bca456cc1a0ff7e15cd4178fc61325764d8b7d6d405aab46eb43ae2199 languageName: node linkType: hard
feat(ui): version change for testing
feat(ui): version change for testing
2344fdbe51ee8235d83bf769cd1bc86fcca7f993
--- package-lock.json @@ -3187,9 +3187,9 @@ "integrity": "sha512-4VL2h7BKEZNP+QtIaYbQXJ6kpxZdeeCqTA3PvP1L933vlNsilF3y5RO9lCyMsTjWQ+AJ3Ww6gqC/oNDxjTvtGw==" }, "@walmart/time-clock-mini-app": { - "version": "0.2.5", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.2.5.tgz", - "integrity": "sha512-q41j8xmcU8qTFFXcytqzOQclSku6dPETx69xJYtj5Hv7mN6+mPFZTnBbnWvH7MnOGGeXDPJ3fyf/8WhN8Owy1w==", + "version": "0.3.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.3.0.tgz", + "integrity": "sha512-SCq8K+isIKq6w3got6oaAmmhStcbt5PNMpiSqEfEwb3BhvAJz5yH7LjdnhGoPnCCv0QbEB18eri4SO7m3oFENQ==", "requires": { "@react-native-community/datetimepicker": "3.0.9", "javascript-time-ago": "^2.3.4", @@ -3199,9 +3199,9 @@ }, "dependencies": { "javascript-time-ago": { - "version": "2.3.5", - "resolved": "https://npme.walmart.com/javascript-time-ago/-/javascript-time-ago-2.3.5.tgz", - "integrity": "sha512-e1/cNro8WnheBWc6PTN5zYqZUmtu96AmH7xjAYkBL1TN8C8lJm0PDvt4g5DlYwkMlRWyzD++xoPS3ldmV6Aj8A==", + "version": "2.3.6", + "resolved": "https://npme.walmart.com/javascript-time-ago/-/javascript-time-ago-2.3.6.tgz", + "integrity": "sha512-OZLtmx+o+LyfLLi7oKsz7taNCx2uguf1qsdN3KCYDe89L7D1OT1BcR/E0HgK5EYqvXxpPEl0oiuypFC7ugyeJA==", "requires": { "relative-time-format": "^1.0.5" } --- package.json @@ -81,7 +81,7 @@ "@walmart/redux-store": "^1.0.12", "@walmart/schedule-mini-app": "0.2.74", "@walmart/settings-mini-app": "1.2.3", - "@walmart/time-clock-mini-app": "0.2.5", + "@walmart/time-clock-mini-app": "0.3.0", "@walmart/ui-components": "1.1.14", "@walmart/welcomeme-mini-app": "0.5.27", "@walmart/wfm-ui": "^0.1.50",
Added Haptic Feedback when sending punches
Added Haptic Feedback when sending punches
3a97e971fa1b3ae513d46aebb417f583180a668f
--- package.json @@ -145,7 +145,7 @@ "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.7", "@walmart/taskit-mini-app": "2.81.15", - "@walmart/time-clock-mini-app": "2.353.0", + "@walmart/time-clock-mini-app": "2.397.0", "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch", "@walmart/welcomeme-mini-app": "0.90.3", --- yarn.lock @@ -7146,9 +7146,9 @@ __metadata: languageName: node linkType: hard -"@walmart/time-clock-mini-app@npm:2.353.0": - version: 2.353.0 - resolution: "@walmart/time-clock-mini-app@npm:2.353.0" +"@walmart/time-clock-mini-app@npm:2.397.0": + version: 2.397.0 + resolution: "@walmart/time-clock-mini-app@npm:2.397.0" dependencies: "@react-navigation/elements": "npm:^1.3.1" moment-timezone: "npm:0.5.33" @@ -7191,7 +7191,7 @@ __metadata: uuid: ^3.3.2 wifi-store-locator: ^1.4.0 xdate: ^0.8.2 - checksum: 10c0/3d96ee8d13bdc00e61f39688bd80cc50eccaf9c63e8312f442833409e1fa95a8679c08b9532811172c07c62821651d44cecc0fa021f871980264ef8643ee3539 + checksum: 10c0/bcad3aab011899e56351f2709ef94c1fe616efed5f9b4fbb83a245cfaa08c34978a3c6994e99e6b7f66d765a39bd9e93f9fce8e186be89e5cab0292ace105d68 languageName: node linkType: hard @@ -7785,7 +7785,7 @@ __metadata: "@walmart/shelfavailability-mini-app": "npm:1.5.23" "@walmart/store-feature-orders": "npm:1.26.7" "@walmart/taskit-mini-app": "npm:2.81.15" - "@walmart/time-clock-mini-app": "npm:2.353.0" + "@walmart/time-clock-mini-app": "npm:2.397.0" "@walmart/topstock-mini-app": "patch:@walmart/topstock-mini-app@npm%3A1.9.7#~/.yarn/patches/@walmart-topstock-mini-app-npm-1.9.7-e6400c510e.patch" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.11#~/.yarn/patches/@walmart-ui-components-npm-1.15.11-19ccf914c5.patch" "@walmart/welcomeme-mini-app": "npm:0.90.3"
timeclock drop23 version bump
timeclock drop23 version bump
56ba698c785f7fb10753437dc213253f1923beae
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart", - "version": "1.25.11", + "version": "1.26.0", "private": true, "workspaces": [ "core", --- targets/US/android/app/build.gradle @@ -106,8 +106,8 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 937 - versionName "1.25.11" + versionCode 938 + versionName "1.26.0" } signingConfigs { debug { --- targets/US/ios/AllSpark/Info.plist @@ -19,7 +19,7 @@ <string>APPL</string> <key>CFBundleShortVersionString</key> <!-- @customization - default: <string>$(MARKETING_VERSION)</string> --> - <string>1.25.11</string> + <string>1.26.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> --- targets/US/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-us", - "version": "1.25.11", + "version": "1.26.0", "private": true, "scripts": { "android": "react-native run-android",
version bump to 1.26.0
version bump to 1.26.0
4105b276aebd3b874e41a8a541a8b9455248fab1
--- packages/allspark-authentication/src/Authentication.ts @@ -322,7 +322,6 @@ export class AllsparkAuthentication { public signOut = async () => { try { const authResult = await this._cachedResult.get(); - await this._cachedResult.remove(); if (!authResult) { throw NO_CACHE_ERROR; } @@ -331,7 +330,6 @@ export class AllsparkAuthentication { if (refreshToken) { const config = await this._cachedConfig.get(); - this._cachedConfig.remove(); if (!config) { throw NO_CACHE_ERROR; } @@ -342,10 +340,11 @@ export class AllsparkAuthentication { this._runInfoEvent('SIGN_OUT_SUCCESS'); } } catch (e) { - await this._cachedResult.remove(); - this._cachedConfig.remove(); this._runErrorEvent('SIGN_OUT_ERROR', e as AppAuthError); throw e; + } finally { + await this._cachedResult.remove(); + this._cachedConfig.remove(); } }; }
Revert "fix: clear auth localstorage immediately on signout"
Revert "fix: clear auth localstorage immediately on signout"
84013ddf6dc9a1b7dbbfb41241060a7691ae24a7
--- graphql.yml @@ -94,7 +94,7 @@ applications: tags: - 'v1' - name: 'getLoggedInUser' - hash: 'f7a857e71616f58af3437976992e1937c9f5300e0058050f44721a555344f73c' + hash: '0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd' queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql' tags: - 'v1' @@ -118,3 +118,50 @@ applications: queryTemplate: 'packages/me-at-walmart-athena-queries/src/updateManagerExperiencePreference.graphql' tags: - 'v1' + - name: 'prod' + persistedQueries: + - name: 'businessUnitByCountryAndNumber' + hash: 'f47967b84a2c8ea52dceb45d4650a9cd62ad19a6b545cb63288b3acd085a4194' + queryTemplate: 'packages/me-at-walmart-athena-queries/src/businessUnitByCountryAndNumber.graphql' + tags: + - 'v1' + - name: 'getAssociateById' + hash: '0a06f624828f31fa5f8a13615385e1c3c4424732132e432655f4a45962a7fa22' + queryTemplate: 'packages/me-at-walmart-athena-queries/src/getAssociateById.graphql' + tags: + - 'v1' + # - name: "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' + tags: + - 'v1' + - name: 'getLoggedInUser' + hash: '0beb54411dbf4e0c72d8d94982d755e0559023bc5e2c174e356b42f1e07b22fd' + queryTemplate: 'packages/me-at-walmart-athena-queries/src/getLoggedInUser.graphql' + tags: + - 'v1' + - name: 'getTeamByIdHome' + hash: '6b4b876250309d85dd51831ace4595bd1764b3d41ef7fd65c08df03b4c4982e0' + 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: '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"
fix: remove unwanted queries in graphql
fix: remove unwanted queries in graphql
5f01770e3ddbbdd211089d88f558e77ceab2e08c
--- package-lock.json @@ -60,7 +60,7 @@ "@walmart/impersonation-mini-app": "1.20.2", "@walmart/ims-print-services-ui": "2.5.8", "@walmart/inbox-mini-app": "0.86.1", - "@walmart/iteminfo-mini-app": "7.5.6", + "@walmart/iteminfo-mini-app": "7.5.7", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "13.0.3", "@walmart/metrics-mini-app": "0.13.11", @@ -8503,9 +8503,9 @@ } }, "node_modules/@walmart/iteminfo-mini-app": { - "version": "7.5.6", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.6.tgz", - "integrity": "sha512-eG3ehoAeX/5MHz76s17dCCnT2M3v7exljWX5/9L5elHS2DbOES+aatYaT5akGzJH+WanottPe4J5Kp2jZWk3Vw==", + "version": "7.5.7", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.7.tgz", + "integrity": "sha512-6asyomG0Cm2KBy3obVfoeFQx5f53eNXQ1StfnJuxTL7PdAqFtA0ddMMIdjgew8CW1/eLSF6SlgAX5xJBshIfXQ==", "peerDependencies": { "@react-native-community/netinfo": ">=9.3.6", "@react-native-firebase/analytics": ">=15.1.1", @@ -33667,9 +33667,9 @@ } }, "@walmart/iteminfo-mini-app": { - "version": "7.5.6", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.6.tgz", - "integrity": "sha512-eG3ehoAeX/5MHz76s17dCCnT2M3v7exljWX5/9L5elHS2DbOES+aatYaT5akGzJH+WanottPe4J5Kp2jZWk3Vw==" + "version": "7.5.7", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.7.tgz", + "integrity": "sha512-6asyomG0Cm2KBy3obVfoeFQx5f53eNXQ1StfnJuxTL7PdAqFtA0ddMMIdjgew8CW1/eLSF6SlgAX5xJBshIfXQ==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.4" --- package.json @@ -101,7 +101,7 @@ "@walmart/impersonation-mini-app": "1.20.2", "@walmart/ims-print-services-ui": "2.5.8", "@walmart/inbox-mini-app": "0.86.1", - "@walmart/iteminfo-mini-app": "7.5.6", + "@walmart/iteminfo-mini-app": "7.5.7", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "13.0.3", "@walmart/metrics-mini-app": "0.13.11",
bump tp iteminfo version for a bug fix
bump tp iteminfo version for a bug fix
64f49f97e7eef286bf2b53801f0c3e99c8b2aa2a
--- packages/expo-config-plugins/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. +## [0.5.1](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/expo-config-plugins@0.5.0...@walmart/expo-config-plugins@0.5.1) (2025-08-21) + +### Bug Fixes + +- **plugin:** allspark-6773 fixed appauth plugin ([#360](https://gecgithub01.walmart.com/allspark/allspark/issues/360)) ([ac6147f](https://gecgithub01.walmart.com/allspark/allspark/commit/ac6147f12972fd5dcdd4821754e29ef26cb198b7)) + # [0.5.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/expo-config-plugins@0.4.5...@walmart/expo-config-plugins@0.5.0) (2025-08-13) ### Features --- packages/expo-config-plugins/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/expo-config-plugins", - "version": "0.5.0", + "version": "0.5.1", "description": "Expo config plugins for me@apps", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version - @walmart/expo-config-plugins@0.5.1
ce1fadcaa6cbf7fc319633746b44317619857bce
--- __tests__/__mocks__/data/allTeamsScreen.ts @@ -1,4 +1,4 @@ -import {Section} from '../../../src/managerExperience/components/AllTeamsList/types'; +import {Section} from '../../../src/managerExperience/screens/AllTeamsScreen/types'; export const allTeamsSections: Section[] = [ { --- __tests__/managerExperience/AllTeamsList.test.tsx @@ -1,11 +1,11 @@ import React from 'react'; -import {AllTeamsList} from '../../src/managerExperience/components/AllTeamsList'; +import {AllTeamsScreen} from '../../src/managerExperience/screens/AllTeamsScreen'; import {fireEvent} from '@testing-library/react-native'; import {renderWithProviders} from '../harness'; -import {allTeamsSections} from '../__mocks__/data/allTeamsList'; -import {AllTeamsListProps} from '../../src/managerExperience/components/AllTeamsList/types'; +import {allTeamsSections} from '../__mocks__/data/allTeamsScreen'; +import {AllTeamsScreenProps} from '../../src/managerExperience/screens/AllTeamsScreen/types'; -const defaultProps: AllTeamsListProps = { +const defaultProps: AllTeamsScreenProps = { isLoading: false, primaryTeam: 'Apparel', sections: allTeamsSections, @@ -13,15 +13,15 @@ const defaultProps: AllTeamsListProps = { handleNavigation: jest.fn(), }; -describe('AllTeamsList', () => { +describe('AllTeamsScreen', () => { it('matches snapshot', () => { - const {toJSON} = renderWithProviders(<AllTeamsList {...defaultProps} />); + const {toJSON} = renderWithProviders(<AllTeamsScreen {...defaultProps} />); expect(toJSON()).toMatchSnapshot(); }); it('renders a sub list for each section', () => { const {getAllByTestId} = renderWithProviders( - <AllTeamsList {...defaultProps} />, + <AllTeamsScreen {...defaultProps} />, ); const sections = getAllByTestId('all-teams-list-section'); expect(sections.length).toEqual(defaultProps.sections.length); @@ -29,7 +29,7 @@ describe('AllTeamsList', () => { it('calls handleNavigation when function when list item is pressed', () => { const {getAllByRole} = renderWithProviders( - <AllTeamsList {...defaultProps} />, + <AllTeamsScreen {...defaultProps} />, ); const navArrows = getAllByRole('button'); navArrows.forEach((arrow) => { --- __tests__/managerExperience/__snapshots__/AllTeamsList.test.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`AllTeamsList matches snapshot 1`] = ` +exports[`AllTeamsScreen matches snapshot 1`] = ` <View style={ { --- src/managerExperience/components/AllTeamsList/index.ts @@ -1 +0,0 @@ -export {AllTeamsList} from './AllTeamsList'; --- src/managerExperience/screens/AllTeamsScreen.tsx @@ -1,3 +0,0 @@ -import React from 'react'; - -export const AllTeamsScreen = () => <div>All Teams Screen</div>; --- src/managerExperience/screens/AllTeamsScreen/AllTeamsScreen.tsx @@ -5,18 +5,18 @@ import {StackNavigationProp} from '@react-navigation/stack'; import {ROSTER_I18N_NAMESPACE} from '../../../translations'; import {View, SectionList, Text} from 'react-native'; import {TeamListItem} from '@walmart/allspark-foundation/Components/TeamListItem'; -import {allTeamsListStyles as styles} from './styles'; -import {AllTeamsListProps} from './types'; +import {AllTeamsScreenStyles as styles} from './styles'; +import {AllTeamsScreenProps} from './types'; import {TextingNavParamsMap} from '../../../navigation'; import {useDailyRoster} from '../../../hooks'; -export const AllTeamsList = ({ +export const AllTeamsScreen = ({ isLoading, primaryTeam, sections, totalClockedInAssociates, handleNavigation, -}: AllTeamsListProps) => { +}: AllTeamsScreenProps) => { const {t} = useTranslation([ROSTER_I18N_NAMESPACE]); const navigation = useNavigation<StackNavigationProp<TextingNavParamsMap>>(); const associateData = useDailyRoster(); --- src/managerExperience/screens/AllTeamsScreen/index.ts @@ -0,0 +1 @@ +export {AllTeamsScreen} from './AllTeamsScreen'; --- src/managerExperience/screens/AllTeamsScreen/styles.tsx @@ -1,7 +1,7 @@ import {Dimensions, StyleSheet} from 'react-native'; import {colors} from '@walmart/gtp-shared-components'; -export const allTeamsListStyles = StyleSheet.create({ +export const AllTeamsScreenStyles = StyleSheet.create({ separator: { backgroundColor: colors.gray['5'], height: 8, --- src/managerExperience/screens/AllTeamsScreen/types.tsx @@ -9,7 +9,7 @@ export type Section = { isPrimaryArea: boolean; }; -export interface AllTeamsListProps { +export interface AllTeamsScreenProps { isLoading: boolean; primaryTeam: string; sections: Section[];
feat: moved team list component to screen folder
feat: moved team list component to screen folder
531120e74494009f93acc323cc13e9c729fce0ee
--- packages/allspark-foundation/__tests__/GraphQL/links.test.ts @@ -0,0 +1,98 @@ +import { PersistedQueryLink, AllsparkHttpLink, DynamicLink } from '../../src/GraphQL/links'; +import { ApolloLink, FetchResult } from '@apollo/client'; +import { Operation, NextLink } from '@apollo/client'; +import { Observable } from '@apollo/client/utilities'; +import { DocumentNode } from 'graphql'; +import { AllsparkHttpClient } from '../../src/HTTP' + + +jest.mock('../../src/HTTP', () => ({ + AllsparkHttpClient: { + fetch: jest.fn(), + getFeatureClient: jest.fn(), + }, +})); +describe('GraphQL Links', () => { + let persistedQueryLink: PersistedQueryLink; + let allsparkHttpLink: AllsparkHttpLink; + let dynamicLink: DynamicLink; + let anotherLink: ApolloLink; +// let forward: NextLink; + let operation: Operation; + let forward: jest.MockedFunction<NextLink>; + + beforeEach(() => { + persistedQueryLink = new PersistedQueryLink(); + allsparkHttpLink = new AllsparkHttpLink({ uri: 'http://example.com' }); + dynamicLink = new DynamicLink(); + anotherLink = new ApolloLink((operation, forward) => forward(operation)); + forward = jest.fn(); + operation = { + query: {} as DocumentNode, + variables: {}, + operationName: 'TestOperation', + extensions: {}, + setContext: jest.fn(), + getContext: jest.fn(() => ({ featureId: 'mockFeatureId' })), + }; + forward = jest.fn().mockImplementation((op: Operation) => { + return new Observable<FetchResult>(subscriber => { + subscriber.next({ data: 'mockData' }); + subscriber.complete(); + }); + }); + (allsparkHttpLink as any)._getLinkForFeatureId = jest.fn().mockReturnValue({ + request: jest.fn().mockReturnValue(new Observable<FetchResult>(subscriber => { + subscriber.next({ data: 'mockDataFromLink' }); + subscriber.complete(); + })), + }); + (AllsparkHttpClient.getFeatureClient as jest.Mock).mockReturnValue({ + fetch: jest.fn(), + }); + }); + it('forward the request when PersistedQueryLink is enabled', () => { + const operation: Operation = {} as any; + const requestSpy = jest.spyOn(persistedQueryLink['_baseLink'], 'request'); + persistedQueryLink.request(operation, forward); + expect(requestSpy).toHaveBeenCalledWith(operation, forward); + }); + it('not forward the request when PersistedQueryLink is disabled', () => { + persistedQueryLink.disable(); + const operation: Operation = {} as any; + persistedQueryLink.request(operation, forward); + expect(forward).toHaveBeenCalledWith(operation); + }); + it('enable and disable PersistedQueryLink correctly', () => { + persistedQueryLink.disable(); + expect(persistedQueryLink.enabled).toBe(false); + persistedQueryLink.enable(); + expect(persistedQueryLink.enabled).toBe(true); + }); + it('update options with setOptions in AllsparkHttpLink', () => { + allsparkHttpLink.setOptions({ uri: 'http://new-url.com' }); + expect(allsparkHttpLink.options.uri).toBe('http://new-url.com'); + }); + it('return an observable from the forward function if provided', done => { + const result = allsparkHttpLink.request(operation, forward); + result?.subscribe({ + next: response => { + expect(response).toEqual({ data: 'mockDataFromLink' }); + done(); + } + }); + }); + it('add a single link correctly in DynamicLink', () => { + dynamicLink.addLink(anotherLink); + const operation: Operation = {} as any; + dynamicLink.request(operation, forward); + expect(forward).toHaveBeenCalledWith(operation); + }); + it('add multiple links correctly in DynamicLink', () => { + dynamicLink.addLinks([anotherLink, anotherLink]); + const operation: Operation = {} as any; + dynamicLink.request(operation, forward); + expect(forward).toHaveBeenCalledWith(operation); + }); +}); +
links for graphql
links for graphql
e5813c135373f974062b200b678be3e41f94745e
--- core/src/features/feedback.ts @@ -118,9 +118,12 @@ export const FeedbackFeature = new AllsparkFeatureModule('feedback', { initFeedback, } = require('@walmart/feedback-all-spark-miniapp'); + // @TODO - Feedback should completey handle its own initialization on connect. + // This should be recalled on site change with the relevant product id. initFeedback({ productId: - AllsparkEnvironment.getCurrent<IMeAtWalmartEnvironment>().productId, + AllsparkEnvironment.getCurrent<IMeAtWalmartEnvironment>() + .productIdAssociate, }); // Add survey says card to the home dashboard --- packages/me-at-walmart-common/src/environment.ts @@ -47,6 +47,9 @@ export type IMeAtWalmartEnvironment = { rbacAppId: string; rmaMegaNavId: string; productId: string; + productIdAssociate: string; + productIdCandidate: string; + productIdSupplyChain: string; // Handle deprecated or legacy env variables, can remove once we're comfortable with stricter typing [key: string]: any; --- packages/me-at-walmart-container/src/environment/env.beta.ts @@ -56,7 +56,11 @@ const config: IMeAtWalmartEnvironment = { }, rbacAppId: '55fa784a-f748-4fe3-91a8-4019e102772c', rmaMegaNavId: '12068058-e50c-4714-80f2-577ed0b33018', + productId: '64628ad5-2b54-4e03-9ce3-6f96dcbb8e33', + productIdAssociate: 'ca2af43b-c980-41de-a9d3-4af99041b32e', + productIdCandidate: '64628ad5-2b54-4e03-9ce3-6f96dcbb8e33', + productIdSupplyChain: 'a0c49b26-beec-4225-9797-2c948e20f07f', // DEPRECATED consumerId: '364a55bb-7f04-4a7c-a800-1d91c08fe5f2', --- packages/me-at-walmart-container/src/environment/env.dev.ts @@ -58,7 +58,11 @@ const config: IMeAtWalmartEnvironment = { }, rbacAppId: 'ec9f5c40-88be-4e90-8807-a4f15f11e84c', rmaMegaNavId: '01d285d7-6ec4-45e1-96a5-74365d3b8a6d', + productId: 'd350b7ae-a262-4d77-98a6-7a74fd55b45b', + productIdAssociate: 'ca2af43b-c980-41de-a9d3-4af99041b32e', + productIdCandidate: 'd350b7ae-a262-4d77-98a6-7a74fd55b45b', + productIdSupplyChain: 'a0c49b26-beec-4225-9797-2c948e20f07f', // DEPRECATED consumerId: 'b5fc6fe0-5927-44a6-a693-6e922e830b04', --- packages/me-at-walmart-container/src/environment/env.prod.ts @@ -56,7 +56,11 @@ const config: IMeAtWalmartEnvironment = { }, rbacAppId: '55fa784a-f748-4fe3-91a8-4019e102772c', rmaMegaNavId: '12068058-e50c-4714-80f2-577ed0b33018', + productId: '64628ad5-2b54-4e03-9ce3-6f96dcbb8e33', + productIdAssociate: 'ca2af43b-c980-41de-a9d3-4af99041b32e', + productIdCandidate: '64628ad5-2b54-4e03-9ce3-6f96dcbb8e33', + productIdSupplyChain: 'a0c49b26-beec-4225-9797-2c948e20f07f', // DEPRECATED consumerId: '364a55bb-7f04-4a7c-a800-1d91c08fe5f2', --- packages/me-at-walmart-container/src/environment/env.teflon.ts @@ -56,7 +56,11 @@ const config: IMeAtWalmartEnvironment = { }, rbacAppId: 'ec9f5c40-88be-4e90-8807-a4f15f11e84c', rmaMegaNavId: '01d285d7-6ec4-45e1-96a5-74365d3b8a6d', + productId: 'd350b7ae-a262-4d77-98a6-7a74fd55b45b', + productIdAssociate: 'ca2af43b-c980-41de-a9d3-4af99041b32e', + productIdCandidate: 'd350b7ae-a262-4d77-98a6-7a74fd55b45b', + productIdSupplyChain: 'a0c49b26-beec-4225-9797-2c948e20f07f', // DEPRECATED consumerId: 'b5fc6fe0-5927-44a6-a693-6e922e830b04',
fix: feedback initialized with incorrect product id for associate flow
fix: feedback initialized with incorrect product id for associate flow
a458173fcd1a1e197453dff18ed4166ef3aa0113
--- src/screens/SearchScreen.tsx @@ -72,7 +72,9 @@ export const SearchField: React.FC<SearchFieldProps> = ({navigation}) => { color: Colors.white, }; - const onClose = noop; + const onClose = () => { + navigation.goBack(); + }; const [searchInput, setSearchInput] = useState(''); --- src/screens/SearchScreen.tsx @@ -72,7 +72,9 @@ export const SearchField: React.FC<SearchFieldProps> = ({navigation}) => { color: Colors.white, }; - const onClose = noop; + const onClose = () => { + navigation.goBack(); + }; const [searchInput, setSearchInput] = useState('');
get the cancel button working for search screen
get the cancel button working for search screen
579c0c21d8307ff66bf7ad8abce442fc0e6a831b
--- example/ios/Podfile.lock @@ -1698,4 +1698,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 9bcb4ba63e465bf176432abd9b231eff81ba3324 -COCOAPODS: 1.13.0 +COCOAPODS: 1.14.3
feat: corrected cocoapods version
feat: corrected cocoapods version
e74ddb9a90a5d1227575f222492dc33fee582a1f
--- .looper.multibranch.yml @@ -648,7 +648,6 @@ flows: - if: '%{ !(market == "US" || market == "INTL") }' # Set Default market value if not provided from selected options then: - var(market="US") - - (name Just to Check Market) echo ${IOS_BASE_PATH} - switch(${os_type}): case(ios): - switch(${env_selected}): @@ -756,7 +755,7 @@ flows: mini-pr: - (name Branch Check, silent) echo "TBD" - call: build-npm - - (name Build JS Bundle)./node_modules/.bin/react-native bundle --entry-file ./targets/${market}/index.js --bundle-output ./targets/${market}/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):
Update .looper.multibranch.yml
Update .looper.multibranch.yml
59d45b61041ba42e3a7927bf793d40190fe59c28
--- src/components/RosterFiltersAndInfo/RosterFiltersAndInfo.tsx @@ -47,7 +47,7 @@ export const RosterFiltersAndInfo = ({ const viewWeeklySchedule = () => { goToWeeklySchedule( associateWINs, - teamName === 'myTeams' ? t('myTeams') : teamName, + teamName === 'myTeams' ? t('myTeams.title') : teamName, ); };
fix: my Teams schedule page title
fix: my Teams schedule page title
4041720d004f2db8426f2195dc58954c8df07aa4
--- core/__tests__/__mocks__/@walmart/allspark-foundation/Navigation.js @@ -15,5 +15,7 @@ module.exports = { Screen: 'Screen', Group: 'Group', })), + disable: jest.fn(), + enable: jest.fn(), }, }; --- core/__tests__/rbac/RbacSagasTest.tsx @@ -102,7 +102,7 @@ describe('onRbacRequest', () => { iterator.next({rmaMegaNavId: '01d285d7-6ec4-45e1-96a5-74365d3b8a6d'}) .value, ).toEqual(call(waitForNavConfigFetch)); - expect(iterator.next(null).done).toEqual(true); + expect(iterator.next(null).done).toEqual(false); }); it('success case', () => {
fix old test failing
fix old test failing
995bb8d08f5205e2f2696c48d23313027625fd7c
--- package-lock.json @@ -73,7 +73,7 @@ "@walmart/money-auth-shared-components": "0.1.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.15.2", - "@walmart/payrollsolution_miniapp": "0.138.3", + "@walmart/payrollsolution_miniapp": "0.138.4", "@walmart/price-changes-mini-app": "1.10.3", "@walmart/profile-feature-app": "1.138.2", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -9507,9 +9507,9 @@ } }, "node_modules/@walmart/payrollsolution_miniapp": { - "version": "0.138.3", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.3.tgz", - "integrity": "sha512-z4FHseHWpZKOTzMiSTyBX+A9yl+0BL+YYDHIsOwzcwK1rgYtpmzk3UP2cVHrf9FpETUWNToy+NQCHm0sO+WLlA==", + "version": "0.138.4", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.4.tgz", + "integrity": "sha512-WcRGvQn7mIyyLBUJfOSzjLyYC4I/csxt7bRnVOWj06g1enI3ImdmiiSpwMVA6XkYR+yvUauaaYYhu4AMI5xM5Q==", "hasInstallScript": true, "dependencies": { "crypto-js": "^3.3.0", @@ -33536,9 +33536,9 @@ } }, "@walmart/payrollsolution_miniapp": { - "version": "0.138.3", - "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.3.tgz", - "integrity": "sha512-z4FHseHWpZKOTzMiSTyBX+A9yl+0BL+YYDHIsOwzcwK1rgYtpmzk3UP2cVHrf9FpETUWNToy+NQCHm0sO+WLlA==", + "version": "0.138.4", + "resolved": "https://npme.walmart.com/@walmart/payrollsolution_miniapp/-/payrollsolution_miniapp-0.138.4.tgz", + "integrity": "sha512-WcRGvQn7mIyyLBUJfOSzjLyYC4I/csxt7bRnVOWj06g1enI3ImdmiiSpwMVA6XkYR+yvUauaaYYhu4AMI5xM5Q==", "requires": { "crypto-js": "^3.3.0", "expo-sharing": "~11.5.0" --- package.json @@ -114,7 +114,7 @@ "@walmart/money-auth-shared-components": "0.1.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.15.2", - "@walmart/payrollsolution_miniapp": "0.138.3", + "@walmart/payrollsolution_miniapp": "0.138.4", "@walmart/price-changes-mini-app": "1.10.3", "@walmart/profile-feature-app": "1.138.2", "@walmart/react-native-encrypted-storage": "1.1.3",
bump version
bump version
bffd23d67be2d2b8e322f54e0ca8def8a4833188
--- src/components/RosterFiltersAndInfo/RosterFiltersAndInfo.tsx @@ -63,7 +63,8 @@ export const RosterFiltersAndInfo = ({ /> </View> {isWeeklyScheduleVisible && - (!siteIsDC || (siteIsDC && isSalariedOrLead)) && ( + (!siteIsDC || (siteIsDC && isSalariedOrLead)) && + teamName !== 'My team' && ( <Link onPress={viewWeeklySchedule} disabled={!associateWINs.length}
fix: remove weeklySchedule from MyTeams tab
fix: remove weeklySchedule from MyTeams tab
a193a0a11fc086d9a7aa832313969dac87cb30f0
--- __tests__/navigation/utils.test.ts @@ -19,7 +19,14 @@ describe('Navigation Utils', () => { }); it('calls goToIndividualSchedule with params', () => { - goToIndividualSchedule('00900900', '100', 'testDisplayName', 'H', '12345', 'US'); + goToIndividualSchedule( + '00900900', + '100', + 'testDisplayName', + 'H', + 12345, + 'US', + ); expect(navigate).toBeCalledWith('scheduleScreen', { params: { userInfo: {
fixing tests
fixing tests
a7f24a7686a97c15745feeeee04f1d38059d143f
--- package.json @@ -127,7 +127,7 @@ "@walmart/inbox-mini-app": "0.105.3", "@walmart/invue-react-native-sdk": "0.1.26-alpha.14", "@walmart/iteminfo-mini-app": "8.8.11", - "@walmart/learning-mini-app": "20.0.88", + "@walmart/learning-mini-app": "21.0.0", "@walmart/manager-approvals-miniapp": "0.5.4", "@walmart/me-at-walmart-athena-queries": "6.37.0", "@walmart/me-at-walmart-common": "workspace:^", --- src/manifest.ts @@ -118,8 +118,9 @@ export const getAssociateFeatures = (): AllsparkFeatureModule[] => { require('@walmart/shop-gnfr-mini-app').default, require('@walmart/profile-feature-app').UPV2FeatureModule, require('@walmart/backroom-mini-app').default, + require('@walmart/beneficiary-online-mini-app').default, require('@walmart/ims-print-services-ui').default, - require('@walmart/beneficiary-online-mini-app').default + require('@walmart/learning-mini-app').default ); } --- src/navigation/USHallway/AssociateHallwayNav/MainStackNav.tsx @@ -31,7 +31,7 @@ import { import {SupportPayNav} from '@walmart/attendance-mini-app'; import InboxFeature from '@walmart/inbox-mini-app'; import ItemInfoFeature from '@walmart/iteminfo-mini-app'; -import FieldLearningApp from '@walmart/learning-mini-app'; +import LearningFeature from '@walmart/learning-mini-app'; import ManagerApprovalsFeature from '@walmart/manager-approvals-miniapp'; import MetricsFeature from '@walmart/metrics-mini-app'; import ModFlexFeature from '@walmart/mod-flex-mini-app'; @@ -322,7 +322,7 @@ export const MainStackNav = () => { Navigator: MainStack, })} - {FieldLearningApp.buildAllScreens({ + {LearningFeature.buildAllScreens({ Navigator: MainStack as any, })} --- yarn.lock @@ -8238,77 +8238,23 @@ __metadata: languageName: node linkType: hard -"@walmart/learning-mini-app@npm:20.0.88": - version: 20.0.88 - resolution: "@walmart/learning-mini-app@npm:20.0.88::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Flearning-mini-app%2F-%2F%40walmart%2Flearning-mini-app-20.0.88.tgz" - peerDependencies: - "@react-native-firebase/analytics": 17.4.2 - "@react-native-firebase/app": 17.4.2 - "@react-native-firebase/crashlytics": 17.4.2 - "@react-native-firebase/perf": 17.4.2 - "@react-navigation/bottom-tabs": ^6.2.0 - "@react-navigation/drawer": ^6.6.4 - "@react-navigation/elements": ^1.2.1 - "@react-navigation/native": ^6.0.8 - "@react-navigation/stack": ">=6" - "@types/graphql": ^14.5.0 - "@walmart/allspark-utils": ^1.5.2 - "@walmart/config-components": ">=4.11.3" - "@walmart/core-services-allspark": 6.25.1 - "@walmart/core-services-me-at-homeoffice": 1.1.1 - "@walmart/gtp-shared-components": 2.2.1-rc.0 - "@walmart/homeoffice-impersonation-app": 0.0.23 - "@walmart/impersonation-mini-app": 1.20.8 - "@walmart/react-native-encrypted-storage": 1.1.3 - "@walmart/react-native-logger": 1.34.8 - "@walmart/react-native-scanner-3.0": 0.4.2 - "@walmart/react-native-sumo-sdk": ^2.7.2 - "@walmart/time-clock-mini-app": ">=3.4.0" - "@walmart/ui-components": 1.25.2 - "@walmart/wfm-ui": 0.8.x - base-64: ^1.0.0 - expo: ~50.0.21 - expo-image: ~1.10.6 - expo-sharing: ~11.10.0 - graphql: ^16.1.0 - i18next: ^21.6.3 - javascript-time-ago: ^2.3.4 - jest-sonar: ^0.2.12 - msw: ^0.38.1 - namecase: ^1.1.2 - react: 18.2.0 - react-error-boundary: ^3.1.4 - react-i18next: ^11.15.1 - react-native: 0.73.7 - react-native-app-auth: ^6.4.3 - react-native-background-timer: ^2.4.1 - react-native-exception-handler: ^2.10.10 - react-native-flipper: 0.212.0 - react-native-gesture-handler: ^2.14.0 - react-native-get-random-values: ^1.7.0 - react-native-modal: ^13.0.0 - react-native-pager-view: ^5.4.9 - react-native-permissions: ^3.10.1 - react-native-safe-area-context: ^4.8.2 - react-native-screens: ^3.28.0 - react-native-sha256: ^1.4.10 - react-native-svg: ^14.0.0 - react-native-svg-transformer: ^1.3.0 - react-native-tab-view: ^3.1.1 - react-native-vector-icons: ^7.0.0 - react-native-webview: ^13.6.1 - react-native-webview-invoke: ^0.6.2 - react-native-wm-notification: ^2.0.1 - react-native-wm-telemetry: ^0.3.0 - redux: ^4.2.1 - redux-devtools-extension: ^2.13.8 - redux-flipper: ^2.0.2 - redux-saga: ^1.1.3 - redux-thunk: ^2.4.0 - reduxsauce: ^1.2.0 - reselect: ^4.0.0 - wifi-store-locator: ^1.0.0-alpha2 - checksum: 10c0/3647306b4fe5d081c51f25aa4f3f8c6aa05836ddae8aca772b7c717f75add8a5ff931ff5ee590dd929a47ea0f5e3084f87d4fa2ecfb7176711838bfc1d755013 +"@walmart/learning-mini-app@npm:21.0.0": + version: 21.0.0 + resolution: "@walmart/learning-mini-app@npm:21.0.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Flearning-mini-app%2F-%2F%40walmart%2Flearning-mini-app-21.0.0.tgz" + peerDependencies: + "@shopify/flash-list": "*" + "@walmart/allspark-foundation": ">=6.32.0" + "@walmart/allspark-foundation-hub": "*" + "@walmart/gtp-shared-components-3": "*" + expo: 52.x + expo-image: "*" + react: "*" + react-dom: 18.x + react-native: "*" + react-native-safe-area-context: "*" + react-native-svg: "*" + react-native-web: "*" + checksum: 10c0/22cb6199d33b43de822bb9dfa1426b1aafeab7730d0972d018682c5b0a36360002dafa32717e684031c52973aa9fcf537852de3ee1855c2158aa61c956c75b54 languageName: node linkType: hard @@ -8545,7 +8491,7 @@ __metadata: "@walmart/inbox-mini-app": "npm:0.105.3" "@walmart/invue-react-native-sdk": "npm:0.1.26-alpha.14" "@walmart/iteminfo-mini-app": "npm:8.8.11" - "@walmart/learning-mini-app": "npm:20.0.88" + "@walmart/learning-mini-app": "npm:21.0.0" "@walmart/manager-approvals-miniapp": "npm:0.5.4" "@walmart/me-at-walmart-athena-queries": "npm:6.37.0" "@walmart/me-at-walmart-common": "workspace:^"
feat: learning mini app drop 35 enhancements (#5080)
feat: learning mini app drop 35 enhancements (#5080)
e74e340a33e715bf02cf1d89003d05ac88be41b3
--- __tests__/navigation/AssociateHallwayNav/Tabs/__snapshots__/HomeStackNavTest.tsx.snap @@ -67,6 +67,26 @@ exports[`HomeStackNav matches snapshot 1`] = ` } } /> + <Screen + component="SalesItemizedScreen" + name="metricsSalesDrilldown" + /> + <Screen + component="PresubItemizedScreen" + name="metricsPreSubDrilldown" + /> + <Screen + component="MetricsPreSubInfoModalScreen" + name="metricsPreSubInfoModal" + /> + <Screen + component="MetricsFtprInfoModalScreen" + name="metricsFtprInfoModal" + /> + <Screen + component="MetricsFtprTabNavigation" + name="metricsFTPDrilldown" + /> </Navigator> `; @@ -159,6 +179,26 @@ exports[`HomeStackNav matches snapshot with inbox disabled 1`] = ` } } /> + <Screen + component="SalesItemizedScreen" + name="metricsSalesDrilldown" + /> + <Screen + component="PresubItemizedScreen" + name="metricsPreSubDrilldown" + /> + <Screen + component="MetricsPreSubInfoModalScreen" + name="metricsPreSubInfoModal" + /> + <Screen + component="MetricsFtprInfoModalScreen" + name="metricsFtprInfoModal" + /> + <Screen + component="MetricsFtprTabNavigation" + name="metricsFTPDrilldown" + /> </Navigator> `; --- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -64,26 +64,6 @@ exports[`AssociateHallwayNav matches snapshot 1`] = ` component="GuardedShelfAvailabilityMiniApp" name="shelfAvailability" /> - <Screen - component="SalesItemizedScreen" - name="metricsSalesDrilldown" - /> - <Screen - component="PresubItemizedScreen" - name="metricsPreSubDrilldown" - /> - <Screen - component="MetricsPreSubInfoModalScreen" - name="metricsPreSubInfoModal" - /> - <Screen - component="MetricsFtprInfoModalScreen" - name="metricsFtprInfoModal" - /> - <Screen - component="MetricsFtprTabNavigation" - name="metricsFTPDrilldown" - /> </Group> <Screen component="WhatsNewScreen" @@ -239,26 +219,6 @@ exports[`AssociateHallwayNav matches snapshot when time value are undefined 1`] component="GuardedShelfAvailabilityMiniApp" name="shelfAvailability" /> - <Screen - component="SalesItemizedScreen" - name="metricsSalesDrilldown" - /> - <Screen - component="PresubItemizedScreen" - name="metricsPreSubDrilldown" - /> - <Screen - component="MetricsPreSubInfoModalScreen" - name="metricsPreSubInfoModal" - /> - <Screen - component="MetricsFtprInfoModalScreen" - name="metricsFtprInfoModal" - /> - <Screen - component="MetricsFtprTabNavigation" - name="metricsFTPDrilldown" - /> </Group> <Screen component="WhatsNewScreen" --- package-lock.json @@ -4271,9 +4271,9 @@ "integrity": "sha512-7nXe02E/AOFtT1u6/tVerIskwWvSoJcMgYN2DNH7vMgbb0YIFOsqwzX+nbRh/AcaZhC7YX5H2irVCc6/5/HjJw==" }, "@walmart/metrics-mini-app": { - "version": "0.5.5", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.5.5.tgz", - "integrity": "sha512-EsDD0f7NhgQWl0XMXgo7xq/9Pwzop7L4cPpMniCjQuLQZdKHYAFvDpyj7+GLR0KnM4GIvpVPHycEt7SwM9XW8Q==", + "version": "0.5.6", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.5.6.tgz", + "integrity": "sha512-ppjtsGjlY0+7FxOeJvAaJqUGwNx9ljTz3EZriFfBh4gnbreu4cZo3X8mSktiIF2zLv94Yovgya4iEVL9OClhSQ==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "^1.1.2", --- package.json @@ -86,7 +86,7 @@ "@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.5.5", + "@walmart/metrics-mini-app": "0.5.6", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.39", "@walmart/react-native-env": "^0.2.0", --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -37,13 +37,6 @@ import { } from '../NavigationConstants'; import {MainTabsNav} from './Tabs'; import {withClockOutGuard} from '../ClockOutGuard'; -import { - SalesItemizedScreen, - PresubItemizedScreen, - MetricsPreSubInfoModalScreen, - MetricsFtprInfoModalScreen, - MetricsFtprTabNavigation, -} from '@walmart/metrics-mini-app'; const DEFAULT_INACTIVITY_TIME = 300000; const DEFAULT_BACKGROUND_IDLE_TIME = 14400000; @@ -142,26 +135,6 @@ export const MainStackNav = () => { component={ScheduleMiniApp} /> {WorkMiniAppScreens} - <MainStack.Screen - component={SalesItemizedScreen} - name='metricsSalesDrilldown' - /> - <MainStack.Screen - component={PresubItemizedScreen} - name='metricsPreSubDrilldown' - /> - <MainStack.Screen - component={MetricsPreSubInfoModalScreen} - name='metricsPreSubInfoModal' - /> - <MainStack.Screen - component={MetricsFtprInfoModalScreen} - name='metricsFtprInfoModal' - /> - <MainStack.Screen - component={MetricsFtprTabNavigation} - name='metricsFTPDrilldown' - /> </MainStack.Group> {/* These screens do not have a Header defined. We provide one from Core */} --- src/navigation/AssociateHallwayNav/Tabs/HomeStackNav.tsx @@ -24,6 +24,13 @@ import {Title} from '@walmart/gtp-shared-components'; import {NavigationTheme} from '../../../core/AllsparkTheme'; import {getInboxHeaderEnabled} from '../../../navConfig/NavConfigRedux'; +import { + SalesItemizedScreen, + PresubItemizedScreen, + MetricsPreSubInfoModalScreen, + MetricsFtprInfoModalScreen, + MetricsFtprTabNavigation, +} from '@walmart/metrics-mini-app'; export const styles = StyleSheet.create({ badge: { @@ -126,6 +133,27 @@ export const HomeStackNav = () => { options={{headerShown: false}} component={CelebrationListScreen} /> + + <HomeStack.Screen + component={SalesItemizedScreen} + name='metricsSalesDrilldown' + /> + <HomeStack.Screen + component={PresubItemizedScreen} + name='metricsPreSubDrilldown' + /> + <HomeStack.Screen + component={MetricsPreSubInfoModalScreen} + name='metricsPreSubInfoModal' + /> + <HomeStack.Screen + component={MetricsFtprInfoModalScreen} + name='metricsFtprInfoModal' + /> + <HomeStack.Screen + component={MetricsFtprTabNavigation} + name='metricsFTPDrilldown' + /> </HomeStack.Navigator> ); };
bumping version of metrics mini app
bumping version of metrics mini app
7fa6f316e7321ac5d0c44720eb5ee2ca81f8e320
--- __tests__/components/MessageList.test.tsx @@ -39,34 +39,39 @@ describe('MessageList', () => { messages={mockMessages} channelPath={mockChannelPath} onEndReachedHandler={mockOnEndReachedHandler} + isLoading={false} + allRosterAssociates={[]} /> ); expect(getByTestId('messageItemListForConversationHistory')).toBeTruthy(); expect(MessageTimeSectionHeader).toHaveBeenCalledWith( - {time: '2023-03-01', isFirstMessage: false}, + expect.objectContaining({ + time: '2023-03-01', + isFirstMessage: false + }), {} ); expect(Message).toHaveBeenCalledWith( - { + expect.objectContaining({ id: '1', text: 'Hello', sender: 'User1', isGroupMessage: true, channelPath: mockChannelPath, index: 1, - }, + }), {} ); expect(Message).toHaveBeenCalledWith( - { + expect.objectContaining({ id: '2', text: 'Hi', sender: 'User2', isGroupMessage: true, channelPath: mockChannelPath, index: 2, - }, + }), {} ); }); @@ -79,6 +84,8 @@ describe('MessageList', () => { messages={mockMessages} channelPath={mockChannelPath} onEndReachedHandler={mockOnEndReachedHandler} + isLoading={false} + allRosterAssociates={[]} /> ); @@ -87,4 +94,25 @@ describe('MessageList', () => { expect(mockOnEndReachedHandler).toHaveBeenCalled(); }); + + it('passes accessibility props to components', () => { + (useChannelData as jest.Mock).mockReturnValue({group: true}); + + render( + <MessageList + messages={mockMessages} + channelPath={mockChannelPath} + onEndReachedHandler={mockOnEndReachedHandler} + isLoading={false} + allRosterAssociates={[]} + /> + ); + + // Verify that the components receive the expected props including accessibility + expect(MessageTimeSectionHeader).toHaveBeenCalledTimes(1); + expect(Message).toHaveBeenCalledTimes(2); + + // The actual accessibilitySortOrder logic is tested through integration tests + // and manual accessibility testing + }); }); --- __tests__/hooks/useAccessibilityFocus.test.ts @@ -0,0 +1,117 @@ +import {renderHook} from '@testing-library/react-hooks'; +import {AccessibilityInfo, findNodeHandle} from 'react-native'; +import {useAccessibilityFocus} from '../../src/hooks/useAccessibilityFocus'; +import React from 'react'; + +jest.mock('react-native', () => ({ + AccessibilityInfo: { + isScreenReaderEnabled: jest.fn(), + setAccessibilityFocus: jest.fn(), + }, + findNodeHandle: jest.fn(), +})); + +describe('useAccessibilityFocus', () => { + let mockRef: React.RefObject<any>; + + beforeEach(() => { + jest.clearAllMocks(); + jest.useFakeTimers(); + mockRef = {current: {_nativeTag: 123}}; + }); + + afterEach(() => { + jest.runOnlyPendingTimers(); + jest.useRealTimers(); + }); + + it('should not set focus when screen reader is disabled', async () => { + (AccessibilityInfo.isScreenReaderEnabled as jest.Mock).mockResolvedValue(false); + + renderHook(() => useAccessibilityFocus(mockRef)); + + await jest.runAllTimersAsync(); + + expect(AccessibilityInfo.setAccessibilityFocus).not.toHaveBeenCalled(); + }); + + it('should set focus when screen reader is enabled and ref is valid', async () => { + (AccessibilityInfo.isScreenReaderEnabled as jest.Mock).mockResolvedValue(true); + (findNodeHandle as jest.Mock).mockReturnValue(456); + + renderHook(() => useAccessibilityFocus(mockRef)); + + // Wait for the promise to resolve + await jest.runAllTimersAsync(); + + expect(findNodeHandle).toHaveBeenCalledWith(mockRef.current); + expect(AccessibilityInfo.setAccessibilityFocus).toHaveBeenCalledWith(456); + }); + + it('should not set focus when ref.current is null', async () => { + (AccessibilityInfo.isScreenReaderEnabled as jest.Mock).mockResolvedValue(true); + const nullRef = {current: null}; + + renderHook(() => useAccessibilityFocus(nullRef)); + + await jest.runAllTimersAsync(); + + expect(findNodeHandle).not.toHaveBeenCalled(); + expect(AccessibilityInfo.setAccessibilityFocus).not.toHaveBeenCalled(); + }); + + it('should not set focus when findNodeHandle returns null', async () => { + (AccessibilityInfo.isScreenReaderEnabled as jest.Mock).mockResolvedValue(true); + (findNodeHandle as jest.Mock).mockReturnValue(null); + + renderHook(() => useAccessibilityFocus(mockRef)); + + await jest.runAllTimersAsync(); + + expect(AccessibilityInfo.setAccessibilityFocus).not.toHaveBeenCalled(); + }); + + it('should use custom delay when provided', async () => { + (AccessibilityInfo.isScreenReaderEnabled as jest.Mock).mockResolvedValue(true); + (findNodeHandle as jest.Mock).mockReturnValue(789); + const customDelay = 500; + + renderHook(() => useAccessibilityFocus(mockRef, customDelay)); + + // Should not be called immediately + expect(AccessibilityInfo.setAccessibilityFocus).not.toHaveBeenCalled(); + + // Advance timers by less than the delay + jest.advanceTimersByTime(customDelay - 100); + expect(AccessibilityInfo.setAccessibilityFocus).not.toHaveBeenCalled(); + + // Advance to exactly the delay + jest.advanceTimersByTime(100); + + await jest.runAllTimersAsync(); + + expect(AccessibilityInfo.setAccessibilityFocus).toHaveBeenCalledWith(789); + }); + + it('should re-run effect when ref changes', async () => { + (AccessibilityInfo.isScreenReaderEnabled as jest.Mock).mockResolvedValue(true); + (findNodeHandle as jest.Mock).mockReturnValue(999); + + const {rerender} = renderHook( + ({ref, delay}) => useAccessibilityFocus(ref, delay), + {initialProps: {ref: mockRef, delay: 200}} + ); + + await jest.runAllTimersAsync(); + + expect(AccessibilityInfo.setAccessibilityFocus).toHaveBeenCalledTimes(1); + + // Change the ref + const newRef = {current: {_nativeTag: 456}}; + rerender({ref: newRef, delay: 200}); + + await jest.runAllTimersAsync(); + + expect(AccessibilityInfo.setAccessibilityFocus).toHaveBeenCalledTimes(2); + }); +});
fix(ada-fixes): SMDV-7807 test coverage
fix(ada-fixes): SMDV-7807 test coverage
09ddf0ddf2e29d3762866404df0cdc91a570a39f
--- yarn.lock @@ -8170,6 +8170,20 @@ __metadata: languageName: node linkType: hard +<<<<<<< HEAD +======= +"@walmart/react-native-webex-sdk@patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch": + version: 0.4.3 + resolution: "@walmart/react-native-webex-sdk@patch:@walmart/react-native-webex-sdk@npm%3A0.4.3#~/.yarn/patches/@walmart-react-native-webex-sdk-npm-0.4.3-2621d9f1df.patch::version=0.4.3&hash=03c15c" + peerDependencies: + react: "*" + react-native: "*" + react-native-logger: "*" + checksum: 10c0/92e40f7c48cbb0e9617b7810807ab09b387adc24e69d48e2061aedabd08e08284b589611c60834108317d900e3cec752dc9fc38a750421ec3c1a9b3930dceb28 + languageName: node + linkType: hard + +>>>>>>> 8b666c955 (update) "@walmart/receipt-check-miniapp@npm:1.28.1": version: 1.28.1 resolution: "@walmart/receipt-check-miniapp@npm:1.28.1"
update
update
8f201d28019e9787e754a19195f265bc07e3b1ed
--- src/components/Roster/Roster.tsx @@ -23,6 +23,14 @@ import {teamLeadJobDescriptions} from '../../redux/selectors'; * jobCategoryCodeDesc */ +/** TeamRosterItem fields + * teamId + * teamName + * mewClockedInCount + * mewAbsentCount + * workgroup + */ + /** * TeamRosterItem fields * //TODO: Identify minimal fields needs to manage a teamList entity --- src/components/Roster/types.ts @@ -3,7 +3,6 @@ interface RosterActionButton { action: (event: any) => void; } - export interface RosterData { [key: string]: any; //TODO: Define a strict type for the shape of the roster data // associateList: any; //TODO: Define standard shape for AssociateItem[] type @@ -25,3 +24,6 @@ export type AssociateRosterItem = any; // NonNullable< // ArrayValue<NonNullable<GetDailyRosterQuery['getDailyRoster']>> // >; + +//TODO: Refine type to only include fields needed to render an AssociateItem +export type TeamRosterItem = any;
defining team data entity
defining team data entity
057b95d4089f32cf9f4d1f71789e93109757c9f0
--- packages/me-at-walmart-common/__tests__/components/SidekickAssistantFAB.test.tsx @@ -72,6 +72,15 @@ jest.mock('../../src/assets/images/sidekick-assistant-fab-pressed.png', () => 's virtual: true, }); +jest.mock('react-native-safe-area-context', () => ({ + useSafeAreaInsets: jest.fn(() => ({ + top: 0, + bottom: 0, + left: 0, + right: 0, + })), +})); + describe('SidekickAssistantFAB', () => { beforeEach(() => { jest.clearAllMocks(); --- packages/me-at-walmart-common/src/components/SidekickAssistantFAB/index.tsx @@ -13,6 +13,7 @@ import { } from 'react-native-reanimated'; import {useFABFeatureFlag} from '../../hooks/useFABFeatureFlag'; import {FooterAvoidingView} from '../FooterAvoidingView'; +import {useSafeAreaInsets} from 'react-native-safe-area-context'; // Import the sidekick assistant FAB images const sidekickAssistantFabImage = require('../../assets/images/sidekick-assistant-fab.png'); @@ -234,11 +235,16 @@ export { // Export the feature flag hook for direct use export {useFABFeatureFlag}; -export const FooterAvoidingSidekickAssistantFAB = ({children}: {children: React.ReactNode}) => { +export const FooterAvoidingSidekickAssistantFAB = ({children, footerHasSafeArea = true}: {children: React.ReactNode, footerHasSafeArea?: boolean}) => { const [footerHeight, setFooterHeight] = useState(0); + const {bottom: safeAreaBottom} = useSafeAreaInsets(); const onHeightUpdate = (newHeight: number) => { - setFooterHeight(newHeight); + let updateHeight = newHeight; + if (footerHasSafeArea) { + updateHeight = Math.max(0, newHeight - safeAreaBottom); + } + setFooterHeight(updateHeight); } useSidekickAssistantFABFocusEffect({ --- src/developerMenu/fabDemo/FabDemo.tsx @@ -5,6 +5,7 @@ import {Alert, Button, ButtonGroup, ProgressIndicator, Switch} from '@walmart/gt import {FooterAvoidingSidekickAssistantFAB} from 'packages/me-at-walmart-common/lib'; import {useNavigation} from '@react-navigation/native'; import {DevMenuEnum} from '../types'; +import {SafeAreaView} from 'react-native-safe-area-context'; export const FabDemo = () => { const [showProgress, setShowProgress] = React.useState(false); @@ -34,21 +35,23 @@ export const FabDemo = () => { >Go to a different page!</Button> </View> <View style={styles.bottomAction}> - <FooterAvoidingSidekickAssistantFAB> - <BottomAction - buttonGroup={ - <ButtonGroup> - <Button isFullWidth variant="secondary" onPress={() => {}}>Cancel</Button> - <Button isFullWidth variant="primary" onPress={() => {}}>Add</Button> - </ButtonGroup> - } - alertMessage={showAlert ? <Alert>Example alert</Alert> : null} - progressIndicator={showProgress ? <ProgressIndicator - label="Definitely moving" - value={30} - valueLabel={'30%'} - /> : null} - /> + <FooterAvoidingSidekickAssistantFAB footerHasSafeArea={true}> + <SafeAreaView style={{paddingBottom: 50}} edges={{bottom: 'maximum'}}> + <BottomAction + buttonGroup={ + <ButtonGroup> + <Button isFullWidth variant="secondary" onPress={() => {}}>Cancel</Button> + <Button isFullWidth variant="primary" onPress={() => {}}>Add</Button> + </ButtonGroup> + } + alertMessage={showAlert ? <Alert>Example alert</Alert> : null} + progressIndicator={showProgress ? <ProgressIndicator + label="Definitely moving" + value={30} + valueLabel={'30%'} + /> : null} + /> + </SafeAreaView> </FooterAvoidingSidekickAssistantFAB> </View> </View>
fix: footerAvoidingFabView option to include safearea (#4917)
fix: footerAvoidingFabView option to include safearea (#4917)
6944e198ebd72f80d757acab8a3e2a7307a3cd21
--- android/app/src/main/assets/fonts/icomoon.ttf Binary files a/android/app/src/main/assets/fonts/icomoon.ttf and b/android/app/src/main/assets/fonts/icomoon.ttf differ --- ios/icomoon.ttf Binary files a/ios/icomoon.ttf and b/ios/icomoon.ttf differ --- package-lock.json @@ -3107,9 +3107,9 @@ } }, "@walmart/ui-components": { - "version": "1.0.86", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.0.86.tgz", - "integrity": "sha512-AFTLsVHUg7wDRAiTXB9uesOfD35JQTZ/Re4gqJTkFiEpO5sq1HmzCFRJGHKn+in/nfe4mKY9VnACivUO1oG26Q==", + "version": "1.0.88", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.0.88.tgz", + "integrity": "sha512-mFoA4sT75pfkFEhBrhVzmMJYFpA38KIcpPtjA1YtDRA0EqyWFBsZH4wpdn6btdqhgBnsiT/0yotYueRASfKfLQ==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -63,10 +63,10 @@ "@walmart/schedule-mini-app": "0.2.36", "@walmart/settings-mini-app": "1.1.8", "@walmart/time-clock-mini-app": "0.1.6", - "@walmart/ui-components": "^1.0.86", + "@walmart/ui-components": "1.0.88", "i18next": "^19.7.0", "intl": "^1.2.5", - "javascript-time-ago": "^2.3.3", + "javascript-time-ago": "2.3.3", "lodash": "^4.17.20", "react": "16.13.1", "react-i18next": "^11.7.3", --- src/navigation/Navigation.tsx @@ -10,6 +10,8 @@ import { getFocusedRouteNameFromRoute, useNavigation, } from '@react-navigation/native'; + +import {BottomTabs, BottomTabsConfig} from '@walmart/ui-components'; import SplashScreen from 'react-native-splash-screen'; import {debounce} from 'lodash'; @@ -27,7 +29,7 @@ import { import {ScheduleMiniApp} from '@walmart/schedule-mini-app'; import {HealthSurveyMiniApp} from '@walmart/allspark-health-survey-mini-app'; import SettingsMiniApp from '@walmart/settings-mini-app'; -import InboxMiniApp from '@walmart/inbox-mini-app'; +import InboxMiniApp, {useBadgesCount} from '@walmart/inbox-mini-app'; import { PushToTalkMiniApp, Components, @@ -39,18 +41,20 @@ import { SSOPingFedEvents, } from 'react-native-ssmp-sso-allspark'; +import styles from './NavigationStyle'; + import {FeedbackMiniApp} from '@walmart/feedback-all-spark-miniapp'; import {StackHeaderOptions} from '@react-navigation/stack/lib/typescript/src/types'; import WmTelemetry from 'react-native-wm-telemetry'; import appJson from '../../app.json'; + import {Icon} from '../images'; import {WhatsNewModal} from '../whatsNew/WhatsNewModal'; import {WhatsNewScreen} from '../whatsNew/WhatsNewScreen'; + import {AuthenticatorView} from '../auth'; -import {TabBar} from './TabBar'; -import styles from './NavigationStyle'; import {SideMenuContent} from './SideMenuContent'; import {bottomSheetTransitionOptions} from './BottomSheetTransition'; import {ChevronLeftIcon} from '@walmart/gtp-shared-components'; @@ -60,8 +64,63 @@ const MainTabs = createBottomTabNavigator(); const MainTabsNav = () => { const [translate] = useTranslation(); + const [badgesCount] = useBadgesCount(0); + + const tabsConfig: BottomTabsConfig = { + centerTab: 'askSam', + navList: [ + { + title: translate('navigation.home'), + id: 'home', + icon: 'home', + iconSelected: 'home-filled', + iconSize: 20, + }, + { + title: translate('navigation.me'), + id: 'me', + icon: 'me', + iconSelected: 'me-filled', + iconSize: 20, + }, + { + title: 'Ask Sam', + id: 'askSam', + icon: 'ask-sam', + iconSize: 20, + }, + { + title: translate('navigation.myTeam'), + id: 'myTeam', + icon: 'my-team', + iconSelected: 'team-filled', + iconSize: 20, + }, + { + title: translate('navigation.inbox'), + id: 'inbox', + icon: 'inbox', + iconSize: 20, + iconSelected: 'inbox-filled', + badgeInfo: { + count: badgesCount, + color: '#fff100', + }, + }, + ], + }; + return ( - <MainTabs.Navigator tabBar={(props) => <TabBar {...props} />}> + <MainTabs.Navigator + tabBar={(props) => ( + <BottomTabs + config={tabsConfig} + onTabChange={(tab) => { + props.navigation.navigate(tab.id); + }} + {...props} + /> + )}> <MainTabs.Screen name='home' component={HomeMiniApp}
Feature/dynamic footer and inbox badges (#237)
Feature/dynamic footer and inbox badges (#237) * Add footer from UI component with Badge icon for inbox * Lint fix * increase inbox package version * Add Impersonated header * Add fonts * ios font * Revert "ios font" This reverts commit 61a666dcf8cb31d400a05dd011d3bd8a438b1f25. * Inbox version bump * Update font size of footer icons to match UX * Lint error * Review coment fixed * Update UI componet version Co-authored-by: Anthony Helms - awhelms <awhelms@wal-mart.com>
7b5a69d083c7fdb823972aed575d62391ed6e388
--- scripts/getCpVersion.js @@ -0,0 +1,19 @@ +const exec = require('child_process').exec; + +exec(`appcenter codepush deployment list -a AllSpark-Me-Walmart/AllSpark-Android --output json`, {}, (error, stdout, stderr) => { + if(error) { + console.error(error); + return; + } + const releases = JSON.parse(stdout); + releases.forEach(release => { + if(release.name === 'prod') { + const latestRelease = release.latestRelease; + const version = `${latestRelease.targetBinaryRange}-${latestRelease.label}`; + console.log("Creating a tag with version: ", version); + exec(`sh scripts/releaseTagging.sh ${version}`, {}, (err, out, stderr) => { + console.log(err); + }) + } + }) +}) \ No newline at end of file
adding script to push tag
adding script to push tag
bf33b31e510181da031cce448fd4da65978a36a1
--- __tests__/home/containers/HomeScreenTest.tsx @@ -113,13 +113,12 @@ describe('HomeScreen', () => { const {refreshControl} = scrollView.props; await waitFor(() => { refreshControl.props.onRefresh(); + expect(getByTestId('Home.LastUpdatedText')).toBeDefined(); + expect( + getByTestId('Home.ScrollView').props.refreshControl.props.refreshing + ).toBe(true); }); - expect(getByTestId('Home.LastUpdatedText')).toBeDefined(); - expect( - getByTestId('Home.ScrollView').props.refreshControl.props.refreshing - ).toBe(true); - waitForElementToBeRemoved(() => getByTestId('Home.LastUpdatedText'), { interval: 3500, timeout: 3500, --- src/changeStore/ChangeStoreModal.tsx @@ -102,7 +102,6 @@ export const ChangeStoreModal = ( const hideSub = Keyboard.addListener(KeyboardHideEvent, (event) => { configureAnimationForEvent(event); - setKeyboardOpen(false); }); return () => { @@ -151,6 +150,11 @@ export const ChangeStoreModal = ( onDismiss(); }; + const onBack = () => { + setKeyboardOpen(false); + Keyboard.dismiss(); + }; + const onRetry = () => { fetchStoreInfo({businessUnitNbr: storeInfo.siteId!, countryCode}); }; @@ -182,7 +186,7 @@ export const ChangeStoreModal = ( : t('changeStore.siteTitle', {context}) } backEnabled={keyboardOpen} - onBack={Keyboard.dismiss} + onBack={onBack} onClose={onClose} style={[styles.header, keyboardOpen && styles.headerKeyboardOpen]} /> @@ -190,7 +194,8 @@ export const ChangeStoreModal = ( {showStoreInfo && ( <Animated.View testID='storeInfoWrapper' - style={[{opacity}, keyboardOpen && storeInfoKeyboardOpenStyle]}> + style={[{opacity}, keyboardOpen && storeInfoKeyboardOpenStyle]} + > <> <StoreInfoWarnings error={!!storeInfoError}
fix(v7): ALLSPARK-7183 fix keyboard on store update (#4968)
fix(v7): ALLSPARK-7183 fix keyboard on store update (#4968) Co-authored-by: Maksym Novakh <maksym.novakh@walmart.com>
818cd08e9cb62c2936dfac82d44e6d7d01ccc812
--- .looper.yml @@ -18,4 +18,4 @@ flows: - (name Yarn Version) yarn --version - yarn install - yarn run lint - - yarn run coverage \ No newline at end of file + # - yarn run coverage \ No newline at end of file
Update my team mini app version
Update my team mini app version
72931c7474862e991b519e55b7935eecca6ddd92
--- packages/allspark-http-client/src/HttpClient.ts @@ -272,7 +272,7 @@ class HttpClient extends Axios implements IHttpClient { config?: AxiosRequestConfig<D> ): Promise<R> => { // @ts-ignore - if (data?.data) { + if (data?.data && !config) { warnForLegacyCalls(method, url); return this.formatLegacyRequest(method, url, data); } else { --- packages/allspark-http-client/src/types.ts @@ -110,7 +110,7 @@ export type HttpClientDefaults = AxiosDefaults & HttpClientCustomConfig & LegacyHttpClientConfig; -export interface IHttpClient extends Omit<Axios, 'put' | 'post' | 'patch'> { +export interface IHttpClient extends Axios { // Custom methods id: string; clones: Map<string, IHttpClient>; @@ -148,20 +148,21 @@ export interface IHttpClient extends Omit<Axios, 'put' | 'post' | 'patch'> { url: string, config?: HttpClientRequestConfig<D> ): Promise<R>; - // --- Legacy Override --- // post<T = any, R = HttpClientResponse<T>, D = any>( url: string, + data?: D, config?: HttpClientRequestConfig<D> ): Promise<R>; put<T = any, R = HttpClientResponse<T>, D = any>( url: string, + data?: D, config?: HttpClientRequestConfig<D> ): Promise<R>; patch<T = any, R = HttpClientResponse<T>, D = any>( url: string, + data?: D, config?: HttpClientRequestConfig<D> ): Promise<R>; - // ----------------------- // postForm<T = any, R = HttpClientResponse<T>, D = any>( url: string, data?: D,
fix: remove legacy typing
fix: remove legacy typing
7e78ddd4621bd975315a687005e1dd3a17e86621
--- package-lock.json @@ -86,7 +86,7 @@ "@walmart/ui-components": "1.6.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.25", - "axios": "^0.26.1", + "axios": "^1.2.6", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0", "dayjs": "^1.11.5", @@ -6931,10 +6931,14 @@ "license": "MIT" }, "node_modules/axios": { - "version": "0.26.1", + "version": "1.2.6", + "resolved": "https://npme.walmart.com/axios/-/axios-1.2.6.tgz", + "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", "license": "MIT", "dependencies": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/axios-cache-adapter": { @@ -6948,6 +6952,20 @@ "axios": "~0.21.1" } }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://npme.walmart.com/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/azure-storage": { "version": "2.10.3", "license": "Apache-2.0", @@ -17168,6 +17186,12 @@ "dev": true, "license": "ISC" }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://npme.walmart.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/pseudomap": { "version": "1.0.2", "dev": true, @@ -25319,7 +25343,7 @@ "resolved": "https://npme.walmart.com/apisauce/-/apisauce-1.1.2.tgz", "integrity": "sha512-AqOrOVk71JPSqugA6PdrkE2S0w1GC/f3xPZPMHJ1O+Z73pwT2uoGnr8JbfmB/gvO2cnygYzlBOnkD/mN6W1FMQ==", "requires": { - "axios": "^0.26.1", + "axios": "^1.2.6", "ramda": "^0.25.0" } }, @@ -25509,7 +25533,7 @@ "integrity": "sha512-K59PokF2wNLtXsUVxIvoCrylZhI2BgZuwP9EU3h+vv65ndPnu7MbcdurmVc/3suwoWKv65X4LTGsTHkduX0gzA==", "requires": { "@walmart/service-environment-js": "^1.0.2", - "axios": "^0.26.1", + "axios": "^1.2.6", "big-integer": "^1.6.48" } }, @@ -25822,7 +25846,7 @@ "apisauce": { "version": "1.1.5", "requires": { - "axios": "^0.26.1", + "axios": "^1.2.6", "ramda": "^0.25.0" }, "dependencies": { @@ -25934,9 +25958,25 @@ "version": "1.11.0" }, "axios": { - "version": "0.26.1", + "version": "1.2.6", + "resolved": "https://npme.walmart.com/axios/-/axios-1.2.6.tgz", + "integrity": "sha512-rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ==", "requires": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + }, + "dependencies": { + "form-data": { + "version": "4.0.0", + "resolved": "https://npme.walmart.com/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + } } }, "axios-cache-adapter": { @@ -28304,7 +28344,7 @@ "version": "2.1.6", "dev": true, "requires": { - "axios": "^0.26.1" + "axios": "^1.2.6" } }, "chalk": { @@ -32588,6 +32628,11 @@ "version": "1.2.4", "dev": true }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://npme.walmart.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "pseudomap": { "version": "1.0.2", "dev": true --- package.json @@ -128,7 +128,7 @@ "@walmart/ui-components": "1.6.0", "@walmart/welcomeme-mini-app": "0.73.0", "@walmart/wfm-ui": "0.2.25", - "axios": "^0.26.1", + "axios": "^1.2.6", "axios-cache-adapter": "2.7.3", "crypto-js": "^3.3.0", "dayjs": "^1.11.5", @@ -221,7 +221,7 @@ }, "overrides": { "@react-native-community/datetimepicker": "^5.1.0", - "axios": "^0.26.1", + "axios": "^1.2.6", "crypto-js": "^3.3.0", "luxon": "^1.28.0", "moment": "^2.29.4", --- patches/axios-cache-adapter+2.7.3.patch @@ -0,0 +1,36 @@ +diff --git a/node_modules/axios-cache-adapter/package.json b/node_modules/axios-cache-adapter/package.json +index 2add21f..715457d 100644 +--- a/node_modules/axios-cache-adapter/package.json ++++ b/node_modules/axios-cache-adapter/package.json +@@ -13,8 +13,7 @@ + "/src", + "/axios-cache-adapter.d.ts" + ], +- "main": "dist/cache.node.js", +- "browser": "dist/cache.js", ++ "main": "src/index.js", + "types": "axios-cache-adapter.d.ts", + "runkitExampleFilename": "examples/basic.js", + "keywords": [ +diff --git a/node_modules/axios-cache-adapter/src/api.js b/node_modules/axios-cache-adapter/src/api.js +index 0e13f5f..59bfcf6 100644 +--- a/node_modules/axios-cache-adapter/src/api.js ++++ b/node_modules/axios-cache-adapter/src/api.js +@@ -4,6 +4,7 @@ import request from './request' + import { serializeQuery } from './cache' + import { defaults, makeConfig, mergeRequestConfig } from './config' + import { isFunction } from './utilities' ++import adapters from 'axios/lib/adapters/adapters' + + /** + * Configure cache adapter +@@ -32,7 +33,8 @@ function setupCache (config = {}) { + let networkError + + try { +- res = await reqConfig.adapter(req) ++ const adapter = adapters.getAdapter(reqConfig.adapter); ++ res = await adapter(req); + } catch (err) { + networkError = err + }
update axios version
update axios version
740b9f700b090a73a95efb422979d421ee3a8eec
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.140.0", + "@walmart/profile-feature-app": "0.141.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -5693,9 +5693,9 @@ } }, "node_modules/@walmart/profile-feature-app": { - "version": "0.140.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.140.0.tgz", - "integrity": "sha512-j+fhEvoZkT9IcU/Ma7FXPO21uwn9o1PPhdQtTAebJdevpVUl1PXpWPZ7QyQBvHLbJ6UcT8gF/EzZucxkuVa7mQ==", + "version": "0.141.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.141.0.tgz", + "integrity": "sha512-Dle9ErvRJBPy33KJGxQR7xj/GuxVRNNGHhiZK49bBOebq9khK4OXE3ldmxRQfmd9faG0PYl5gwDm/zOhj+dUpA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/bottom-tabs": "^6.0.0", @@ -25323,9 +25323,9 @@ "integrity": "sha512-TIzjXjT8jlsb/OrY7WPr4xUv5RsCsnNN0wwjawIwOHurrZtrFn8f/WjwkY8e6zUC3AlZ4QsHdaKqCD/pfkgGPg==" }, "@walmart/profile-feature-app": { - "version": "0.140.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.140.0.tgz", - "integrity": "sha512-j+fhEvoZkT9IcU/Ma7FXPO21uwn9o1PPhdQtTAebJdevpVUl1PXpWPZ7QyQBvHLbJ6UcT8gF/EzZucxkuVa7mQ==" + "version": "0.141.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.141.0.tgz", + "integrity": "sha512-Dle9ErvRJBPy33KJGxQR7xj/GuxVRNNGHhiZK49bBOebq9khK4OXE3ldmxRQfmd9faG0PYl5gwDm/zOhj+dUpA==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.59", --- package.json @@ -107,7 +107,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.140.0", + "@walmart/profile-feature-app": "0.141.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0",
bump profile-feature-app to 0.141.0
bump profile-feature-app to 0.141.0
a3eb4d43db0f57058ffddb6df0d2c4356484e459
--- packages/allspark-foundation/src/Container/ActiveContainerManager.tsx @@ -1,3 +1,4 @@ +import React, { PropsWithChildren } from 'react'; import { noop } from '@walmart/allspark-utils'; import { AllsparkFeatureModule, @@ -6,7 +7,7 @@ import { } from '../Feature'; import { FeatureModuleManager } from '../Feature/AllsparkFeatureManager'; import { AllsparkContainer } from './AllsparkContainer'; -import { ContainerSetupTypes } from './types'; +import { ContainerSetupTypes, SetupConfig } from './types'; const DEFAULT_FEATURES = new FeatureModuleManager('default'); @@ -28,8 +29,21 @@ export class ActiveContainerManager { this._activeContainer = container; }; - public preRegister = () => { - this._activeContainer?.eventManager.runEvent('onPreRegister', undefined); + /** + * Adds a setup function to run at a custom point in the active container lifecycle. Types are defined by the container. + */ + public addSetup = (type: ContainerSetupTypes, setup: SetupConfig) => { + this._activeContainer?.addSetup(type, setup); + }; + + public SetupGuard = ( + props: PropsWithChildren<{ setupType: ContainerSetupTypes }> + ) => { + if (this._activeContainer) { + return <this._activeContainer.SetupGuard {...props} />; + } + + return null; }; /**
feat: add setup guard and add setup methods to active container class
feat: add setup guard and add setup methods to active container class
24cb4f8e050b133aae757f7f1f3b22d97ebdf1f4
--- .looper-pr.yml @@ -30,4 +30,3 @@ envs: MONO_REPO_BASE_BRANCH: develop AUTHOR: temp SLACK_CHANNEL: "smdv-miniapp" -
feat(ui): generating tag
feat(ui): generating tag
b8dc4f42ef53790c4c55f2c873a4dc74600073a7
--- .yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch @@ -1270,24 +1270,6 @@ index 8f4fe48faabc56015d76bad685818b1744038443..6b0b07ef499c185e9d26ca5ff3d0d807 localSourceImage: PropTypes.shape({ filename: PropTypes.string, directory: PropTypes.string, mode: PropTypes.oneOf(['AspectFill', 'AspectFit', 'ScaleToFill']) }), permissionDialogTitle: PropTypes.string, -@@ -67,17 +56,12 @@ class SketchCanvas extends React.Component { - - touchEnabled: true, - -- text: null, - localSourceImage: null, - - permissionDialogTitle: '', - permissionDialogMessage: '', - }; - -- state = { -- text: null -- } -- - constructor(props) { - super(props) - this._pathsToProcess = [] @@ -104,9 +88,13 @@ class SketchCanvas extends React.Component { } --- yarn.lock @@ -4685,15 +4685,15 @@ __metadata: "@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::version=0.8.0&hash=627c51": version: 0.8.0 - resolution: "@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::version=0.8.0&hash=627c51" - checksum: 10c0/a958b236578eaf6200beca99fd850d28041a60566910562f8e50a34b1c8359678cc6799c78dda71d5853affdfb61989482fd39cacdc16bb6ec0bd9bc6514e40c + resolution: "@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::version=0.8.0&hash=99818d" + checksum: 10c0/272e13a29f82757bd8518ec35e7094921bdb0cf433bc9842572e7a868606f50940030088ec3ea855349fbe632bf924726247588391d90f13dd26a40c344b6928 languageName: node linkType: hard "@terrylinla/react-native-sketch-canvas@patch:@terrylinla/react-native-sketch-canvas@patch%3A@terrylinla/react-native-sketch-canvas@npm%253A0.8.0%23~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch%3A%3Aversion=0.8.0&hash=627c51#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-patch-b841bbddec.patch": version: 0.8.0 - resolution: "@terrylinla/react-native-sketch-canvas@patch:@terrylinla/react-native-sketch-canvas@patch%3A@terrylinla/react-native-sketch-canvas@npm%253A0.8.0%23~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch%3A%3Aversion=0.8.0&hash=627c51#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-patch-b841bbddec.patch::version=0.8.0&hash=41dc91" - checksum: 10c0/e1eb42ff0c7a43a0515086db2b8a11d9e245175b49627e902218ae2e33d8c9435f106c449a8f3b75fdd230b32cd76bd0463d83620b9e9ca516912d407dbd67be + resolution: "@terrylinla/react-native-sketch-canvas@patch:@terrylinla/react-native-sketch-canvas@patch%3A@terrylinla/react-native-sketch-canvas@npm%253A0.8.0%23~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch%3A%3Aversion=0.8.0&hash=99818d#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-patch-b841bbddec.patch::version=0.8.0&hash=41dc91" + checksum: 10c0/7c9c8abfd1ab6619382386e875b4028571e75bb846ee925711e8f0c0c402c04f0213e835edbf6f87cf04cf07dc05cb2cd77a3d3c4c77f55db89e3bfaf1eac9e8 languageName: node linkType: hard
updated patch file for sketchcanvas
updated patch file for sketchcanvas
b012afc4f960dbafcdecb951f07bed1eaa13f344
--- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.0.0-beta.2", + "version": "1.0.0-beta.3", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", --- packages/allspark-foundation-hub/src/HubFeature/Hub/HubWidget/styles.ts @@ -46,7 +46,6 @@ export const HubWidgetStyles = () => fontFamily: 'Bogle-Regular', }, contentSlot: { - padding: 16, minHeight: 70, }, actionInsight: { --- packages/allspark-foundation-hub/src/HubFeature/Hub/TeamSwitcher/styles.ts @@ -144,5 +144,6 @@ export const TeamSwitcherStyles = () => teamSwitcherContainer: { backgroundColor: colors.white, gap: 8, + zIndex: 1, }, });
Update team switcher container
Update team switcher container
700204bac16e9ed2b1943bba50465138fadc0baa
--- package.json @@ -200,7 +200,7 @@ "expo-splash-screen": "~0.30.10", "expo-sqlite": "~15.2.14", "expo-status-bar": "~2.2.3", - "expo-store-review": "~8.1.5", + "expo-store-review": "~9.0.8", "expo-system-ui": "~5.0.11", "expo-task-manager": "~13.1.6", "expo-video": "~2.2.2", --- yarn.lock @@ -8540,7 +8540,7 @@ __metadata: expo-splash-screen: "npm:~0.30.10" expo-sqlite: "npm:~15.2.14" expo-status-bar: "npm:~2.2.3" - expo-store-review: "npm:~8.1.5" + expo-store-review: "npm:~9.0.8" expo-system-ui: "npm:~5.0.11" expo-task-manager: "npm:~13.1.6" expo-video: "npm:~2.2.2" @@ -14203,13 +14203,13 @@ __metadata: languageName: node linkType: hard -"expo-store-review@npm:~8.1.5": - version: 8.1.5 - resolution: "expo-store-review@npm:8.1.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-store-review%2F-%2Fexpo-store-review-8.1.5.tgz" +"expo-store-review@npm:~9.0.8": + version: 9.0.8 + resolution: "expo-store-review@npm:9.0.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fexpo-store-review%2F-%2Fexpo-store-review-9.0.8.tgz" peerDependencies: expo: "*" react-native: "*" - checksum: 10c0/a07898feb0c955f1d455d561a0132d09b2b9875776c016f26f125747b2a98ff3d7b7178bf84cdda15382b6c4ce356538d3e13ff10f09a11eb51f93ab6fb7c323 + checksum: 10c0/fa3dddfbc4275751840e06face078cb847e30702c05d9beb6c4b645f3cd9b85682f524df00e1abc29847fc783b451c7dd59b742eec927d6d39375c525c9e5886 languageName: node linkType: hard
fix: ALLSPARK-6965 upgrade expo store review to fix ios issue (#4926)
fix: ALLSPARK-6965 upgrade expo store review to fix ios issue (#4926)
e33b7ad6506e59490e3b48ca1b19584ac87c75e8
--- ios/Podfile.lock @@ -400,7 +400,7 @@ PODS: - React-Core - react-native-cameraroll (4.1.2): - React-Core - - react-native-encrypted-storage (1.0.2): + - react-native-encrypted-storage (1.1.0): - React-Core - react-native-geolocation-service (5.1.1): - React @@ -992,7 +992,7 @@ SPEC CHECKSUMS: react-native-biometrics: 9d3306e5d29c3bc4e6a3c912d759a94e76a2f683 react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9 react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060 - react-native-encrypted-storage: fe5349ab0f7a3de4bc71acbb98f8320cb3b68bc2 + react-native-encrypted-storage: 55e703e9886219deacb95066e932d843ccc0649e react-native-geolocation-service: f33626f1ae12381ca2ae60f98b2f5edd676bf95a react-native-get-random-values: 41f0c91ac0da870e47b307e07752e9e54bc2dc7e react-native-image-picker: 24a36044140202085113ce99b57bf52c62dc339e
pod update
pod update
1ce5c829cf9665f334cbb9582255c701ad2bca4a
--- package.json @@ -85,7 +85,7 @@ "@walmart/allspark-utils": "6.1.4", "@walmart/amp-mini-app": "1.1.80", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.23.4", + "@walmart/ask-sam-mini-app": "1.23.5", "@walmart/attendance-mini-app": "3.44.0", "@walmart/avp-feature-app": "0.5.1", "@walmart/avp-shared-library": "0.5.2", --- yarn.lock @@ -5611,9 +5611,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ask-sam-mini-app@npm:1.23.4": - version: 1.23.4 - resolution: "@walmart/ask-sam-mini-app@npm:1.23.4" +"@walmart/ask-sam-mini-app@npm:1.23.5": + version: 1.23.5 + resolution: "@walmart/ask-sam-mini-app@npm:1.23.5" dependencies: apisauce: "npm:^1.1.2" axios-cache-adapter: "npm:>=2.7.3" @@ -5628,7 +5628,7 @@ __metadata: "@walmart/core-services": ">=1.4.11" "@walmart/core-utils": ">=1.2" "@walmart/core-widget-registry": ">=0.2" - "@walmart/gtp-shared-components": ">=2.1.10" + "@walmart/gtp-shared-components": ">=2.2.1" "@walmart/redux-store": ">=3.1.4" "@walmart/schedule-mini-app": "*" "@walmart/ui-components": ">=1.5" @@ -5660,7 +5660,7 @@ __metadata: react-native-wm-voice-text: ">=0.3" reselect: ">=4" victory-native: ">=36.5" - checksum: 10c0/020de2def335dde9a7479840b45e1b6e14bfee55bd4239d2c7e45b4f9146bb1f6c6dbf68a3d4b1da45e4f89440cbc4efe0aa92bb558fdf926c313094e124b5e6 + checksum: 10c0/96b097634439bb89b4a3da71f16951a3ac32f3cd0cb6c16817708b471d7ab22e699b4fe6ac0002e155870c58d8507f7ed12430964be7f9fdacba27a719aa5fa7 languageName: node linkType: hard @@ -7800,7 +7800,7 @@ __metadata: "@walmart/allspark-utils": "npm:6.1.4" "@walmart/amp-mini-app": "npm:1.1.80" "@walmart/ask-sam-chat-components": "npm:^0.2.7" - "@walmart/ask-sam-mini-app": "npm:1.23.4" + "@walmart/ask-sam-mini-app": "npm:1.23.5" "@walmart/attendance-mini-app": "npm:3.44.0" "@walmart/avp-feature-app": "npm:0.5.1" "@walmart/avp-shared-library": "npm:0.5.2"
version bump - tech migration
version bump - tech migration
2e513858db06990a0d063a45e667a2a921425392
--- packages/allspark-foundation/src/HTTP/cache.ts @@ -29,7 +29,7 @@ export const getStorageForClient = (id: string): AxiosStorage => { return buildStorage({ find: async (key: string) => { const value = await localStorage.get(key); - return value ? JSON.parse(value) : undefined; + return value ? JSON.parse(value as string) : undefined; }, set: async (key: string, value: any) => { return localStorage.set(key, JSON.stringify(value));
fix(ts): fixing ts error
fix(ts): fixing ts error
d5bcb768c22a8c8b695861515038ca189f3c25ad
--- packages/me-at-walmart-common/src/containers/Sidekick.ts @@ -13,6 +13,7 @@ export const SIDEKICK_CONTAINERS = { * Component Typing: ComponentType\<{@link InboxComponentProps}\> */ SIDEKICK: 'SIDEKICK.SIDEKICK', + GOAL_DETAILS_CONTENT_SLOT_CONTAINER: 'SIDEKICK.GOAL_DETAILS_CONTENT_SLOT' } as const; // --- Support Typing --- // @@ -55,6 +56,8 @@ export type SidekickComponentProps = { cardStyle?: StyleProp<ViewStyle>; } +export type GoalDetailsContentSlotComponentProps = any; + // --- ID/Type Mapping --- // /** @@ -62,6 +65,7 @@ export type SidekickComponentProps = { */ export type SidekickContainerPropsMap = { [SIDEKICK_CONTAINERS.SIDEKICK]: SidekickComponentProps; + [SIDEKICK_CONTAINERS.GOAL_DETAILS_CONTENT_SLOT_CONTAINER]: GoalDetailsContentSlotComponentProps; }; // --- Deprecated Exports --- //
feat(sidekick): DWORK-8656 added goal details content slot container (#4203)
feat(sidekick): DWORK-8656 added goal details content slot container (#4203) * feat(sidekick): DWORK-8656 added goal details content slot container * fix(sidekick): DWORK-8656 removed component container creation
9e3da04675526795ea387c2fce1c9bcd7f4d4188
--- package.json @@ -145,7 +145,7 @@ "@walmart/shelfavailability-mini-app": "1.5.26", "@walmart/store-feature-orders": "1.26.9", "@walmart/taskit-mini-app": "3.0.2", - "@walmart/time-clock-mini-app": "2.394.0", + "@walmart/time-clock-mini-app": "2.395.0", "@walmart/topstock-mini-app": "1.10.8", "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch", "@walmart/welcomeme-mini-app": "0.94.0", --- yarn.lock @@ -7203,9 +7203,9 @@ __metadata: languageName: node linkType: hard -"@walmart/time-clock-mini-app@npm:2.394.0": - version: 2.394.0 - resolution: "@walmart/time-clock-mini-app@npm:2.394.0" +"@walmart/time-clock-mini-app@npm:2.395.0": + version: 2.395.0 + resolution: "@walmart/time-clock-mini-app@npm:2.395.0" dependencies: "@react-navigation/elements": "npm:^1.3.1" moment-timezone: "npm:0.5.33" @@ -7248,7 +7248,7 @@ __metadata: uuid: ^3.3.2 wifi-store-locator: ^1.4.0 xdate: ^0.8.2 - checksum: 10c0/e53978211566b8f0991756f3acf05e7cee47ffb73a96be0bca3d48ea9c5a1ee5158da0dfa506b892f218e782c01b045b112bd847cb489aa15a363dc22cf83fe4 + checksum: 10c0/4d4e1b5a3f8499bc4e72c6619e2ccde7d80652d72868ae1b7b7e778900bac17a2799be5f234bc168742e20425604cf0066e69906a5ecfb687459452b5b39c595 languageName: node linkType: hard @@ -7860,7 +7860,7 @@ __metadata: "@walmart/shelfavailability-mini-app": "npm:1.5.26" "@walmart/store-feature-orders": "npm:1.26.9" "@walmart/taskit-mini-app": "npm:3.0.2" - "@walmart/time-clock-mini-app": "npm:2.394.0" + "@walmart/time-clock-mini-app": "npm:2.395.0" "@walmart/topstock-mini-app": "npm:1.10.8" "@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.15.14#~/.yarn/patches/@walmart-ui-components-npm-1.15.14-a6f67304be.patch" "@walmart/welcomeme-mini-app": "npm:0.94.0"
Update TCMA to 2.395.0
Update TCMA to 2.395.0
430049180c42dbffc943afb222cfafa427ec0536
--- android/app/build.gradle @@ -134,7 +134,7 @@ android { applicationId "com.walmart.stores.allspark.beta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 19 + versionCode 20 versionName "1.0.1" } splits { --- ios/AllSpark/Info.plist @@ -34,7 +34,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>19</string> + <string>20</string> <key>LSApplicationQueriesSchemes</key> <array> <string>invmgmt</string> --- ios/AllSparkTests/Info.plist @@ -19,6 +19,6 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>19</string> + <string>20</string> </dict> </plist>
Incrementing build number
Incrementing build number
15d26cd507441bea2a5c70cfd033063f13e6af76
--- package-lock.json @@ -58,13 +58,13 @@ "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.0.10", "@walmart/impersonation-mini-app": "1.20.6", - "@walmart/ims-print-services-ui": "2.5.8", + "@walmart/ims-print-services-ui": "2.7.1", "@walmart/inbox-mini-app": "0.88.9", "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "14.0.2", "@walmart/metrics-mini-app": "0.15.14", - "@walmart/mod-flex-mini-app": "1.11.6", + "@walmart/mod-flex-mini-app": "1.13.2", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.10.15", @@ -8501,9 +8501,9 @@ } }, "node_modules/@walmart/ims-print-services-ui": { - "version": "2.5.8", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.8.tgz", - "integrity": "sha512-f00ej+HrIbCvqZ7ZF1miDItI8mL8PG16SgDasGJn4UeEdYnJCHY1ef0Pilz4cl5ptK72mBUP6Y2svb682tq7lw==", + "version": "2.7.1", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.1.tgz", + "integrity": "sha512-WYUgFQZYFuTnfxwi7KO1U1vNuL9W8FQDS5rvokV6JmwMS1ROIvNpmx8zRhUvj4wu+urz5JqWKdmZqWghwEOSJw==", "peerDependencies": { "@react-native-firebase/analytics": ">=10.5.1", "@react-native-firebase/app": ">=10.5.0", @@ -8757,9 +8757,9 @@ "license": "MIT" }, "node_modules/@walmart/mod-flex-mini-app": { - "version": "1.11.6", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.11.6.tgz", - "integrity": "sha512-Qw1WDLt8GOi2StFWZOlB7YNXhTg79JGqpuNmD3N8gSW+WQpJyTcEFo7aeZmEJDUNddM2Fj2Sx+7fddPfmg8shQ==", + "version": "1.13.2", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.13.2.tgz", + "integrity": "sha512-02dinY8mOhS86V7cu+hIts6ffjr+bkibFuaEiU8QzoPQrrDatruMn2MhZeUckpQZxg0t7SeA5Gom8P8eYI1Qfg==", "hasInstallScript": true, "peerDependencies": { "@react-native-async-storage/async-storage": "^1.19.0", @@ -8770,8 +8770,8 @@ "@react-navigation/stack": "^6.1.0", "@walmart/core-services-allspark": "^1.3.1", "@walmart/functional-components": "^2.0.2", - "@walmart/gtp-shared-components": "^2.0.4", - "@walmart/ims-print-services-ui": "^2.5.5", + "@walmart/gtp-shared-components": "^2.1.3", + "@walmart/ims-print-services-ui": "^2.7.1", "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.31.0-rc.0", "@walmart/react-native-scanner-3.0": "^0.1.30-rc.1", @@ -34353,9 +34353,9 @@ "integrity": "sha512-5qaxHHlwLNsI2QOghCAlp1FS3sE0bdJ9DOswgEClQgRdZwFTZTY1F1qWkLmWVdnZm3/k7BTE3RT/Ltfy0rbfxg==" }, "@walmart/ims-print-services-ui": { - "version": "2.5.8", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.8.tgz", - "integrity": "sha512-f00ej+HrIbCvqZ7ZF1miDItI8mL8PG16SgDasGJn4UeEdYnJCHY1ef0Pilz4cl5ptK72mBUP6Y2svb682tq7lw==" + "version": "2.7.1", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.1.tgz", + "integrity": "sha512-WYUgFQZYFuTnfxwi7KO1U1vNuL9W8FQDS5rvokV6JmwMS1ROIvNpmx8zRhUvj4wu+urz5JqWKdmZqWghwEOSJw==" }, "@walmart/inbox-mini-app": { "version": "0.88.9", @@ -34412,9 +34412,9 @@ } }, "@walmart/mod-flex-mini-app": { - "version": "1.11.6", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.11.6.tgz", - "integrity": "sha512-Qw1WDLt8GOi2StFWZOlB7YNXhTg79JGqpuNmD3N8gSW+WQpJyTcEFo7aeZmEJDUNddM2Fj2Sx+7fddPfmg8shQ==" + "version": "1.13.2", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.13.2.tgz", + "integrity": "sha512-02dinY8mOhS86V7cu+hIts6ffjr+bkibFuaEiU8QzoPQrrDatruMn2MhZeUckpQZxg0t7SeA5Gom8P8eYI1Qfg==" }, "@walmart/moment-walmart": { "version": "1.0.4" --- package.json @@ -99,13 +99,13 @@ "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.0.10", "@walmart/impersonation-mini-app": "1.20.6", - "@walmart/ims-print-services-ui": "2.5.8", + "@walmart/ims-print-services-ui": "2.7.1", "@walmart/inbox-mini-app": "0.88.9", "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "14.0.2", "@walmart/metrics-mini-app": "0.15.14", - "@walmart/mod-flex-mini-app": "1.11.6", + "@walmart/mod-flex-mini-app": "1.13.2", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.10.15",
Update print version
Update print version
251349c5a3241152018ac79e287424736980ee9a
--- .looper.multibranch.yml @@ -607,7 +607,7 @@ flows: - var(END_TIME): date +%s - var(TIME_ELAPSED): - $(($END_TIME-START_TIME)) + $(($END_TIME-$START_TIME)) - var(MINUTES): $((($TIME_ELAPSED%3600)/60)) - var(SECONDS):
Update .looper.multibranch.yml
Update .looper.multibranch.yml
abe0d716811ff7cc347f1f69de2a50242882352e
--- package-lock.json @@ -74,7 +74,7 @@ "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", "@walmart/receipt-check-miniapp": "1.10.4", - "@walmart/redux-store": "3.1.4", + "@walmart/redux-store": "3.1.5", "@walmart/returns-mini-app": "0.13.3", "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", @@ -5836,7 +5836,9 @@ } }, "node_modules/@walmart/redux-store": { - "version": "3.1.4", + "version": "3.1.5", + "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-3.1.5.tgz", + "integrity": "sha512-plSA1hYvGf1mUF85cJkJa9pTQ1/2SD+M0glWR3uI1x+4emvesqpqoZuIKbv9mVY/Vy8+ileGqnf7vNRIFkSeAw==", "license": "MIT", "dependencies": { "namecase": "^1.1.2", @@ -25019,7 +25021,7 @@ "requires": { "@walmart/allspark-http-client": "^2.4.10", "@walmart/allspark-utils": "^1.5.2", - "@walmart/redux-store": "3.1.4", + "@walmart/redux-store": "3.1.5", "reduxsauce": "^1.2.1", "reselect": "^4.1.5", "seamless-immutable": "^7.1.4", @@ -25246,7 +25248,9 @@ } }, "@walmart/redux-store": { - "version": "3.1.4", + "version": "3.1.5", + "resolved": "https://npme.walmart.com/@walmart/redux-store/-/redux-store-3.1.5.tgz", + "integrity": "sha512-plSA1hYvGf1mUF85cJkJa9pTQ1/2SD+M0glWR3uI1x+4emvesqpqoZuIKbv9mVY/Vy8+ileGqnf7vNRIFkSeAw==", "requires": { "namecase": "^1.1.2", "reduxsauce": "^1.2.1" --- package.json @@ -116,7 +116,7 @@ "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", "@walmart/receipt-check-miniapp": "1.10.4", - "@walmart/redux-store": "3.1.4", + "@walmart/redux-store": "3.1.5", "@walmart/returns-mini-app": "0.13.3", "@walmart/schedule-mini-app": "0.33.0", "@walmart/settings-mini-app": "1.12.0", --- src/translations/en-US.ts @@ -336,9 +336,9 @@ export const enUS_home = { taskStockingOvernight: 'Stocking Overnight team', taskVision: 'Vision team', }, - teamTaskTitle: 'My Team', - teamTaskTitle_site: 'My Site', - teamTaskTitle_store: 'My Team', + teamTaskTitle: 'My team', + teamTaskTitle_site: 'My site', + teamTaskTitle_store: 'My team', viewRoster: 'View roster', }, todayDateLabel: 'Today is', --- src/translations/es-MX.ts @@ -344,7 +344,9 @@ export const esMX_home = { taskStockingOvernight: 'Equipo de Almacenamiento Nocturno', taskVision: 'Equipo de Visión', }, - teamTaskTitle: 'My Equipo', + teamTaskTitle: 'My equipo', + teamTaskTitle_site: 'My sitio', + teamTaskTitle_store: 'My equipo', viewRoster: 'Ver lista', }, todayDateLabel: 'Hoy es',
fixing translations and bumping redux version
fixing translations and bumping redux version
e07ac481fd42569f9c8e0abbfa5a4702309bf0ee
--- yarn.lock @@ -6520,9 +6520,9 @@ __metadata: languageName: node linkType: hard -"@walmart/inbox-mini-app@npm:0.97.10": - version: 0.97.10 - resolution: "@walmart/inbox-mini-app@npm:0.97.10" +"@walmart/inbox-mini-app@npm:0.97.11": + version: 0.97.11 + resolution: "@walmart/inbox-mini-app@npm:0.97.11" peerDependencies: "@walmart/allspark-foundation": "*" "@walmart/allspark-utils": ">=1.6.4" @@ -6530,7 +6530,7 @@ __metadata: "@walmart/moment-walmart": ">=1.0.4" "@walmart/schedule-mini-app": ">=0.2.66" "@walmart/walmart-fiscal-week": ">=0.3.6" - checksum: 10c0/2d071dcb30b387d4d8a4daa0d9cc2faada66b53f7e99ce0f66db2a2250d354000569669ef653407a088f2ae0538c71a36b0c35ff2988efdad95309ed5b654746 + checksum: 10c0/9a6e7f4875a988433d2d8751952b683924c885eeeecb808abcf7441f5a89b7e1d0d7e687128e77cdd91312caf5c0ef43d630c8d098e205ae7f5c4dd84aa12edf languageName: node linkType: hard @@ -7022,7 +7022,7 @@ __metadata: "@walmart/gta-react-native-calendars": "npm:0.7.0" "@walmart/gtp-shared-components": "npm:2.2.5-rc.1" "@walmart/ims-print-services-ui": "npm:2.15.3" - "@walmart/inbox-mini-app": "npm:0.97.10" + "@walmart/inbox-mini-app": "npm:0.97.11" "@walmart/iteminfo-mini-app": "npm:7.16.2" "@walmart/learning-mini-app": "npm:20.0.38" "@walmart/manager-approvals-miniapp": "npm:0.3.0"
inbox version updated
inbox version updated
524088e9e587ba7dcf55350c678816536ad15a96
--- package-lock.json @@ -58,7 +58,7 @@ "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25", - "@walmart/metrics-mini-app": "0.13.8", + "@walmart/metrics-mini-app": "0.13.9", "@walmart/mod-flex-mini-app": "1.9.4", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14", @@ -5493,9 +5493,9 @@ } }, "node_modules/@walmart/metrics-mini-app": { - "version": "0.13.8", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.8.tgz", - "integrity": "sha512-XHSut4ziab0c9qP0VExfNQPq16rCnuCQxXtyrQ248x3LXMFBBKaqVva+u5mTMmANc3CFBpA6JWW+IPE1zXFi8A==", + "version": "0.13.9", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.9.tgz", + "integrity": "sha512-H7eGAdycKlFH/CIbFmDrDfau9dKNisk0+5Ib4VsFJYZc3RZahcwXl4VrrM3WFZ5uCZHQBoD51pjaIx4irFlURg==", "dependencies": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", @@ -25244,9 +25244,9 @@ "integrity": "sha512-1mxrkjgtoltK8qzmoiVy9/rViZ/GoViHZG+1uYL1rV3o+ByksY7d8+foyY6BNzDfbg/6W2G24bdRMs7vpNf2qw==" }, "@walmart/metrics-mini-app": { - "version": "0.13.8", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.8.tgz", - "integrity": "sha512-XHSut4ziab0c9qP0VExfNQPq16rCnuCQxXtyrQ248x3LXMFBBKaqVva+u5mTMmANc3CFBpA6JWW+IPE1zXFi8A==", + "version": "0.13.9", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.13.9.tgz", + "integrity": "sha512-H7eGAdycKlFH/CIbFmDrDfau9dKNisk0+5Ib4VsFJYZc3RZahcwXl4VrrM3WFZ5uCZHQBoD51pjaIx4irFlURg==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "1.1.2", --- package.json @@ -100,7 +100,7 @@ "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "12.0.25", - "@walmart/metrics-mini-app": "0.13.8", + "@walmart/metrics-mini-app": "0.13.9", "@walmart/mod-flex-mini-app": "1.9.4", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.14",
Bumping metrics-mini-app version to 0.13.9
Bumping metrics-mini-app version to 0.13.9
65bb7b0a253f6bac5119c41a2089b1d15db59724
--- package.json @@ -28,7 +28,7 @@ "us:ios:dev": "yarn workspaces foreach --from 'me-at-walmart-us' -Rpti run ios:dev", "verifyBranchName": "bash ./scripts/verifyBranchName.sh", "uploadBlobToAzure": "node ./scripts/dependencies-map/src/upload-to-azure/upload-to-azure.js", - "buildDependenciesMap": "node ./scripts/dependencies-map/src/deps-crawler/index.js -- -f -dm -dc path='./scripts/dependencies-maps/src/config/deps-source.json' chunk_size=20" + "buildDependenciesMap": "node ./scripts/dependencies-map/src/deps-crawler/index.js -- -f -dm -dc path='./scripts/dependencies-map/src/config/deps-source.json' chunk_size=20" }, "devDependencies": { "@azure/storage-blob": "^12.26.0",
fix: typo
fix: typo
4948f41cdda23fe17ff756e8b96264bc01bcf324
--- __tests__/remoteConfig/wmConfigTest.ts @@ -1,9 +1,8 @@ -import WmConfig from '@/remoteConfig/wmConfig'; +import WmConfig, {subscribeWithRetry} from '@/remoteConfig/wmConfig'; import remoteConfig, { FirebaseRemoteConfigTypes as RCTypes, } from '@react-native-firebase/remote-config'; import {waitFor} from '@testing-library/react-native'; - import {backOff} from 'exponential-backoff' // Mock exponential-backoff @@ -238,4 +237,86 @@ describe('firebaseRemoteConfigImpl', () => { }); }); + describe('subscribeWithRetry', () => { + beforeEach(() => { + jest.clearAllMocks(); + console.log = jest.fn(); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); + + it('should clear existing listener before setting a new one', async () => { + // Setup a mock unsubscriber + const mockUnsubscriber = jest.fn(); + (remoteConfig().onConfigUpdated as jest.Mock).mockReturnValue(mockUnsubscriber); + + // First subscription + const promise1 = subscribeWithRetry(); + + // Trigger successful update for first subscription + const mockCallback1 = (remoteConfig().onConfigUpdated as jest.Mock).mock.calls[0][0]; + mockCallback1({updatedKeys: ['key1']}); + + await promise1; // Wait for first subscription to complete + + // Second subscription - should clear the first one + subscribeWithRetry(); + + // Verify first unsubscriber was called + expect(mockUnsubscriber).toHaveBeenCalledTimes(1); + }); + + it('should resolve when update is successful', async () => { + const mockEvent = {updatedKeys: ['test_key']}; + const mockUnsubscriber = jest.fn(); + + (remoteConfig().onConfigUpdated as jest.Mock).mockImplementation((callback) => { + // Schedule callback to run on next tick + setTimeout(() => callback(mockEvent), 0); + return mockUnsubscriber; + }); + + // Call the function and await its result + const resultPromise = subscribeWithRetry(); + + await expect(resultPromise).resolves.not.toThrow(); + + // Ensure activate was called + expect(remoteConfig().activate).toHaveBeenCalled(); + + // Ensure log was called with the event + expect(console.log).toHaveBeenCalledWith( + 'remote-config updated keys: ', + JSON.stringify(mockEvent) + ); + }); + + it('should reject when update fails', async () => { + const mockError = {message: 'Config update failed'}; + const mockUnsubscriber = jest.fn(); + + (remoteConfig().onConfigUpdated as jest.Mock).mockImplementation((callback) => { + // Schedule callback to run on next tick with error + setTimeout(() => callback(null, mockError), 0); + return mockUnsubscriber; + }); + + // Call the function + const resultPromise = subscribeWithRetry(); + + // Verify it rejects with the correct error + await expect(resultPromise).rejects.toThrow('Config update failed'); + + // Ensure log was called with the error + expect(console.log).toHaveBeenCalledWith( + 'Error occurred while updating remote config:', + mockError + ); + }); + + }); + + }); --- packages/me-at-walmart-container/package.json @@ -32,6 +32,7 @@ "@react-native-firebase/crashlytics": "21.x", "@react-native-firebase/database": "21.x", "@react-native-firebase/perf": "21.x", + "@react-native-firebase/remote-config": "21.x", "@walmart/allspark-authentication": ">=6.4.0", "@walmart/allspark-foundation": ">=6.26.0", "@walmart/allspark-utils": ">=6.5.0", --- packages/me-at-walmart-container/src/services/site/index.ts @@ -10,7 +10,7 @@ export const getSiteInfo = async ( forceRefresh = false, ) => { const useBffStore = remoteConfig() - .getValue(`${'core'}_${'useBffStoreConfig'}`) + .getValue('core_useBffStoreConfig') .asBoolean(); if (useBffStore) { SiteLoggerService.info( --- src/remoteConfig/wmConfig.ts @@ -9,6 +9,31 @@ let remoteConfigListenerUnsubscriber: (() => void) | undefined; const createNamespacedKey = (appName: string, key: string): string => `${appName}_${key}`; +/** + * Subscribes to remote config updates and returns a promise that resolves when + * config is updated or rejects if there's an error. + */ +export const subscribeWithRetry = () => { + return new Promise<void>((resolve, reject) => { + // Clear any existing listener first + if (remoteConfigListenerUnsubscriber) { + remoteConfigListenerUnsubscriber(); + remoteConfigListenerUnsubscriber = undefined; + } + + remoteConfigListenerUnsubscriber = remoteConfig().onConfigUpdated((event, error) => { + if (error !== undefined) { + console.log('Error occurred while updating remote config:', error); + reject(new Error(error.message)); + } else { + // Updated keys are keys that are added, removed, or changed value, metadata, or source + console.log('remote-config updated keys: ', JSON.stringify(event)); + remoteConfig().activate(); + resolve(); + } + }); + }); +}; const WmConfig: WMRemoteConfig = { /** @@ -59,28 +84,6 @@ const WmConfig: WMRemoteConfig = { * Subscribe to remote config updates with exponential backoff retry logic */ subscribeToRealtimeUpdates() { - const subscribeWithRetry = () => { - return new Promise<void>((resolve, reject) => { - // Clear any existing listener first - if (remoteConfigListenerUnsubscriber) { - remoteConfigListenerUnsubscriber(); - remoteConfigListenerUnsubscriber = undefined; - } - - remoteConfigListenerUnsubscriber = remoteConfig().onConfigUpdated((event, error) => { - if (error !== undefined) { - console.log('Error occurred while updating remote config:', error); - reject(error); - } else { - // Updated keys are keys that are added, removed, or changed value, metadata, or source - console.log('remote-config updated keys: ', JSON.stringify(event)); - remoteConfig().activate(); - resolve(); - } - }); - }); - }; - // Use exponential backoff for retry logic backOff(subscribeWithRetry, { numOfAttempts: 4, --- yarn.lock @@ -7504,6 +7504,7 @@ __metadata: "@react-native-firebase/crashlytics": 21.x "@react-native-firebase/database": 21.x "@react-native-firebase/perf": 21.x + "@react-native-firebase/remote-config": 21.x "@walmart/allspark-authentication": ">=6.4.0" "@walmart/allspark-foundation": ">=6.26.0" "@walmart/allspark-utils": ">=6.5.0"
feat(remoteconfig): ALLSPARK-6396 code refactor
feat(remoteconfig): ALLSPARK-6396 code refactor
895c82b585f6edff57f2c6bc023a5a301605cd5c
--- package.json @@ -64,7 +64,7 @@ "@sharcoux/slider": "^5.2.1", "@terrylinla/react-native-sketch-canvas": "^0.8.0", "@walmart/allspark-health-survey-mini-app": "0.0.41", - "@walmart/allspark-home-mini-app": "0.4.12-test.0", + "@walmart/allspark-home-mini-app": "0.4.13-test.0", "@walmart/allspark-me-mini-app": "0.1.0", "@walmart/ask-sam-mini-app": "0.30.2", "@walmart/config-components": "^1.0.26",
bumping home version for covid banner
bumping home version for covid banner
5be1afeedf99068e0f82912e85645faa06166a1a
--- __tests__/components/ErrorComponentTest.tsx @@ -0,0 +1,18 @@ +import React from 'react'; +import {renderWithProviders} from '../harness'; +import {ErrorComponent} from '../../src/components/ErrorComponent'; + +describe('ErrorComponent tests', () => { + it('ErrorComponent snapshot test', () => { + const errorComponent = renderWithProviders(<ErrorComponent />); + expect(errorComponent).toMatchSnapshot(); + }); + + it('should render ErrorComponent', () => { + const errorComponent = renderWithProviders(<ErrorComponent />); + const errorMessage = errorComponent.getByText('Connection lost'); + const errorView = errorComponent.getByTestId('errorView'); + expect(errorView).toBeDefined(); + expect(errorMessage).toBeDefined(); + }); +}); --- __tests__/components/__snapshots__/ErrorComponentTest.tsx.snap @@ -0,0 +1,102 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ErrorComponent tests ErrorComponent snapshot test 1`] = ` +<View + style={ + { + "padding": 15, + } + } + testID="errorView" +> + <View + style={ + [ + { + "alignItems": "flex-start", + "borderBottomWidth": 1, + "borderLeftWidth": 4, + "borderRadius": 4, + "borderRightWidth": 1, + "borderTopWidth": 1, + "flexDirection": "row", + "paddingLeft": 12, + "paddingRight": 15, + "paddingVertical": 6, + }, + { + "backgroundColor": "#fce8e9", + "borderBottomColor": "#ef8e92", + "borderLeftColor": "#de1c24", + "borderRightColor": "#ef8e92", + "borderTopColor": "#ef8e92", + }, + undefined, + ] + } + testID="Alert" + > + <View + style={ + { + "marginRight": 8, + "marginTop": 2, + } + } + > + <Image + accessibilityRole="image" + source={ + { + "testUri": "../../@walmart/gtp-shared-icons/assets/images/icons/ExclamationCircle-16.png", + } + } + style={ + [ + { + "height": 16, + "tintColor": "#9b1419", + "width": 16, + }, + {}, + ] + } + testID="ExclamationCircleIcon" + /> + </View> + <View + style={ + { + "alignItems": "flex-start", + "flex": 1, + "flexDirection": "row", + "flexWrap": "wrap", + "justifyContent": "flex-start", + } + } + > + <Text + accessibilityRole="alert" + style={ + [ + { + "fontFamily": "Bogle", + "fontSize": 14, + "fontStyle": "normal", + "fontWeight": "400", + "lineHeight": 20, + "marginRight": 16, + "maxWidth": "95%", + }, + { + "color": "#9b1419", + }, + ] + } + > + Connection lost + </Text> + </View> + </View> +</View> +`; --- src/components/ErrorComponent.tsx @@ -9,7 +9,7 @@ const styles = StyleSheet.create({ }); export const ErrorComponent = () => { return ( - <View style={styles.errorView}> + <View style={styles.errorView} testID='errorView'> <Alert variant='error' children={'Connection lost'} /> </View> );
Adding error component test coverage
Adding error component test coverage
2873a9cd4cc0faf4c0ec732e8a14c97b690739dd
--- core/src/manifest.ts @@ -76,6 +76,7 @@ export const getAssociateFeatures = (): AllsparkFeatureModule[] => { require('@walmart/mod-flex-mini-app').default, require('@walmart/shelfavailability-mini-app').default, require('@walmart/rfid-scan-mini-app').default, + require('@walmart/wm-plus-mini-app').default, ); } --- targets/US/package.json @@ -160,7 +160,7 @@ "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "0.99.0", "@walmart/wfm-ui": "2.4.0", - "@walmart/wm-plus-mini-app": "1.0.2", + "@walmart/wm-plus-mini-app": "1.4.4", "@walmart/wmconnect-mini-app": "2.6.0", "axios": "~1.6.0", "axios-cache-adapter": "patch:axios-cache-adapter@npm%3A2.7.3#~/.yarn/patches/axios-cache-adapter-npm-2.7.3-26c357b785.patch", --- yarn.lock @@ -7397,7 +7397,7 @@ __metadata: "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:0.99.0" "@walmart/wfm-ui": "npm:2.4.0" - "@walmart/wm-plus-mini-app": "npm:1.0.2" + "@walmart/wm-plus-mini-app": "npm:1.4.4" "@walmart/wmconnect-mini-app": "npm:2.6.0" adaptive-expressions: "npm:^4.13.5" adaptivecards-templating: "npm:^2.1.0" @@ -8588,17 +8588,19 @@ __metadata: languageName: node linkType: hard -"@walmart/wm-plus-mini-app@npm:1.0.2": - version: 1.0.2 - resolution: "@walmart/wm-plus-mini-app@npm:1.0.2" +"@walmart/wm-plus-mini-app@npm:1.4.4": + version: 1.4.4 + resolution: "@walmart/wm-plus-mini-app@npm:1.4.4" peerDependencies: - "@react-navigation/native": ^6.0.0 - "@react-navigation/stack": ^6.1.0 - "@walmart/core-services": ~2.0.11 - "@walmart/gtp-shared-components": 2.0.10 - react: ^18.1.0 - react-native: ^0.70.5 - checksum: 10c0/d1582cd04f4e722490d2a6b83998422a335e9aa4253c8316f61b1c83301b7d5f4b4ac4f966e7fc3fcd8854c7e3f10cb88ebe128d38aa3f45b4b10a764155ac8c + "@walmart/allspark-foundation": ">=6.0.0" + expo: 50.0.17 + expo-image: 1.5.2 + react: "*" + react-native: "*" + dependenciesMeta: + "@walmart/me-at-walmart": + built: false + checksum: 10c0/332cca3d705487af8556f4f4e31c1da46896924a94a1e64edfdf73afba3a118b7996dbc6b242dc6347824bace9e3b52bd79b5b15e54d14b950e73972bbd8b2fb languageName: node linkType: hard
feat(CEWMPLUS-113120): allspark foundation migration for walmart plus mini app
feat(CEWMPLUS-113120): allspark foundation migration for walmart plus mini app
f4ea88915ec14428462d1244face7248b9bca455
--- package-lock.json @@ -64,7 +64,7 @@ "@walmart/OneWalmart-MiniApp": "1.0.12", "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", - "@walmart/price-changes-mini-app": "1.7.4", + "@walmart/price-changes-mini-app": "1.7.5", "@walmart/profile-feature-app": "0.76.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -5660,9 +5660,9 @@ } }, "node_modules/@walmart/price-changes-mini-app": { - "version": "1.7.4", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.7.4.tgz", - "integrity": "sha512-es6vHx+hDCOJbsvLEQEQ5CcpmGzRYXOrw53w/hSBwkweAunQTOgITEwXclbyYjnxAGpbTxb7fpNn5T133Jnm/g==", + "version": "1.7.5", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.7.5.tgz", + "integrity": "sha512-Dd6nDsgkEzJs3yqJpYnbuHOW00r9GSDLu2fDV+pUjqZLyKW/hZGTjvB0LVstgmkqTJiIvVp5wCqZ0TZQ3K1BXA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25315,9 +25315,9 @@ } }, "@walmart/price-changes-mini-app": { - "version": "1.7.4", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.7.4.tgz", - "integrity": "sha512-es6vHx+hDCOJbsvLEQEQ5CcpmGzRYXOrw53w/hSBwkweAunQTOgITEwXclbyYjnxAGpbTxb7fpNn5T133Jnm/g==" + "version": "1.7.5", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.7.5.tgz", + "integrity": "sha512-Dd6nDsgkEzJs3yqJpYnbuHOW00r9GSDLu2fDV+pUjqZLyKW/hZGTjvB0LVstgmkqTJiIvVp5wCqZ0TZQ3K1BXA==" }, "@walmart/profile-feature-app": { "version": "0.76.0", --- package.json @@ -106,7 +106,7 @@ "@walmart/OneWalmart-MiniApp": "1.0.12", "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", - "@walmart/price-changes-mini-app": "1.7.4", + "@walmart/price-changes-mini-app": "1.7.5", "@walmart/profile-feature-app": "0.76.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3",
Bump PC to 1.7.5
Bump PC to 1.7.5