commit_hash stringlengths 40 40 | input stringlengths 13 7.99k | output stringlengths 5 155 | full_message stringlengths 6 8.96k |
|---|---|---|---|
fee5f205d6cfa0d2cefb28cfcfcb6a1c700cc769 | --- src/index.tsx
@@ -1,6 +1,7 @@
import React, {Component} from 'react';
import codePush from 'react-native-code-push';
+import {AllsparkNotificationClient} from '@walmart/allspark-foundation/Notification';
import {MeAtWalmartContainer} from '@walmart/me-at-walmart-container';
import {IMeAtWalmartEnvironment} from '@walmart/me-at-walmart-common';
import {EnvironmentType} from '@walmart/allspark-foundation/Environment';
@@ -8,6 +9,11 @@ import {EnvironmentType} from '@walmart/allspark-foundation/Environment';
import {RootStackNavigation} from './navigation';
import {ENV, ENV_OVERRIDES} from '../env';
+/**
+ * Pause notifications while the app is starting up.
+ */
+AllsparkNotificationClient.pauseNotifications();
+
/**
* Any setup that needs to happen before the app is registered.
*/
--- src/startup/StartupFlow.ts
@@ -18,6 +18,7 @@ import {handleSurveyPrompt} from '../survey/SurveySaga';
import {handleAppReviewPrompt} from '../appReview/sagas';
import {handleSiteIdPrompt} from './UserFlow';
import {handleCallingOnboarding} from '../calling/CallingSagas';
+import {AllsparkNotificationClient} from '@walmart/allspark-foundation/Notification';
export function* candidateStartupFlow() {
// Terms of Use
@@ -70,6 +71,9 @@ export function* associateStartupFlow() {
// Trigger calling app onboarding flow
yield call(handleCallingOnboarding);
+
+ // Resume notifications now that the app is fully started
+ AllsparkNotificationClient.resumeNotifications();
}
export function* startupFlow() {
| fix: add pause and resume notifications to delay notification events for mini apps | fix: add pause and resume notifications to delay notification events for mini apps
|
4e92837b4eca2046a8c69eb94e6ad124c22ba055 | --- package-lock.json
@@ -43,7 +43,7 @@
"@walmart/attendance-mini-app": "1.62.13",
"@walmart/compass-sdk-rn": "5.18.9",
"@walmart/config-components": "4.2.13",
- "@walmart/copilot-mini-app": "3.26.3",
+ "@walmart/copilot-mini-app": "^3.26.4",
"@walmart/core-services": "~2.3.0",
"@walmart/core-services-allspark": "~2.13.4",
"@walmart/core-utils": "~2.0.5",
@@ -8592,9 +8592,9 @@
}
},
"node_modules/@walmart/copilot-mini-app": {
- "version": "3.26.3",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.26.3.tgz",
- "integrity": "sha512-p2rHS45LjrZLUa8HY0yUuH3sTNl+7wHLwK0c2pKFqpGOzJjEuQJhHs473HB6xociAZmuCugQf8fOMaw6wC8E3w==",
+ "version": "3.26.4",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.26.4.tgz",
+ "integrity": "sha512-tI2LMVq9Aosut0GG1j+3sPN7BQyUgoIyAzdk6gySTaB12p2i1UB9/fnf/VDD0tWNY6I7ckLmp1BOFSybihhUaA==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -33225,9 +33225,9 @@
}
},
"@walmart/copilot-mini-app": {
- "version": "3.26.3",
- "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.26.3.tgz",
- "integrity": "sha512-p2rHS45LjrZLUa8HY0yUuH3sTNl+7wHLwK0c2pKFqpGOzJjEuQJhHs473HB6xociAZmuCugQf8fOMaw6wC8E3w=="
+ "version": "3.26.4",
+ "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-3.26.4.tgz",
+ "integrity": "sha512-tI2LMVq9Aosut0GG1j+3sPN7BQyUgoIyAzdk6gySTaB12p2i1UB9/fnf/VDD0tWNY6I7ckLmp1BOFSybihhUaA=="
},
"@walmart/core-services": {
"version": "2.3.2",
--- package.json
@@ -84,7 +84,7 @@
"@walmart/attendance-mini-app": "1.62.13",
"@walmart/compass-sdk-rn": "5.18.9",
"@walmart/config-components": "4.2.13",
- "@walmart/copilot-mini-app": "3.26.3",
+ "@walmart/copilot-mini-app": "3.26.4",
"@walmart/core-services": "~2.3.0",
"@walmart/core-services-allspark": "~2.13.4",
"@walmart/core-utils": "~2.0.5",
| fix: bump copilot@3.26.4 | fix: bump copilot@3.26.4
|
2433ee650a42ab90b39a53ab6c5cd0159720283f | --- package.json
@@ -143,7 +143,7 @@
"@walmart/react-native-cookies": "1.0.1",
"@walmart/react-native-encrypted-storage": "~1.1.3",
"@walmart/react-native-logger": "1.38.1",
- "@walmart/react-native-scanner-3.0": "0.15.8",
+ "@walmart/react-native-scanner-3.0": "0.15.10",
"@walmart/react-native-shared-navigation": "~6.3.28",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.8.0",
--- yarn.lock
@@ -8384,7 +8384,7 @@ __metadata:
"@walmart/react-native-cookies": "npm:1.0.1"
"@walmart/react-native-encrypted-storage": "npm:~1.1.3"
"@walmart/react-native-logger": "npm:1.38.1"
- "@walmart/react-native-scanner-3.0": "npm:0.15.8"
+ "@walmart/react-native-scanner-3.0": "npm:0.15.10"
"@walmart/react-native-shared-navigation": "npm:~6.3.28"
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
@@ -8914,12 +8914,12 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/react-native-scanner-3.0@npm:0.15.8":
- version: 0.15.8
- resolution: "@walmart/react-native-scanner-3.0@npm:0.15.8::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-scanner-3.0%2F-%2F%40walmart%2Freact-native-scanner-3.0-0.15.8.tgz"
+"@walmart/react-native-scanner-3.0@npm:0.15.10":
+ version: 0.15.10
+ resolution: "@walmart/react-native-scanner-3.0@npm:0.15.10::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-scanner-3.0%2F-%2F%40walmart%2Freact-native-scanner-3.0-0.15.10.tgz"
peerDependencies:
react-native: ">=0.47.1"
- checksum: 10c0/a36e06183eafa2e1336c1cbb2f9bc7815d113d2355cc54074850b4ee44b76135afdfb231c4c5d56eae8411e6bf0aafce15718d097688cdeb746f12aabc97cf96
+ checksum: 10c0/f18ce0dab43e809691f5a87b138888c9d0d908d73bfc4705d23a5ba2565fd1e2eed4b56a7ff33fb0b5becf4155a02042a1e444b4c7c927894835c630c2fa6d00
languageName: node
linkType: hard
| fix: scanner upgrade to 0.15.10 (#4913) | fix: scanner upgrade to 0.15.10 (#4913)
Co-authored-by: t0s0qvk <t0s0qvk@walmart.com>
Co-authored-by: Maksym Novakh - m0n09mr <Maksym.Novakh0@walmart.com> |
308e3173be0d44461f74a53eca845b1acfd6036f | --- targets/US/package.json
@@ -101,7 +101,7 @@
"@walmart/counts-component-miniapp": "0.1.13",
"@walmart/emergency-mini-app": "1.29.10",
"@walmart/exception-mini-app": "1.8.11",
- "@walmart/facilities-management-miniapp": "0.14.6",
+ "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.15.7#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch",
"@walmart/feedback-all-spark-miniapp": "0.9.71",
"@walmart/financial-wellbeing-feature-app": "1.26.0",
"@walmart/functional-components": "~6.3.28",
--- yarn.lock
@@ -7016,7 +7016,7 @@ __metadata:
"@walmart/counts-component-miniapp": "npm:0.1.13"
"@walmart/emergency-mini-app": "npm:1.29.10"
"@walmart/exception-mini-app": "npm:1.8.11"
- "@walmart/facilities-management-miniapp": "npm:0.14.6"
+ "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.15.7#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.15.7-5b9d1150f9.patch"
"@walmart/feedback-all-spark-miniapp": "npm:0.9.71"
"@walmart/financial-wellbeing-feature-app": "npm:1.26.0"
"@walmart/functional-components": "npm:~6.3.28"
| GDVCVR-17270 retrigger build | GDVCVR-17270 retrigger build
|
faafb9996d8e3233947aa7faaa839585d36115fe | --- packages/associate-exp-hub-team-switcher/CHANGELOG.md
@@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+# [2.25.0](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-team-switcher@2.24.1...@walmart/associate-exp-hub-team-switcher@2.25.0) (2025-12-22)
+
+### Features
+
+- **ui:** fix the loader issue ([7ea8a23](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/7ea8a236e3359122d521d23aaae5b10c77bc48c5))
+- **ui:** fix the loader issue ([e2a8a1e](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/e2a8a1e1c7bc0e10e2932b07bd09a7a21998f292))
+- **ui:** fix the loader issue ([b7b6de5](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/b7b6de5793b5d0ea63d0f05ba9a4f982243e162b))
+- **ui:** lint fix ([6c2ff26](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/6c2ff26f9b120398632099cda3f7403733f9f73f))
+- **ui:** updated selection logic ([7c9e69f](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/7c9e69f95d38f63c0852fe138ef30f83257835f5))
+- **ui:** updated selection logic ([37eda36](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/commit/37eda369ef0b9e32d142164bd1577c2ce50fa247))
+
## [2.24.1](https://gecgithub01.walmart.com/allspark/associate-exp-hub-mini-app/compare/@walmart/associate-exp-hub-team-switcher@2.24.0...@walmart/associate-exp-hub-team-switcher@2.24.1) (2025-12-22)
**Note:** Version bump only for package @walmart/associate-exp-hub-team-switcher
--- packages/associate-exp-hub-team-switcher/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/associate-exp-hub-team-switcher",
- "version": "2.24.1",
+ "version": "2.25.0",
"description": "Team Switcher module for Associate Experience Hub",
"packageManager": "yarn@4.6.0",
"engines": {
| chore(version): updating package version | chore(version): updating package version
- @walmart/associate-exp-hub-team-switcher@2.25.0
|
2021959ac3ba187e457f9b5b0b6c0501dbfd3ce8 | --- package-lock.json
@@ -133,6 +133,7 @@
"react-native-location-enabler": "^4.1.1",
"react-native-loudness": "^2.0.0",
"react-native-maps": "^1.3.2",
+ "react-native-mask-input": "^1.2.3",
"react-native-modal": "^13.0.1",
"react-native-new-snap-carousel": "^3.9.3",
"react-native-pager-view": "^6.0.1",
@@ -215,7 +216,6 @@
"patch-package": "^6.5.0",
"prettier": "^2.0.4",
"react-native-apollo-devtools-client": "^1.0.4",
- "react-native-mask-input": "^1.2.3",
"react-native-version": "^4.0.0",
"react-test-renderer": "^18.2.0",
"solidarity": "^3.0.4",
@@ -17819,7 +17819,6 @@
},
"node_modules/react-native-mask-input": {
"version": "1.2.3",
- "dev": true,
"license": "MIT",
"peerDependencies": {
"react": "*",
@@ -32932,8 +32931,7 @@
}
},
"react-native-mask-input": {
- "version": "1.2.3",
- "dev": true
+ "version": "1.2.3"
},
"react-native-material-menu": {
"version": "0.4.2",
--- package.json
@@ -175,6 +175,7 @@
"react-native-location-enabler": "^4.1.1",
"react-native-loudness": "^2.0.0",
"react-native-maps": "^1.3.2",
+ "react-native-mask-input": "^1.2.3",
"react-native-modal": "^13.0.1",
"react-native-new-snap-carousel": "^3.9.3",
"react-native-pager-view": "^6.0.1",
@@ -282,7 +283,6 @@
"patch-package": "^6.5.0",
"prettier": "^2.0.4",
"react-native-apollo-devtools-client": "^1.0.4",
- "react-native-mask-input": "^1.2.3",
"react-native-version": "^4.0.0",
"react-test-renderer": "^18.2.0",
"solidarity": "^3.0.4",
| added mack input | added mack input
|
b22b984f1200bbaf5376dd9099b4cbc364fcf8d6 | --- .looper.multibranch.yml
@@ -7,5 +7,5 @@ envs:
global:
variables:
ANDROID_ANALYZE_SIZE_ENABLED: true
- ALLSPARK_STRIP_BINARY_SYMBOLS: true
+ ALLSPARK_STRIP_BINARY_SYMBOLS: false
\ No newline at end of file
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart",
- "version": "1.33.0",
+ "version": "1.33.3",
"main": "index.js",
"private": true,
"workspaces": [
| fix(strip-disable): disabled symbol stripping | fix(strip-disable): disabled symbol stripping
|
809c22efb4ad0038178f654c15bbade04914c001 | --- targets/US/package.json
@@ -146,7 +146,7 @@
"@walmart/shelfavailability-mini-app": "1.5.33",
"@walmart/sidekick-mini-app": "4.80.1",
"@walmart/store-feature-orders": "1.26.12",
- "@walmart/taskit-mini-app": "4.17.10",
+ "@walmart/taskit-mini-app": "4.17.12",
"@walmart/time-clock-mini-app": "2.400.0",
"@walmart/topstock-mini-app": "1.15.20",
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch",
--- yarn.lock
@@ -6872,7 +6872,7 @@ __metadata:
"@walmart/shelfavailability-mini-app": "npm:1.5.33"
"@walmart/sidekick-mini-app": "npm:4.80.1"
"@walmart/store-feature-orders": "npm:1.26.12"
- "@walmart/taskit-mini-app": "npm:4.17.10"
+ "@walmart/taskit-mini-app": "npm:4.17.12"
"@walmart/time-clock-mini-app": "npm:2.400.0"
"@walmart/topstock-mini-app": "npm:1.15.20"
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch"
@@ -7777,12 +7777,12 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/taskit-mini-app@npm:4.17.10":
- version: 4.17.10
- resolution: "@walmart/taskit-mini-app@npm:4.17.10"
+"@walmart/taskit-mini-app@npm:4.17.12":
+ version: 4.17.12
+ resolution: "@walmart/taskit-mini-app@npm:4.17.12"
peerDependencies:
"@walmart/allspark-foundation": "*"
- checksum: 10c0/be52835e959fcf99cec6888fd212193633299a1f31f290eeb92d6399793588ea6b7abcb7705d2673fe7f3d5a14e6f88fe963a5db61ab98e07a412d519cb3bd21
+ checksum: 10c0/eb68fd170645d55dc32291d1b3b3743f987d773b05ffe54837e99ec6e88ec3b814550131f99aa20725fca670787c392b3f545157412e8dd7414d500bc8c049a7
languageName: node
linkType: hard
| chore: bump taskit version | chore: bump taskit version
|
4b03e01fca06440f037d9270403e2aad8d2a2d4e | --- src/components/ActionButton/index.tsx
@@ -36,7 +36,7 @@ export const ActionButton = ({
});
return (
<TouchableOpacity disabled={disabled} {...buttonProps}>
- <Animated.View style={[styles.button, disabled && disabledStyle]}>
+ <Animated.View style={[styles.button, disabledStyle]}>
{loading ? (
<ActivityIndicator size='small' />
) : (
| fix: SMDV-8876 fix(ui): send button color looks disabled | fix: SMDV-8876 fix(ui): send button color looks disabled
|
f8ef7c617cba969c860530b0638a8219898e2e83 | --- .looper.multibranch.yml
@@ -73,6 +73,8 @@ envs:
APP_TITLE: "AllSpark-Core"
SLACK_WEBHOOK: "https://hooks.slack.com/services/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"
+ BASE_PROXIMITY_RELEASE_URL: "https://repository.walmart.com/content/repositories/labs_releases"
+
## os's
ios:
variables:
@@ -317,7 +319,7 @@ flows:
- try:
- var(version): sh scripts/getIOSAppVersionFromInfoPlist.sh ios/AllSpark/Info.plist
- var(artifactId = "allspark-core-${os}-${env}")
- - var(fullUrl = "${baseUrl}/com/walmart/store/allspark/${artifactId}/${version}/${artifactId}-${version}.${packaging}")
+ - var(fullUrl = "${BASE_PROXIMITY_RELEASE_URL}/com/walmart/store/allspark/${artifactId}/${version}/${artifactId}-${version}.${packaging}")
- var(result):
sh scripts/isResourcePresent.sh ${fullUrl}
- echo "checked for ${fullUrl}; result is ${result}"
| add proximity url | add proximity url
|
ecd86642acccfd6950bc63791b18d0a7b24e82c9 | --- __tests__/core/loggerInitTest.ts
@@ -61,6 +61,7 @@ import {
} from '../../src/core/loggerInit';
import {getDeviceType, getLogLevel} from '../../src/redux/SharedSelectors';
import {ELevel} from '../__mocks__/@walmart/react-native-logger';
+import {SumoSelectors, SumoTypes} from '../../src/redux/SumoRedux';
const expectedSysInfo = {
appVersion: '1.0.0',
@@ -167,6 +168,7 @@ describe('onUserChanged', () => {
isEmulator: 'false',
};
const encryptedKey = '1234';
+ const sumoProfileId = '';
expect(iterator.next().value).toEqual(select(getOriginalUserId));
expect(iterator.next(user.userId).value).toEqual(select(getOriginalSite));
@@ -186,6 +188,9 @@ describe('onUserChanged', () => {
call(getAppConfigLogLevel),
);
expect(iterator.next(appConfigLogLevel).value).toEqual(
+ select(SumoSelectors.getProfileId),
+ );
+ expect(iterator.next(sumoProfileId).value).toEqual(
call(DefaultLogger.setUserInfo, {
country: user.countryCode,
userId: user.userId,
@@ -196,6 +201,7 @@ describe('onUserChanged', () => {
regionNumber: '',
impersonating: 'false',
appConfigLogLevel,
+ sumoProfileId: 'unset',
...sysInfo,
} as TUserInfo),
);
@@ -210,6 +216,7 @@ describe('onUserChanged', () => {
isEmulator: 'false',
};
const encryptedKey = '1234';
+ const sumoProfileId = '54321';
expect(iterator.next().value).toEqual(select(getOriginalUserId));
expect(iterator.next(user.userId).value).toEqual(select(getOriginalSite));
@@ -229,6 +236,9 @@ describe('onUserChanged', () => {
call(getAppConfigLogLevel),
);
expect(iterator.next(appConfigLogLevel).value).toEqual(
+ select(SumoSelectors.getProfileId),
+ );
+ expect(iterator.next(sumoProfileId).value).toEqual(
call(DefaultLogger.setUserInfo, {
country: user.countryCode,
userId: user.userId,
@@ -239,6 +249,7 @@ describe('onUserChanged', () => {
regionNumber: '',
impersonating: 'false',
appConfigLogLevel,
+ sumoProfileId,
...sysInfo,
} as TUserInfo),
);
@@ -281,6 +292,7 @@ describe('onUserChanged', () => {
userType: 'PRE_HIRE',
emailId: 'testuser@mailinator.com',
};
+ const sumoProfileId = '54321';
const iterator = onUserChanged();
@@ -306,6 +318,9 @@ describe('onUserChanged', () => {
call(getAppConfigLogLevel),
);
expect(iterator.next(appConfigLogLevel).value).toEqual(
+ select(SumoSelectors.getProfileId),
+ );
+ expect(iterator.next(sumoProfileId).value).toEqual(
call(DefaultLogger.setUserInfo, {
country: 'US',
userId: preHireUser.emailId,
@@ -316,6 +331,7 @@ describe('onUserChanged', () => {
regionNumber: '',
impersonating: 'false',
appConfigLogLevel,
+ sumoProfileId,
...sysInfo,
} as TUserInfo),
);
@@ -416,7 +432,11 @@ describe('loggerInitSagas', () => {
expect(iterator.next().value).toEqual(
all([
takeLatest(
- [...USER_CHANGED_ACTIONS, 'global/CONFIG_FETCH_SUCCESS'],
+ [
+ ...USER_CHANGED_ACTIONS,
+ 'global/CONFIG_FETCH_SUCCESS',
+ SumoTypes.PROFILE_SUCCESS,
+ ],
onUserChanged,
),
takeLatest(
--- __tests__/redux/SumoReduxTest.ts
@@ -2,6 +2,7 @@ import {
SumoActionCreators,
sumoInitReducer,
INITIAL_STATE,
+ SumoSelectors,
} from '../../src/redux/SumoRedux';
describe('reducer', () => {
@@ -56,3 +57,31 @@ describe('reducer', () => {
expect(state.profileError).toEqual(err);
});
});
+
+describe('selectors', () => {
+ describe('getSumoState', () => {
+ it('gets the state slice for sumo', () => {
+ const state = {
+ sumo: {
+ junk: 'stuff',
+ },
+ };
+
+ const selected = SumoSelectors.getSumoState(state);
+ expect(selected).toEqual(state.sumo);
+ });
+ });
+
+ describe('getProfileId', () => {
+ it('gets the sumo profile id from sumo state slice', () => {
+ const state = {
+ sumo: {
+ profileId: '1234',
+ },
+ };
+
+ const selected = SumoSelectors.getProfileId(state);
+ expect(selected).toEqual(state.sumo.profileId);
+ });
+ });
+});
--- src/core/loggerInit.ts
@@ -35,6 +35,7 @@ import {
import {encryptUserId} from '../services/MaskUserId';
import {defaultCountryCode} from '../transforms/user';
import {getDeviceType, getLogLevel} from '../redux/SharedSelectors';
+import {SumoTypes, SumoSelectors} from '../redux/SumoRedux';
import env from '../../env';
import {ELevel} from '@walmart/react-native-logger/dist/types';
@@ -125,6 +126,7 @@ export function* onUserChanged() {
const key = yield select(getEncryptionKey);
const encryptedUserId = yield call(encryptUserId, userId, key);
const appConfigLogLevel = yield call(getAppConfigLogLevel);
+ const sumoProfileId = yield select(SumoSelectors.getProfileId);
yield call(DefaultLogger.setUserInfo, {
userId: encryptedUserId,
@@ -136,6 +138,7 @@ export function* onUserChanged() {
regionNumber: user.regionNumber || '',
impersonating: String(impersonated),
appConfigLogLevel,
+ sumoProfileId: sumoProfileId || 'unset',
...systemInfo,
...networkInfo,
});
@@ -193,7 +196,11 @@ export function* loggerInitSagas() {
yield all(
createRestartableSagas([
takeLatest(
- [...USER_CHANGED_ACTIONS, 'global/CONFIG_FETCH_SUCCESS'],
+ [
+ ...USER_CHANGED_ACTIONS,
+ 'global/CONFIG_FETCH_SUCCESS',
+ SumoTypes.PROFILE_SUCCESS,
+ ],
onUserChanged,
),
takeLatest(
--- src/redux/SumoRedux.ts
@@ -1,5 +1,7 @@
import Immutable, {ImmutableObject} from 'seamless-immutable';
import {createReducer, createActions} from 'reduxsauce';
+import {createSelector} from 'reselect';
+import {GlobalState} from '@walmart/redux-store';
/* ------------- Actions ------------- */
const {Types, Creators} = createActions(
@@ -35,6 +37,22 @@ export interface ProfileSuccessAction {
profileId: string;
}
+export interface State extends GlobalState {
+ sumo: SumoInitState;
+}
+
+/* ------------- Selectors ----------------- */
+const getSumoState = (state: State) => state.sumo;
+const getProfileId = createSelector(
+ [getSumoState],
+ (sumoState: SumoInitState) => sumoState?.profileId,
+);
+
+export const SumoSelectors = {
+ getSumoState,
+ getProfileId,
+};
+
/* ------------- Initial State ------------- */
export const INITIAL_STATE = Immutable<SumoInitState>({
charging: false,
| add sumo profile id to user's info in splunk logs | add sumo profile id to user's info in splunk logs
|
8ee727632648f39bc077934dc9e7ef9855664381 | --- __tests__/navigation/PreHireHallwayNav/__snapshots__/indexTest.tsx.snap
@@ -11,5 +11,22 @@ exports[`PreHireHallwayNav matches snapshot 1`] = `
}
}
/>
+ <Screen
+ component={[Function]}
+ name="askSam"
+ options={
+ Object {
+ "cardOverlayEnabled": true,
+ "cardStyle": Object {
+ "backgroundColor": "rgba(0, 0, 0, 0)",
+ },
+ "cardStyleInterpolator": [Function],
+ "gestureDirection": "vertical",
+ "gestureEnabled": true,
+ "headerShown": false,
+ "presentation": "transparentModal",
+ }
+ }
+ />
</Navigator>
`;
--- __tests__/navigation/PreHireHallwayNav/indexTest.tsx
@@ -1,9 +1,17 @@
import React from 'react';
import {create} from 'react-test-renderer';
+import {AskSamMiniApp} from '@walmart/ask-sam-mini-app';
import PreHireHallwayNav from '../../../src/navigation/PreHireHallwayNav/index';
+
+jest.mock('react', () => ({
+ ...(jest.requireActual('react') as any),
+ useEffect: (func: any) => func(),
+}));
+
describe('PreHireHallwayNav', () => {
const component = create(<PreHireHallwayNav />);
it('matches snapshot', () => {
expect(component.toJSON()).toMatchSnapshot();
+ expect(AskSamMiniApp.init).toHaveBeenCalled();
});
});
--- __tests__/navigation/__snapshots__/indexTest.tsx.snap
@@ -46,11 +46,6 @@ exports[`RootNav matches snapshot when app accessible 1`] = `
listeners={[MockFunction]}
name="main"
/>
- <Screen
- component="WelcomeMeMiniApp"
- listeners={[MockFunction]}
- name="WelcomeMeMiniApp"
- />
</Group>
<Group
screenOptions={
--- src/navigation/PreHireHallwayNav/index.tsx
@@ -1,18 +1,36 @@
__DEV__ && console.log('loading pre-hire hallway');
-import React from 'react';
+import React, {useEffect} from 'react';
import {createStackNavigator} from '@react-navigation/stack';
import WelcomeMeMiniApp from '@walmart/welcomeme-mini-app';
+import {AskSamMiniApp} from '@walmart/ask-sam-mini-app';
+import {modalTransitionOptions} from '../NavigationConstants';
const PreHireStack = createStackNavigator();
-const PreHireHallwayNav = () => (
- <PreHireStack.Navigator>
- <PreHireStack.Screen
- name='WelcomeMeMiniApp'
- component={WelcomeMeMiniApp}
- options={{headerShown: false}}
- />
- </PreHireStack.Navigator>
-);
+const PreHireHallwayNav = () => {
+ useEffect(() => {
+ AskSamMiniApp.init();
+ }, []);
+
+ return (
+ <PreHireStack.Navigator>
+ <PreHireStack.Screen
+ name='WelcomeMeMiniApp'
+ component={WelcomeMeMiniApp}
+ options={{headerShown: false}}
+ />
+ <PreHireStack.Screen
+ name='askSam'
+ component={AskSamMiniApp}
+ options={{
+ gestureEnabled: true,
+ gestureDirection: 'vertical',
+ presentation: 'transparentModal',
+ ...modalTransitionOptions,
+ }}
+ />
+ </PreHireStack.Navigator>
+ );
+};
export default PreHireHallwayNav;
--- src/navigation/index.tsx
@@ -2,7 +2,6 @@ import React from 'react';
import {useTranslation} from 'react-i18next';
import {useSelector} from 'react-redux';
import {createStackNavigator, TransitionPresets} from '@react-navigation/stack';
-import WelcomeMeMiniApp from '@walmart/welcomeme-mini-app';
import {Header} from '@walmart/ui-components';
import {
@@ -81,11 +80,6 @@ export const RootNav = () => {
component={UserRootNav}
listeners={hideSplashScreenListeners}
/>
- <RootStack.Screen
- name='WelcomeMeMiniApp'
- component={WelcomeMeMiniApp}
- listeners={hideSplashScreenListeners}
- />
</RootStack.Group>
{/* Screens with header but no title, just back button */}
| Adding ask sam to prehire nav stack | Adding ask sam to prehire nav stack
|
89e2d8e35468da393f077b2b7598d53e08b98a51 | --- packages/allspark-foundation/src/Auth/README.md
@@ -1,3 +1,114 @@
# Allspark Auth Service
-## Data Provider
+## Overview
+
+The Allspark Auth Service is a dynamic container service, meaning its defined by the container app. It provides a set of APIs for user authentication and authorization.
+
+## Container Usage
+
+A container should define the Auth Service and connect it to the Allspark Ecosystem.
+
+### Define an Auth Service
+
+An Auth Service must match the `AllsparkAuthService` interface. You can define it as a class or an object, however you prefer.
+
+```typescript
+import { AllsparkAuthService } from '@walmart/allspark-foundation/Auth';
+
+// As a class
+export class MyAppAuthService implements AllsparkAuthService {
+ // ... implement methods
+}
+
+// As an object
+export const MyAppAuthService: AllsparkAuthService = {
+ // ... implement methods
+};
+```
+
+### Connect an Auth Service
+
+A "connected" Auth Service means that its methods automatically update redux state and dispatch actions. Also, its methods can be called via redux by dispathing AuthActions from `@walmart/allspark-foundation/Auth`.
+
+An Auth Service can be connected to the Allspark Ecosystem in two ways.
+
+#### Using `AuthServiceCreator`
+
+The `AuthServiceCreator` method is a factory method that creates an Auth Service. It ensures that the service matches the `AllsparkAuthService` interface and connects the service to the container.
+
+```typescript
+import { AuthServiceCreator } from '@walmart/allspark-foundation/Auth';
+
+const MyAppAuthService = AuthServiceCreator(MyAppAuthService);
+```
+
+#### Using `AllsparkContainer`
+
+If an Auth Service is not created using `AuthServiceCreator`, it will be connected by the container when the container is created.
+
+```typescript
+import { AllsparkContainer } from '@walmart/allspark-foundation';
+
+const MyAppContainer = new AllsparkContainer('my-app', {
+ services: {
+ auth: MyAppAuthService,
+ // ... remaining services
+ }
+});
+```
+
+### Recommended Usage
+
+We recommend using the `AuthServiceCreator` method to create the Auth Service when possible. This ensures the service matches the `AllsparkAuthService` interface and connects the service to the container.
+
+However, its possible you need access to the "raw" service instance within your container. In this case, you can define the "raw" service then create a "connected" service using `AuthServiceCreator`.
+
+Now you have options. You can use either type of service depending on your needs.
+
+```typescript
+import { AuthServiceCreator } from '@walmart/allspark-foundation/Auth';
+
+export const MyAppAuthService = {
+ // ... implement methods
+}
+
+export const MyAppConnectedAuthService = AuthServiceCreator(MyAppAuthService);
+```
+
+## Accessing Auth Service
+
+The Auth Service should only be directly used by the container. So with that in mind, the container can just directly use the service or connected service it defined in the previous step.
+
+```typescript
+import { MyAppAuthService, MyAppConnectedAuthService } from './AuthService';
+
+// "Raw service". Does not update redux.
+MyAppAuthService.refreshToken(...);
+
+// "Connected service". Updates redux.
+MyAppConnectedAuthService.refreshToken(...);
+```
+
+### Library Access
+
+Its possible that you need to access the Auth Service from somewhere other than where the container is defined.
+
+In these cases, you can have two options:
+
+#### Global `AuthService`
+
+You can import the global `AuthService` directly from `@walmart/allspark-foundation/Auth`. This is the "connected" service defined by the current container.
+
+Due to its global nature, this instance is not set until the container is created. Internally it will delay the method call until the service is defined. It should work as expected, but be aware of this behavior.
+
+#### `useContainerService` Hook
+
+The `useContainerService` hook from `@walmart/allspark-foundation/Container` can be used to access any dynamically defined service from the current container.
+
+This type of access is safer and more predictable since its used within the component context. The service should always be defined by the time the hook is called.
+
+```typescript
+import { useContainerService } from '@walmart/allspark-foundation/Container';
+
+const AuthService = useContainerService('auth');
+```
| docs: create auth service readme doc | docs: create auth service readme doc
|
be749fa82483d16422b3d87765f803bb95090470 | --- packages/allspark-foundation/src/Work/Context.tsx
@@ -2,6 +2,11 @@ import React, { Dispatch, PropsWithChildren, SetStateAction } from 'react';
import { noop } from 'lodash';
import { AllsparkContextCreator } from '../utils';
+// ********************************************************
+// DELETE THIS FILE ***************************************
+// ********************************************************
+
+
/**
* Context for Work
*/
--- packages/allspark-foundation/src/Work/index.ts
@@ -1 +1,2 @@
-export * from './Context'
\ No newline at end of file
+export * from './Context' // REMOVE
+export * from './redux'
\ No newline at end of file
--- packages/allspark-foundation/src/Work/redux.ts
@@ -0,0 +1,84 @@
+import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+import {
+ createSliceActionUtils,
+ generateSelectorsForSlice,
+} from '../Redux/utils';
+import { InferActionTypes } from '../Redux/types';
+
+export type WorkFlows = 'topstock' | 'pinpoint' | 'vizpick';
+
+export interface WorkState {
+ workFlow: WorkFlows | null;
+ actionId: string | null;
+};
+
+const INITIAL_STATE: WorkState = {
+ workFlow: null,
+ actionId: null,
+};
+
+/**
+ * Track work flows that start in sidekick-mini-app but end in
+ * a different work-mini-app, such as topstock-mini-app or pinpoint-mini-app
+ */
+export const workSlice = createSlice({
+ name: 'work',
+ initialState: INITIAL_STATE,
+ reducers: {
+ WORK_FLOW_START: (state, action: PayloadAction<WorkState, string>) => {
+ state.workFlow = action.payload.workFlow;
+ state.actionId = action.payload.actionId;
+ },
+ WORK_FLOW_COMPLETE: (state, _: PayloadAction<undefined, string>) => {
+ state.workFlow = null;
+ state.actionId = null;
+ }
+ },
+});
+
+export const { ActionTypes, ActionCreators } =
+ createSliceActionUtils(workSlice);
+
+/**
+ * Map of action type constants for the work slice.
+ * @example
+ * takeLatest(WorkActionTypes.WORK_FLOW_START, mySaga);
+ */
+export const WorkActionTypes = ActionTypes;
+
+/**
+ * Action creators for work actions.
+ * @example
+ * dispatch(WorkActions.WORK_FLOW_COMPLETE());
+ */
+export const WorkActions = ActionCreators;
+
+/**
+ * Selectors to retrieve work data from the Redux store.
+ * @example
+ * To get the actionId
+ * ```
+ * const actionId = useSelector(WorkSelectors.getActionId);
+ * ```
+ */
+export const WorkSelectors = generateSelectorsForSlice(workSlice);
+
+
+// ************************************
+// HERE *******************************
+// ************************************
+
+/**
+ * Type mapping of the container action creators
+ */
+export type IContainerActionCreators = typeof containerSlice.actions;
+
+/**
+ * Type mapping of the container actions
+ */
+export type IContainerActions = InferActionTypes<IContainerActionCreators>;
+
+/**
+ * Type for all possible container actions
+ */
+export type IContainerAction = IContainerActions[keyof IContainerActions];
\ No newline at end of file
| feat: create work slice DWORK-6097 | feat: create work slice DWORK-6097
|
c0461f1466a1677597166b989ef55c318926f7b0 | --- targets/US/package.json
@@ -152,7 +152,7 @@
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch",
"@walmart/welcomeme-mini-app": "0.95.1",
"@walmart/wfm-ui": "1.6.0",
- "@walmart/wm-plus-mini-app": "0.12.20",
+ "@walmart/wm-plus-mini-app": "0.12.21",
"@walmart/wmconnect-mini-app": "2.5.4",
"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
@@ -7130,7 +7130,7 @@ __metadata:
"@walmart/ui-components": "patch:@walmart/ui-components@patch%3A@walmart/ui-components@npm%253A1.16.1%23~/.yarn/patches/@walmart-ui-components-npm-1.16.1-c240fb0151.patch%3A%3Aversion=1.16.1&hash=79c828#~/.yarn/patches/@walmart-ui-components-patch-cd5ae6f92c.patch"
"@walmart/welcomeme-mini-app": "npm:0.95.1"
"@walmart/wfm-ui": "npm:1.6.0"
- "@walmart/wm-plus-mini-app": "npm:0.12.20"
+ "@walmart/wm-plus-mini-app": "npm:0.12.21"
"@walmart/wmconnect-mini-app": "npm:2.5.4"
adaptive-expressions: "npm:^4.13.5"
adaptivecards-templating: "npm:^2.1.0"
@@ -8280,9 +8280,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wm-plus-mini-app@npm:0.12.20":
- version: 0.12.20
- resolution: "@walmart/wm-plus-mini-app@npm:0.12.20"
+"@walmart/wm-plus-mini-app@npm:0.12.21":
+ version: 0.12.21
+ resolution: "@walmart/wm-plus-mini-app@npm:0.12.21"
peerDependencies:
"@react-navigation/native": ^6.0.0
"@react-navigation/stack": ^6.1.0
@@ -8290,7 +8290,7 @@ __metadata:
"@walmart/gtp-shared-components": 2.0.10
react: ^18.1.0
react-native: ^0.70.5
- checksum: 10c0/070b7b69d7dfb2225ed184a835b4a97fb1b204097b38a1e4d089aaa652ee688dd06795ecafbfcb938732a55f59daedd3e73e0344f46392a0138d99cb8dfebf4d
+ checksum: 10c0/0adffe409ed35f391eda8b8e3f849acdae6f7e91dfadba7aaa91e6d2781293f7aabc3fdac91938e64f7641cce99ca403a8a14fd908268d062837be321f75487f
languageName: node
linkType: hard
| wm-plus-mini-app version update | wm-plus-mini-app version update
|
d977c21f2c7ed3191b9a795a2d8248e3eb3c4c27 | --- __tests__/__snapshots__/AppTest.tsx.snap
@@ -1,15 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`RootContainer renders and fires startup event 1`] = `
-<Provider
- env="dev"
- environmentOverrides={{}}
-/>
-`;
+exports[`RootContainer renders and fires startup event 1`] = `<Provider />`;
-exports[`RootContainer renders with no linking config on undefined userid 1`] = `
-<Provider
- env="dev"
- environmentOverrides={{}}
-/>
-`;
+exports[`RootContainer renders with no linking config on undefined userid 1`] = `<Provider />`;
--- __tests__/home/components/TaskCard/TaskClockStatusStoreCardTest.tsx
@@ -83,7 +83,7 @@ describe('TaskClockStatusStoreCard', () => {
expect(logWMTelemetryTouchComponentEvent).toHaveBeenCalledWith(
'task_view_roster',
);
- expect(mockNavigation.navigate).toHaveBeenCalledWith('myTeam');
+ expect(mockNavigation.navigate).toHaveBeenCalledWith("myTeam", {"params": {"params": {"screen": "roster"}, "screen": "myTeam.tabs"}, "screen": "myTeam.root"});
});
it('matches snapshot when loaded with team view for DC', () => {
--- __tests__/home/components/TaskCard/TaskClockStatusTeamCard2Test.tsx
@@ -98,7 +98,7 @@ describe('TaskClockStatusTeamCard2', () => {
expect(logWMTelemetryTouchComponentEvent).toHaveBeenCalledWith(
'task_view_roster',
);
- expect(mockNavigation.navigate).toHaveBeenCalledWith('myTeam');
+ expect(mockNavigation.navigate).toHaveBeenCalledWith("myTeam", {"params": {"params": {"screen": "roster"}, "screen": "myTeam.tabs"}, "screen": "myTeam.root"});
});
it('handles loading while data is present', () => {
| Update test | Update test
|
c4cbc8b057a40075d4e62d47e805d7a52259fa6f | --- packages/me-at-walmart-common/src/utils.ts
@@ -6,8 +6,8 @@ export const getEncryptionKeyForUser = (user: User | null) => {
return UserDomain.homeoffice;
}
- const {domain, site} = user;
+ const {domain, siteId} = user;
return domain === UserDomain.store
- ? String(site)
+ ? String(siteId)
: domain || UserDomain.homeoffice;
};
| fix: store user id encryption using incorrect field | fix: store user id encryption using incorrect field
|
2dd25078ae2b2939a024dec3c3ee810b7859788b | --- ios/Podfile.lock
@@ -1203,25 +1203,25 @@ SPEC CHECKSUMS:
React-jsiexecutor: 31564fa6912459921568e8b0e49024285a4d584b
React-jsinspector: badd81696361249893a80477983e697aab3c1a34
React-logger: fdda34dd285bdb0232e059b19d9606fa0ec3bb9c
- react-native-app-auth: bd3be305a5cbac5baa8574253480d90b5c5522e7
- react-native-background-timer: 117fffdc9b0d6f144444bb49029f94275a45fdb5
+ react-native-app-auth: fd1eaa667c0bc014199456d14a6440cb74de814e
+ react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
react-native-biometrics: 352e5a794bfffc46a0c86725ea7dc62deb085bdc
react-native-blob-util: 4ec16cc21bfc8de8f0ddfd2c81ada00f8c34b646
- react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060
- react-native-encrypted-storage: e907c76d2b9f0a30edd989d92f1bb8a9198fdb82
+ react-native-cameraroll: 2957f2bce63ae896a848fbe0d5352c1bd4d20866
+ react-native-encrypted-storage: 632e8eac25dff0b6cac14e6e0c76498c4a39e24e
react-native-flipper: 43ecd19174184c24aba5e1ef75ae13106af871e3
react-native-geolocation-service: 608e1da71a1ac31b4de64d9ef2815f697978c55b
react-native-get-random-values: a6ea6a8a65dc93e96e24a11105b1a9c8cfe1d72a
react-native-image-picker: 4bc9ed38c8be255b515d8c88babbaf74973f91a8
- react-native-image-resizer: 506412a2bdd70dde64a61e13505ce10f61a04369
+ react-native-image-resizer: d9fb629a867335bdc13230ac2a58702bb8c8828f
react-native-logger: c9fa5ed890b56e294df7d62c39c2c5564a8ae2ea
- react-native-loudness: fe12785700887bcfdb07abcf455c5df40e89183b
+ react-native-loudness: 38527e7e42c3be3e4ea3d8aace2621a8eb9cafda
react-native-maps: 085f614cf14d3637b2048bb9752da5b1c27c2886
react-native-netinfo: f80db8cac2151405633324cb645c60af098ee461
react-native-pager-view: 592421df0259bf7a7a4fe85b74c24f3f39905605
react-native-pdf: 33c622cbdf776a649929e8b9d1ce2d313347c4fa
react-native-ptt-module: 6936355bcd222c2cdbc74247c68c0d62b423009a
- react-native-render-html: 5af9f6852f5e0cf9b74127537da3370984da51ee
+ react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe
react-native-safe-area-context: 6c12e3859b6f27b25de4fee8201cfb858432d8de
react-native-scanner-3.0: e144733a1c98596d7cd53c3d6384785273b81aab
react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
@@ -1242,12 +1242,12 @@ SPEC CHECKSUMS:
React-RCTVibration: 8e5c8c5d17af641f306d7380d8d0fe9b3c142c48
React-runtimeexecutor: 7401c4a40f8728fd89df4a56104541b760876117
ReactCommon: c9246996e73bf75a2c6c3ff15f1e16707cdc2da9
- ReactNativeART: f003b07dfa7098aa419ed95b69560923440b1eee
+ ReactNativeART: 78edc68dd4a1e675338cd0cd113319cf3a65f2ab
Realm: fdf6732924dc5e69e30e0db2c11e869f92b53f3d
RealmJS: d0e94d35363a3a9ebd27981d9ac0aa4b63f66c85
RealmSwift: 7c181da8fa1c2fe613656a77c198d6a3dc3879a1
- RNCAsyncStorage: cb9a623793918c6699586281f0b51cbc38f046f9
- RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3
+ RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
+ RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
RNCPicker: 0bf8ef8f7800524f32d2bb2a8bcadd53eda0ecd1
RNDateTimePicker: 1dd15d7ed1ab7d999056bc77879a42920d139c12
RNDeviceInfo: 4701f0bf2a06b34654745053db0ce4cb0c53ada7
@@ -1266,7 +1266,7 @@ SPEC CHECKSUMS:
RNReanimated: 2a91e85fcd343f8af3c58d3425b99fdd285590a5
RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7
RNSha256: 80bea5b2e7005f813f6438cb41e573b3d531146c
- RNSketchCanvas: ee9e3d4bd7dbe46d309827bf2252817a0345ea1d
+ RNSketchCanvas: 124a2a11b9bce418ef6e34262fc163d00b5f714b
RNSoundPlayer: 369105c565b8fe6ea0a43fc882dc81eba444e842
RNSVG: 3a79c0c4992213e4f06c08e62730c5e7b9e4dc17
RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8
| podfile lock update | podfile lock update
|
e5c7c76d1ec9a66747dbbc4f51da6882d6a4a757 | --- android/app/src/main/AndroidManifest.xml
@@ -131,15 +131,6 @@
<action android:name="android.telecom.ConnectionService" />
</intent-filter>
</service>
-
- <receiver
- android:name=".IntentWakeupReceiver"
- android:permission="com.samsung.android.knox.permission.KNOX_CUSTOM_SETTING"
- android:exported="true" >
- <intent-filter>
- <action android:name="com.walmart.stores.allspark.beta.intent.action.PTT_PRESS" />
- </intent-filter>
- </receiver>
</application>
</manifest>
--- android/app/src/main/java/com/walmart/stores/allspark/beta/MainApplication.kt
@@ -1,5 +1,6 @@
package com.walmart.stores.allspark.beta
+import android.content.IntentFilter
import com.facebook.react.PackageList
import com.facebook.react.ReactApplication
import com.facebook.react.ReactHost
@@ -12,6 +13,7 @@ import com.facebook.react.flipper.ReactNativeFlipper
import com.facebook.soloader.SoLoader
import android.content.res.Configuration
+import android.os.Build
import expo.modules.ApplicationLifecycleDispatcher
import expo.modules.ReactNativeHostWrapper
import com.microsoft.codepush.react.CodePush
@@ -19,7 +21,7 @@ import com.walmart.ssmp.platform.core.PlatformCoreApplication
import java.util.ArrayList
class MainApplication : PlatformCoreApplication(), ReactApplication {
-
+ private lateinit var intentWakeupReceiver: IntentWakeupReceiver
override val reactNativeHost: ReactNativeHost =
ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
override fun getPackages(): ArrayList<ReactPackage>? =
@@ -48,6 +50,15 @@ class MainApplication : PlatformCoreApplication(), ReactApplication {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
}
+
+ 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) {
+ this.applicationContext.registerReceiver(intentWakeupReceiver, filter, RECEIVER_EXPORTED)
+ } else {
+ this.applicationContext.registerReceiver(intentWakeupReceiver, filter)
+ }
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
ApplicationLifecycleDispatcher.onApplicationCreate(this)
}
| Adding intent wakupe receiver programatically | Adding intent wakupe receiver programatically
|
026c5f3ebaaf59d0a2f6ca014cf3c6ab93adb6c5 | --- packages/allspark-foundation/src/Translation/client.ts
@@ -1,4 +1,4 @@
-import i18next, { KeyPrefix, TFunction } from 'i18next';
+import i18next, { InitOptions, KeyPrefix, TFunction } from 'i18next';
import {
UseTranslationOptions,
useTranslation as baseUseTranslation,
@@ -30,6 +30,17 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
let initialized = false;
let _config = config;
+ // --- i18n Default Instance Management --- //
+ // This section is needed while legacy mini apps still interact with the default instance of i18n.
+
+ // @ts-ignore - Override init method to ensure its only called once.
+ i18next.init = (options: InitOptions) => {
+ __DEV__ &&
+ console.warn(
+ `i18n.init called more than once. This is not allowed! Culprit: ${options.defaultNS}`
+ );
+ };
+
// Keep default instance default namespace in sync with foundation
i18next.on('initialized', (options) => {
if (options.defaultNS !== 'container') {
@@ -54,6 +65,7 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
i18next.changeLanguage(lng);
}
});
+ // ------------ //
/**
* Returns true if the translation client has been initialized
| fix: i18next default instance could break if reinitalized by mini apps | fix: i18next default instance could break if reinitalized by mini apps
|
1a494f3a198865cddd38bcd3e45c30a1af900bab | --- src/screens/MessagesScreen.tsx
@@ -341,7 +341,7 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => {
/>
<ChatInput
onSend={onMessageSend}
- disabled={rosterLoading || isMessageButtonEnabled}
+ disabled={rosterLoading || !isMessageButtonEnabled}
channelId={channelPath}
/>
</KeyboardAvoidingView>
--- src/screens/MessagesScreen.tsx
@@ -341,7 +341,7 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => {
/>
<ChatInput
onSend={onMessageSend}
- disabled={rosterLoading || isMessageButtonEnabled}
+ disabled={rosterLoading || !isMessageButtonEnabled}
channelId={channelPath}
/>
</KeyboardAvoidingView>
| update the new image for when texting is unavailable | update the new image for when texting is unavailable
|
5e0e5a5a706414fe6fffacde31c4ac8a29a59bec | --- __tests__/startup/AssociateStartupTest.ts
@@ -27,4 +27,4 @@ describe('initAssociateFeatures', () => {
expect(mockCancelNavConfig).toHaveBeenCalled();
expect(mockCancelSettings).toHaveBeenCalled();
});
-});
\ No newline at end of file
+});
| fix: lint failure | fix: lint failure
|
9b74f031f293d4f9cf529c5f9d61ab6ddb8ae3fa | --- packages/allspark-foundation/src/GraphQL/client.ts
@@ -44,6 +44,7 @@ export class GraphQLClient extends ApolloClient<NormalizedCacheObject> {
cacheConfig,
httpConfig,
persistedQueryConfig,
+ links = [],
...restConfig
} = config;
@@ -54,7 +55,7 @@ export class GraphQLClient extends ApolloClient<NormalizedCacheObject> {
super({
cache,
- link: from([persistedQueryLink, dynamicLink, httpLink]),
+ link: from([persistedQueryLink, dynamicLink, httpLink, ...links]),
connectToDevTools,
...restConfig,
});
| fix: graphql client class did not properly handle link on class creation | fix: graphql client class did not properly handle link on class creation
|
48c8cb27f006b99ce6754ff498f09e41e7515a06 | --- package.json
@@ -84,7 +84,7 @@
"@walmart/allspark-utils": "6.9.0",
"@walmart/amp-mini-app": "1.2.10",
"@walmart/ask-sam-chat-components": "^0.2.7",
- "@walmart/ask-sam-mini-app": "1.32.4",
+ "@walmart/ask-sam-mini-app": "1.32.21",
"@walmart/associate-listening-mini-app": "1.2.37",
"@walmart/attendance-mini-app": "3.174.0",
"@walmart/avp-feature-app": "0.16.25",
--- yarn.lock
@@ -6653,12 +6653,13 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/ask-sam-mini-app@npm:1.32.4":
- version: 1.32.4
- resolution: "@walmart/ask-sam-mini-app@npm:1.32.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.32.4.tgz"
+"@walmart/ask-sam-mini-app@npm:1.32.21":
+ version: 1.32.21
+ resolution: "@walmart/ask-sam-mini-app@npm:1.32.21::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2F%40walmart%2Fask-sam-mini-app-1.32.21.tgz"
dependencies:
apisauce: "npm:^1.1.2"
numeral: "npm:^2.0.6"
+ react-native-markdown-display: "npm:^7.0.2"
reduxsauce: "npm:^1.2.0"
peerDependencies:
"@apollo/client": ">=3.7.3"
@@ -6698,7 +6699,7 @@ __metadata:
react-native-wm-voice-text: ">=0.3"
reselect: ">=4"
victory-native: ">=36.5"
- checksum: 10c0/a7027647c1ef7ba0cfb738a1ebaa7ff8f6ece216d45919c0425221dbfd4bce070eb1491e6dfa8a6c8e1db611c8b249c82c3458400b6053fd3cc6219606d7ab28
+ checksum: 10c0/c3df9e7dab24074f27078988efe4d43e7f589cbe05ca9ac2d9efdab93ede31f08b19a02337440c8b34ca148d8156811c713dc0d4c7e45f137ebcbe52a82b54d5
languageName: node
linkType: hard
@@ -7596,7 +7597,7 @@ __metadata:
"@walmart/allspark-utils": "npm:6.9.0"
"@walmart/amp-mini-app": "npm:1.2.10"
"@walmart/ask-sam-chat-components": "npm:^0.2.7"
- "@walmart/ask-sam-mini-app": "npm:1.32.4"
+ "@walmart/ask-sam-mini-app": "npm:1.32.21"
"@walmart/associate-listening-mini-app": "npm:1.2.37"
"@walmart/attendance-mini-app": "npm:3.174.0"
"@walmart/avp-feature-app": "npm:0.16.25"
@@ -11962,6 +11963,13 @@ __metadata:
languageName: node
linkType: hard
+"entities@npm:~2.0.0":
+ version: 2.0.3
+ resolution: "entities@npm:2.0.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fentities%2F-%2Fentities-2.0.3.tgz"
+ checksum: 10c0/81463fde5f1e4432df6faa65afa00021f3979ac8387f81d3d111beeb08179e626130a4b7488e8c3cc3d74e0d04e99d3033ff7db80e05f4a1e961b5e1efe17731
+ languageName: node
+ linkType: hard
+
"env-editor@npm:^0.4.1":
version: 0.4.2
resolution: "env-editor@npm:0.4.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fenv-editor%2F-%2Fenv-editor-0.4.2.tgz"
@@ -16377,6 +16385,15 @@ __metadata:
languageName: node
linkType: hard
+"linkify-it@npm:^2.0.0":
+ version: 2.2.0
+ resolution: "linkify-it@npm:2.2.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Flinkify-it%2F-%2Flinkify-it-2.2.0.tgz"
+ dependencies:
+ uc.micro: "npm:^1.0.1"
+ checksum: 10c0/640f926fa71d46f9451b4dc999c94b2dcad920abf5fe174a85f120b420cbb34b8f950e251846ed73db715ec9aaadadf1f2482d27088dddd21b1c84761f6a0b5a
+ languageName: node
+ linkType: hard
+
"linkify-it@npm:^3.0.2":
version: 3.0.3
resolution: "linkify-it@npm:3.0.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Flinkify-it%2F-%2Flinkify-it-3.0.3.tgz"
@@ -16752,6 +16769,21 @@ __metadata:
languageName: node
linkType: hard
+"markdown-it@npm:^10.0.0":
+ version: 10.0.0
+ resolution: "markdown-it@npm:10.0.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fmarkdown-it%2F-%2Fmarkdown-it-10.0.0.tgz"
+ dependencies:
+ argparse: "npm:^1.0.7"
+ entities: "npm:~2.0.0"
+ linkify-it: "npm:^2.0.0"
+ mdurl: "npm:^1.0.1"
+ uc.micro: "npm:^1.0.5"
+ bin:
+ markdown-it: bin/markdown-it.js
+ checksum: 10c0/7b2876599adb4c8bed0b45030db835d6e3e352e20b1c26624975d1b0f6d9ef54bbf6b63d29cb31b0cebb65b5ad7300aad063dc5d586a03c3745345bfc945c8fd
+ languageName: node
+ linkType: hard
+
"marky@npm:^1.2.2":
version: 1.3.0
resolution: "marky@npm:1.3.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fmarky%2F-%2Fmarky-1.3.0.tgz"
@@ -19116,6 +19148,15 @@ __metadata:
languageName: node
linkType: hard
+"react-native-fit-image@npm:^1.5.5":
+ version: 1.5.5
+ resolution: "react-native-fit-image@npm:1.5.5::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-fit-image%2F-%2Freact-native-fit-image-1.5.5.tgz"
+ dependencies:
+ prop-types: "npm:^15.5.10"
+ checksum: 10c0/04d1cb35f2acacda593c80f2d9845f7dc0ed5e0e1fb62043ba5351f914162dcd92f1ae98e80ebf9752f6b4131b1634f6a9ac90e9c649f30b5591f3187d99811f
+ languageName: node
+ linkType: hard
+
"react-native-fs@npm:^2.18.0":
version: 2.20.0
resolution: "react-native-fs@npm:2.20.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-fs%2F-%2Freact-native-fs-2.20.0.tgz"
@@ -19260,6 +19301,21 @@ __metadata:
languageName: node
linkType: hard
+"react-native-markdown-display@npm:^7.0.2":
+ version: 7.0.2
+ resolution: "react-native-markdown-display@npm:7.0.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-markdown-display%2F-%2Freact-native-markdown-display-7.0.2.tgz"
+ dependencies:
+ css-to-react-native: "npm:^3.0.0"
+ markdown-it: "npm:^10.0.0"
+ prop-types: "npm:^15.7.2"
+ react-native-fit-image: "npm:^1.5.5"
+ peerDependencies:
+ react: ">=16.2.0"
+ react-native: ">=0.50.4"
+ checksum: 10c0/b90b75401340cd79c42e07e6e8961551e8b98acfbc53bc0b651174aea2a86b92430be767da7c813e54b08e7bbd8af6c09dbeb4f9369d925984979cc28b6ba8fb
+ languageName: node
+ linkType: hard
+
"react-native-mask-input@npm:^1.2.3":
version: 1.2.3
resolution: "react-native-mask-input@npm:1.2.3::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Freact-native-mask-input%2F-%2Freact-native-mask-input-1.2.3.tgz"
@@ -22276,7 +22332,7 @@ __metadata:
languageName: node
linkType: hard
-"uc.micro@npm:^1.0.1":
+"uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5":
version: 1.0.6
resolution: "uc.micro@npm:1.0.6::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2Fuc.micro%2F-%2Fuc.micro-1.0.6.tgz"
checksum: 10c0/9bde2afc6f2e24b899db6caea47dae778b88862ca76688d844ef6e6121dec0679c152893a74a6cfbd2e6fde34654e6bd8424fee8e0166cdfa6c9ae5d42b8a17b
| feat: drop32-ask-sam release (#4518) | feat: drop32-ask-sam release (#4518)
* feat: JIRA_PROJECT-123 dummy commit for test GenAI E2E
* feat: E2E test GenAI + Disclaimer ,1.32.14
* feat: E2E test GenAI + Disclaimer test-build drop1.30.43
* feat: SMBLV-9055 and legal disclaimer for use
---------
Co-authored-by: j0z09av <j0z09av@homeoffice.wal-mart.com>
Co-authored-by: Pavan Lingamallu - p0l04ug <Pavan.Lingamallu@walmart.com> |
5e25ee722b4a5583f80e5b5a13eb8470d97e0144 | --- package-lock.json
@@ -4331,9 +4331,9 @@
}
},
"@walmart/push-to-talk-mini-app": {
- "version": "0.5.65",
- "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.65.tgz",
- "integrity": "sha512-C6982nGxyc4bQEh0QUzVJc1bMaZI0ns4E8RCmlz5f9iymR63EPvMT1WIgFL5ZUdlLkfQyC6qqwPPCUEGWt7BrA=="
+ "version": "0.5.66",
+ "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.5.66.tgz",
+ "integrity": "sha512-vVxftEb1/Y5JGn4NiVO1DWkz83RKSxa2V81lDJDX7E79kMl3OFGW5XQRldTNzvWYTP1Va5CL39MPh8zjQJitFg=="
},
"@walmart/react-native-collapsible": {
"version": "1.5.3",
--- package.json
@@ -88,7 +88,7 @@
"@walmart/manager-approvals-miniapp": "0.0.58",
"@walmart/metrics-mini-app": "0.4.14",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/push-to-talk-mini-app": "0.5.65",
+ "@walmart/push-to-talk-mini-app": "0.5.66",
"@walmart/react-native-env": "^0.2.0",
"@walmart/react-native-logger": "^1.28.0",
"@walmart/react-native-shared-navigation": "^0.4.0",
| using ptt miniapp v0.5.66 | using ptt miniapp v0.5.66
|
6b720b4eee9cd8c24e9f77739acdcb97646cc3c4 | --- package.json
@@ -138,7 +138,7 @@
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.7.5",
"@walmart/react-native-webex-sdk": "0.8.37",
- "@walmart/receipt-check-miniapp": "1.29.4",
+ "@walmart/receipt-check-miniapp": "1.30.2",
"@walmart/redux-store": "~6.3.28",
"@walmart/returns-mini-app": "4.16.7",
"@walmart/rfid-scan-mini-app": "2.10.4",
--- yarn.lock
@@ -8371,7 +8371,7 @@ __metadata:
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.7.5"
"@walmart/react-native-webex-sdk": "npm:0.8.37"
- "@walmart/receipt-check-miniapp": "npm:1.29.4"
+ "@walmart/receipt-check-miniapp": "npm:1.30.2"
"@walmart/redux-store": "npm:~6.3.28"
"@walmart/returns-mini-app": "npm:4.16.7"
"@walmart/rfid-scan-mini-app": "npm:2.10.4"
@@ -8961,9 +8961,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/receipt-check-miniapp@npm:1.29.4":
- version: 1.29.4
- resolution: "@walmart/receipt-check-miniapp@npm:1.29.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freceipt-check-miniapp%2F-%2F%40walmart%2Freceipt-check-miniapp-1.29.4.tgz"
+"@walmart/receipt-check-miniapp@npm:1.30.2":
+ version: 1.30.2
+ resolution: "@walmart/receipt-check-miniapp@npm:1.30.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freceipt-check-miniapp%2F-%2F%40walmart%2Freceipt-check-miniapp-1.30.2.tgz"
dependencies:
"@walmart/tcnumber": "npm:^2.3.3"
"@xstate/react": "npm:^3.0.1"
@@ -8973,7 +8973,7 @@ __metadata:
xstate: "npm:^4.32.1"
peerDependencies:
"@walmart/allspark-foundation": "*"
- checksum: 10c0/9ad9e18c1512aff381cb78ec4a27c6e9223b3021f3a542cc9a4f338d49b9064bd48f5ac52b7aa65b7e576c0f8b7c05894c51fecedd00dabd11a8afd705eebe71
+ checksum: 10c0/3285cf52df297e69f7b67e3fa2931bb9d8e08eb40905d8afa85c19bad0f669dedcccd118f0cb850aea187f91b8b0c224fcc5c05a44752383a0ac1be7944e0206
languageName: node
linkType: hard
| feat(receipt-check-miniapp): FLB-2539 Receipt Check Drop 30 (#4088) | feat(receipt-check-miniapp): FLB-2539 Receipt Check Drop 30 (#4088)
Co-authored-by: Brandon Alexander <brandon.alexander0@walmart.com>
Co-authored-by: Savankumar Akbari - sakbari <sakbari@m-c02rv0v4g8wl.homeoffice.wal-mart.com>
Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com> |
9e18304c11a8dbe34169e500ae7dacd0ae701bc0 | --- src/screens/MessagesScreen.tsx
@@ -275,9 +275,9 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => {
recipients?: string[];
channelType: string;
} => {
- if (channelPath.includes(channelTypes.STORE_ALL) && !isNil(siteId)) {
+ if (channelPath.includes(channelTypes.STORE_ALL)) {
return {
- recipients: [siteId],
+ recipients: [],
channelType: channelTypes.STORE_ALL,
};
} else if (channelPath.includes(viewerTeamId) && !isNil(viewerTeamId)) {
--- src/screens/MessagesScreen.tsx
@@ -275,9 +275,9 @@ export const MessagesScreen: FC<MessagesScreenProps> = (props) => {
recipients?: string[];
channelType: string;
} => {
- if (channelPath.includes(channelTypes.STORE_ALL) && !isNil(siteId)) {
+ if (channelPath.includes(channelTypes.STORE_ALL)) {
return {
- recipients: [siteId],
+ recipients: [],
channelType: channelTypes.STORE_ALL,
};
} else if (channelPath.includes(viewerTeamId) && !isNil(viewerTeamId)) {
| update review comments | update review comments
|
11db2e2020e9f2f1813002eafd0b109a84114b5e | --- packages/core-widget-registry/src/ScMetrics.ts
@@ -1,5 +1,5 @@
-import {ComponentType} from 'react';
-import MeAtCommon, {ScMetricsContainer} from '@walmart/me-at-walmart-common';
+import { ComponentType } from "react";
+import MeAtCommon, { ScMetricsContainer } from "@walmart/me-at-walmart-common";
/**
* @deprecated moved to "@walmart/me-at-walmart-common"
@@ -43,7 +43,7 @@ export const ScMetricsWidgetRegistry = {
* ScMetricsContainer.addMultiple(id, component);
*/
multiRegister: (
- components: [string, ComponentType<ScMetricsWidgetProps>][],
+ components: [string, ComponentType<ScMetricsWidgetProps>][]
) => ScMetricsContainer.addMultiple(components),
};
@@ -52,4 +52,4 @@ export const ScMetricsWidgetRegistry = {
* @example
* import {ScMetricsContainer} from '@walmart/me-at-walmart-common';
*/
-export const useScMetricsWidgetRegistry = () => ScMetricsContainer;
+export const useScMetricsWidgetRegistry = () => ScMetricsContainer as any;
--- packages/me-at-walmart-container/src/setup.ts
@@ -2,7 +2,6 @@ import { AppState } from "react-native";
import { ContainerSetup } from "@walmart/allspark-foundation/Container";
import { AllsparkEnvironment } from "@walmart/allspark-foundation/Environment";
-import { AllsparkGraphQLClient } from "@walmart/allspark-foundation/GraphQL";
import { AllsparkNavigationClient } from "@walmart/allspark-foundation/Navigation";
import { AllsparkReduxStore } from "@walmart/allspark-foundation/Redux";
import { AllsparkNotificationClient } from "@walmart/allspark-foundation/Notification";
--- src/manifest.ts
@@ -66,8 +66,8 @@ export const getAssociateFeatures = (): AllsparkFeatureModule[] => {
require("./features/sidekick").SidekickFeature,
require("./features/taskIt").TaskItFeature,
require("./features/wmConnect").WMConnectFeature,
- require("@walmart/manager-approvals-miniapp").default
- require('@walmart/translator-mini-app').default,
+ require("@walmart/manager-approvals-miniapp").default,
+ require("@walmart/translator-mini-app").default
);
}
| chore: lint and ts fixes | chore: lint and ts fixes
|
8f18959a4ccc73a768ac98d937f18ed4ed345a0b | --- package.json
@@ -65,7 +65,7 @@
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@walmart/allspark-health-survey-mini-app": "0.0.41",
"@walmart/allspark-home-mini-app": "0.4.22-test.0",
- "@walmart/metrics-mini-app": "0.4.4",
+ "@walmart/metrics-mini-app": "0.4.4",
"@walmart/allspark-me-mini-app": "0.1.0",
"@walmart/ask-sam-mini-app": "0.30.2",
"@walmart/config-components": "^1.0.26",
| updating versions to test rc2 feature branch | updating versions to test rc2 feature branch
|
cdab6bf2da007040bb9138831ed34ee6b08a0b6a | --- package.json
@@ -34,7 +34,9 @@
"ios": "expo run:ios",
"build": "yarn tsc",
"prepare": "husky",
- "prepublishOnly": "yarn build"
+ "prepublishOnly": "yarn build",
+ "yalc:publish": "yarn build && yalc push",
+ "yalc:watch": "nodemon --watch src --ext ts,tsx,json --exec 'yarn yalc:publish'"
},
"devDependencies": {
"@babel/core": "^7.22.10",
--- src/components/AssociateList/AssociateListItem.tsx
@@ -73,17 +73,25 @@ export const AssociateListItem = ({
associate?.wfmSchedule?.scheduleWeeks &&
associate?.wfmSchedule?.scheduleWeeks?.[0]?.scheduleShifts &&
associate?.wfmSchedule?.scheduleWeeks?.[0].scheduleShifts?.length > 0;
- const readTogetherAccessibilityLabel = `${associateName}, ${associateJobDescription} ${
- isClockedIn
+ // SMDV-7786, SMDV-7752, SMDV-7824: Add fallback for translation failures
+ const clockStatusText = (() => {
+ const translated = isClockedIn
? t('rosterScreen.userHeader.clockedIn')
- : t('rosterScreen.userHeader.clockedOut')
- } ${
- showManagerSchedule && isWfmScheduleValid
- ? `${t(
- 'rosterScreen.associateRosterItem.shiftTime',
- )} ${associateManagerSchedule}`
- : ''
- }${status ? ` ${status}` : ''} ${t('rosterScreen.associateRosterItem.viewScheduleFor', {
+ : t('rosterScreen.userHeader.clockedOut');
+
+ // Detect if translation failed (returned raw key instead of translated text)
+ // This prevents screen readers from announcing "rosterScreen.userHeader.clockedOut"
+ if (translated && translated.includes('rosterScreen')) {
+ return isClockedIn ? 'Clocked In' : 'Clocked Out';
+ }
+ return translated;
+ })();
+
+ const shiftTimeText = showManagerSchedule && isWfmScheduleValid
+ ? `${t('rosterScreen.associateRosterItem.shiftTime')} ${associateManagerSchedule}`
+ : '';
+
+ const readTogetherAccessibilityLabel = `${associateName}, ${associateJobDescription} ${clockStatusText} ${shiftTimeText}${status ? ` ${status}` : ''} ${t('rosterScreen.associateRosterItem.viewScheduleFor', {
associateName: associateName,
})}`;
--- src/components/ShiftSwitcherModal/ShiftSwitcherModal.tsx
@@ -67,7 +67,13 @@ export const ShiftSwitcherModal = ({
}
}, [clickCount, refetchShifts]);
return (
- <View style={styles.container}>
+ <View
+ style={styles.container}
+ accessibilityViewIsModal={true}
+ accessible={false}
+ // SMDV-7835: REMOVED importantForAccessibility="no-hide-descendants"
+ // This was hiding modal children from screen readers
+ >
{showDataErrorAlert && (
<WarningAlert
alertMessage={t('warningAlert.warningMessage', {
@@ -87,11 +93,25 @@ export const ShiftSwitcherModal = ({
<Body weight='700' UNSAFE_style={styles.headerText}>
{t('rosterScreen.shiftChip.modalTitle')}
</Body>
- <IconButton onPress={closeModal} testID='closeBtn'>
+ <IconButton
+ onPress={closeModal}
+ testID='closeBtn'
+ accessibilityLabel={t('rosterScreen.shiftChip.close', {
+ default: 'Close',
+ fallbackLng: 'en-US',
+ })}
+ // SMDV-7827: Ensure button is focusable on Android
+ accessible={true}
+ hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
+ >
<CloseIcon size='medium' />
</IconButton>
</View>
- <View style={styles.body}>
+ <View
+ style={styles.body}
+ // SMDV-7835: REMOVED importantForAccessibility="no-hide-descendants"
+ accessible={false}
+ >
{shiftsError && (
<ErrorScreen
errorTitle={t('rosterScreen.allTeamsScreen.somethingWentWrong')}
@@ -119,6 +139,9 @@ export const ShiftSwitcherModal = ({
? shift.shiftName
: t('rosterScreen.shiftChip.allShifts')
}
+ // SMDV-7793: Add button role and state for shift selection
+ accessibilityRole='button'
+ accessibilityState={{ selected: pickedShift?.shiftId === shift.shiftId }}
/>
))}
</FormGroup>
--- src/screens/AllTeamsScreen/StoreAllTeamsScreen/StoreAllTeamsScreen.tsx
@@ -102,19 +102,20 @@ export const StoreAllTeamsScreen = () => {
{section.isPrimaryArea ? (
<View
accessible={true}
+ accessibilityRole='header'
accessibilityLabel={`${t('rosterScreen.teamWorkgroup.myArea')} ${
section.areaName
}`}
>
- <Text style={styles.myArea}>
+ <Text style={styles.myArea} accessibilityRole='text'>
{t('rosterScreen.teamWorkgroup.myArea')}
</Text>
- <Text testID='primary-area-header' style={styles.myAreaHeader}>
+ <Text testID='primary-area-header' style={styles.myAreaHeader} accessibilityRole='text'>
{section.areaName}
</Text>
</View>
) : (
- <Text style={styles.areaHeader}>{section.areaName}</Text>
+ <Text style={styles.areaHeader} accessibilityRole='header'>{section.areaName}</Text>
)}
</View>
),
| fix(a11y): ada bug fixes | fix(a11y): ada bug fixes
|
6b6f17f28bc41dc277cc1e98b8fdcf123f59d509 | --- src/index.tsx
@@ -50,7 +50,6 @@ export const initialize = async () => {
provider: rnfbProvider,
isTokenAutoRefreshEnabled: true,
});
- addSagas(routePushNotificationSaga);
initNotificationListeners();
};
--- src/redux/Notifications/index.ts
@@ -1,14 +0,0 @@
-import {createActions} from 'reduxsauce';
-import {REDUX_STORE_KEY} from '../../constants';
-
-const {Types, Creators} = createActions<any, any>(
- {
- routePushNotification: ['pushNotificationEvent'],
- },
- {
- prefix: `${REDUX_STORE_KEY}/notifications/`,
- },
-);
-
-export const NotificationTypes = Types;
-export const NotificationActions = Creators;
--- src/redux/Notifications/sagas.ts
@@ -1,20 +0,0 @@
-import {takeLatest, call} from 'redux-saga/effects';
-import {NotificationTypes} from '.';
-import {navigate} from '@walmart/react-native-shared-navigation';
-
-export function* routePushNotification(action: any) {
- const {pushNotificationEvent} = action;
- console.log('invoking navigate method...');
- yield call(navigate, 'texting');
- console.log(
- '*** routePushNotification saga invoked, routing based on event payload ***',
- );
- console.log(pushNotificationEvent);
-}
-
-export function* routePushNotificationSaga() {
- yield takeLatest(
- NotificationTypes.ROUTE_PUSH_NOTIFICATION,
- routePushNotification,
- );
-}
--- src/index.tsx
@@ -50,7 +50,6 @@ export const initialize = async () => {
provider: rnfbProvider,
isTokenAutoRefreshEnabled: true,
});
- addSagas(routePushNotificationSaga);
initNotificationListeners();
};
--- src/redux/Notifications/index.ts
@@ -1,14 +0,0 @@
-import {createActions} from 'reduxsauce';
-import {REDUX_STORE_KEY} from '../../constants';
-
-const {Types, Creators} = createActions<any, any>(
- {
- routePushNotification: ['pushNotificationEvent'],
- },
- {
- prefix: `${REDUX_STORE_KEY}/notifications/`,
- },
-);
-
-export const NotificationTypes = Types;
-export const NotificationActions = Creators;
--- src/redux/Notifications/sagas.ts
@@ -1,20 +0,0 @@
-import {takeLatest, call} from 'redux-saga/effects';
-import {NotificationTypes} from '.';
-import {navigate} from '@walmart/react-native-shared-navigation';
-
-export function* routePushNotification(action: any) {
- const {pushNotificationEvent} = action;
- console.log('invoking navigate method...');
- yield call(navigate, 'texting');
- console.log(
- '*** routePushNotification saga invoked, routing based on event payload ***',
- );
- console.log(pushNotificationEvent);
-}
-
-export function* routePushNotificationSaga() {
- yield takeLatest(
- NotificationTypes.ROUTE_PUSH_NOTIFICATION,
- routePushNotification,
- );
-}
| removing need for redux | removing need for redux
|
3624b057b9a2bf96bcf8cde605a3ed1b7dee07bd | --- targets/US/package.json
@@ -90,7 +90,7 @@
"@walmart/avp-feature-app": "0.10.19",
"@walmart/avp-shared-library": "0.10.5",
"@walmart/backroom-mini-app": "1.9.0",
- "@walmart/calling-mini-app": "0.7.0",
+ "@walmart/calling-mini-app": "0.7.16",
"@walmart/checkout-mini-app": "4.4.2",
"@walmart/compass-sdk-rn": "5.19.15",
"@walmart/config-components": "4.5.6",
@@ -136,7 +136,7 @@
"@walmart/react-native-shared-navigation": "~6.3.28",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.7.4",
- "@walmart/react-native-webex-sdk": "0.8.1",
+ "@walmart/react-native-webex-sdk": "0.8.9",
"@walmart/receipt-check-miniapp": "1.28.1",
"@walmart/redux-store": "~6.3.28",
"@walmart/returns-mini-app": "4.16.6",
--- yarn.lock
@@ -6510,9 +6510,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/calling-mini-app@npm:0.7.0":
- version: 0.7.0
- resolution: "@walmart/calling-mini-app@npm:0.7.0"
+"@walmart/calling-mini-app@npm:0.7.16":
+ version: 0.7.16
+ resolution: "@walmart/calling-mini-app@npm:0.7.16"
peerDependencies:
"@react-native-community/datetimepicker": ">=5"
"@react-navigation/native": ">=6"
@@ -6561,7 +6561,7 @@ __metadata:
dependenciesMeta:
"@walmart/wmconnect-mini-app":
built: false
- checksum: 10c0/64852890c351b781def65da8d6552f869ee9dc2180fd3c50ab15edadd367ab28c576e373d3c2e099f0f48e846233ec77cbb094d19b040f5fe7c24ec36ec47000
+ checksum: 10c0/fc757a4aede4bcb683701140d588c6f1037e4dd97f094fec056205e15bdd20e9e5059816bb9a72b48a0f31a3a0c60d7964a45a40c68e0bbe83b5658a6e903656
languageName: node
linkType: hard
@@ -7431,7 +7431,7 @@ __metadata:
"@walmart/avp-feature-app": "npm:0.10.19"
"@walmart/avp-shared-library": "npm:0.10.5"
"@walmart/backroom-mini-app": "npm:1.9.0"
- "@walmart/calling-mini-app": "npm:0.7.0"
+ "@walmart/calling-mini-app": "npm:0.7.16"
"@walmart/checkout-mini-app": "npm:4.4.2"
"@walmart/compass-sdk-rn": "npm:5.19.15"
"@walmart/config-components": "npm:4.5.6"
@@ -7477,7 +7477,7 @@ __metadata:
"@walmart/react-native-shared-navigation": "npm:~6.3.28"
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.7.4"
- "@walmart/react-native-webex-sdk": "npm:0.8.1"
+ "@walmart/react-native-webex-sdk": "npm:0.8.9"
"@walmart/receipt-check-miniapp": "npm:1.28.1"
"@walmart/redux-store": "npm:~6.3.28"
"@walmart/returns-mini-app": "npm:4.16.6"
@@ -8110,14 +8110,14 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/react-native-webex-sdk@npm:0.8.1":
- version: 0.8.1
- resolution: "@walmart/react-native-webex-sdk@npm:0.8.1"
+"@walmart/react-native-webex-sdk@npm:0.8.9":
+ version: 0.8.9
+ resolution: "@walmart/react-native-webex-sdk@npm:0.8.9"
peerDependencies:
react: "*"
react-native: "*"
react-native-logger: "*"
- checksum: 10c0/f67b5d210b387dfb20f54b8f40bbeee0273189970478ffc50d4a0302b2b25ab798c18bbcab1f5052b65c8d25d281d69e521e4a4815b10669a6b204c8ef070023
+ checksum: 10c0/3ef637eb43e34c74b61db5b3d6240535f7c158a140ad3325aa39ecbc8122eb26525591ef4e026d56336b359a8397d5dd25076fec292b4b55b183130c4cfff847
languageName: node
linkType: hard
| Calling changes for drop 28 | Calling changes for drop 28
|
02f3b3af9498da9c8525535a0a8f4f294cbd0bd7 | --- src/channels/components/UnreadBadge.tsx
@@ -1,10 +1,9 @@
import React from 'react';
-import {useSelector} from 'react-redux';
import Animated, {ZoomIn} from 'react-native-reanimated';
import {Badge} from '@walmart/gtp-shared-components';
import {useUnread} from '../hooks';
import {StyleSheet} from 'react-native';
-import {messageButtonEnabled} from '../../redux/selectors';
+import {useTextingFeatureEnabled} from '../../hooks';
const styles = StyleSheet.create({
badge: {
@@ -14,9 +13,9 @@ const styles = StyleSheet.create({
export const UnreadBadge = () => {
const unread = useUnread();
- const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
+ const isTextingFeatureEnabled: boolean = useTextingFeatureEnabled();
- return unread && isMessageButtonEnabled ? (
+ return unread && isTextingFeatureEnabled ? (
<Animated.View entering={ZoomIn} style={styles.badge}>
<Badge color='spark'>{unread}</Badge>
</Animated.View>
--- src/channels/hooks.ts
@@ -10,6 +10,7 @@ import {
} from '../redux/selectors';
import {useLocalStorage} from '@walmart/core-services/LocalStorage';
import {LOCAL_STORAGE_KEY_PREFIX} from '../constants';
+import {useTextingFeatureEnabled} from '../hooks';
export const useChannelContext = () => useContext(ChannelsContext);
@@ -75,6 +76,7 @@ export const useChannelUnreadCount = () => {
const [unreadChannelsCountState, setUnreadChannelsCountState] = useState<
number | null
>(null);
+ const isTextingFeatureEnabled: boolean = useTextingFeatureEnabled();
useEffect(() => {
localStorage.get(localStorageKey).then((initialUnreadChannelsCount) => {
@@ -90,7 +92,9 @@ export const useChannelUnreadCount = () => {
setUnreadChannelsCountState(unreadChannelsCount);
}, [unreadChannelsCount]);
- return unreadChannelsCountState && unreadChannelsCountState > 0
+ return isTextingFeatureEnabled &&
+ unreadChannelsCountState &&
+ unreadChannelsCountState > 0
? unreadChannelsCountState
: null;
};
@@ -102,6 +106,7 @@ export const useMessagesUnreadCount = () => {
const [unreadMessagesCountState, setUnreadMessagesCountState] = useState<
number | null
>(null);
+ const isTextingFeatureEnabled: boolean = useTextingFeatureEnabled();
useEffect(() => {
localStorage.get(localStorageKey).then((initialUnreadMessagesCount) => {
@@ -117,7 +122,9 @@ export const useMessagesUnreadCount = () => {
setUnreadMessagesCountState(unreadMessagesCount);
}, [unreadMessagesCount]);
- return unreadMessagesCountState && unreadMessagesCountState > 0
+ return isTextingFeatureEnabled &&
+ unreadMessagesCountState &&
+ unreadMessagesCountState > 0
? unreadMessagesCountState
: null;
};
--- src/hooks/user.ts
@@ -1,6 +1,9 @@
import {useSelector} from 'react-redux';
import {UserSelectors, User} from '@walmart/redux-store';
-import {teamLeadJobDescriptions as teamLeadJobDescriptionsSelector} from '../redux/selectors';
+import {
+ messageButtonEnabled,
+ teamLeadJobDescriptions as teamLeadJobDescriptionsSelector,
+} from '../redux/selectors';
import {payTypes} from '../constants';
import {isNil} from 'lodash';
import {useEnvironment} from '@walmart/core-services/Environment';
@@ -48,3 +51,11 @@ export const useIsImpersonatedOnDev = () => {
}
return true;
};
+
+export const useTextingFeatureEnabled = () => {
+ const userIsInRoster = useUserIsInRoster();
+ const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
+ const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev();
+
+ return userIsInRoster && isMessageButtonEnabled && userIsImpersonatedOnDev;
+};
--- src/channels/components/UnreadBadge.tsx
@@ -1,10 +1,9 @@
import React from 'react';
-import {useSelector} from 'react-redux';
import Animated, {ZoomIn} from 'react-native-reanimated';
import {Badge} from '@walmart/gtp-shared-components';
import {useUnread} from '../hooks';
import {StyleSheet} from 'react-native';
-import {messageButtonEnabled} from '../../redux/selectors';
+import {useTextingFeatureEnabled} from '../../hooks';
const styles = StyleSheet.create({
badge: {
@@ -14,9 +13,9 @@ const styles = StyleSheet.create({
export const UnreadBadge = () => {
const unread = useUnread();
- const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
+ const isTextingFeatureEnabled: boolean = useTextingFeatureEnabled();
- return unread && isMessageButtonEnabled ? (
+ return unread && isTextingFeatureEnabled ? (
<Animated.View entering={ZoomIn} style={styles.badge}>
<Badge color='spark'>{unread}</Badge>
</Animated.View>
--- src/channels/hooks.ts
@@ -10,6 +10,7 @@ import {
} from '../redux/selectors';
import {useLocalStorage} from '@walmart/core-services/LocalStorage';
import {LOCAL_STORAGE_KEY_PREFIX} from '../constants';
+import {useTextingFeatureEnabled} from '../hooks';
export const useChannelContext = () => useContext(ChannelsContext);
@@ -75,6 +76,7 @@ export const useChannelUnreadCount = () => {
const [unreadChannelsCountState, setUnreadChannelsCountState] = useState<
number | null
>(null);
+ const isTextingFeatureEnabled: boolean = useTextingFeatureEnabled();
useEffect(() => {
localStorage.get(localStorageKey).then((initialUnreadChannelsCount) => {
@@ -90,7 +92,9 @@ export const useChannelUnreadCount = () => {
setUnreadChannelsCountState(unreadChannelsCount);
}, [unreadChannelsCount]);
- return unreadChannelsCountState && unreadChannelsCountState > 0
+ return isTextingFeatureEnabled &&
+ unreadChannelsCountState &&
+ unreadChannelsCountState > 0
? unreadChannelsCountState
: null;
};
@@ -102,6 +106,7 @@ export const useMessagesUnreadCount = () => {
const [unreadMessagesCountState, setUnreadMessagesCountState] = useState<
number | null
>(null);
+ const isTextingFeatureEnabled: boolean = useTextingFeatureEnabled();
useEffect(() => {
localStorage.get(localStorageKey).then((initialUnreadMessagesCount) => {
@@ -117,7 +122,9 @@ export const useMessagesUnreadCount = () => {
setUnreadMessagesCountState(unreadMessagesCount);
}, [unreadMessagesCount]);
- return unreadMessagesCountState && unreadMessagesCountState > 0
+ return isTextingFeatureEnabled &&
+ unreadMessagesCountState &&
+ unreadMessagesCountState > 0
? unreadMessagesCountState
: null;
};
--- src/hooks/user.ts
@@ -1,6 +1,9 @@
import {useSelector} from 'react-redux';
import {UserSelectors, User} from '@walmart/redux-store';
-import {teamLeadJobDescriptions as teamLeadJobDescriptionsSelector} from '../redux/selectors';
+import {
+ messageButtonEnabled,
+ teamLeadJobDescriptions as teamLeadJobDescriptionsSelector,
+} from '../redux/selectors';
import {payTypes} from '../constants';
import {isNil} from 'lodash';
import {useEnvironment} from '@walmart/core-services/Environment';
@@ -48,3 +51,11 @@ export const useIsImpersonatedOnDev = () => {
}
return true;
};
+
+export const useTextingFeatureEnabled = () => {
+ const userIsInRoster = useUserIsInRoster();
+ const isMessageButtonEnabled: boolean = useSelector(messageButtonEnabled);
+ const userIsImpersonatedOnDev: boolean = useIsImpersonatedOnDev();
+
+ return userIsInRoster && isMessageButtonEnabled && userIsImpersonatedOnDev;
+};
| hide badge count when user not in roster | hide badge count when user not in roster
|
176bcb5fa7e2d1867d6e5eff18ac824916e29f49 | --- targets/US/package.json
@@ -150,7 +150,7 @@
"@walmart/taskit-mini-app": "4.25.8",
"@walmart/time-clock-mini-app": "2.448.1",
"@walmart/topstock-mini-app": "1.19.4",
- "@walmart/translator-mini-app": "1.3.8",
+ "@walmart/translator-mini-app": "1.3.9",
"@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.18.7#~/.yarn/patches/@walmart-ui-components-npm-1.18.7-9e23294b76.patch",
"@walmart/walmart-fiscal-week": "^0.3.6",
"@walmart/welcomeme-mini-app": "0.96.0",
--- yarn.lock
@@ -7065,7 +7065,7 @@ __metadata:
"@walmart/taskit-mini-app": "npm:4.25.8"
"@walmart/time-clock-mini-app": "npm:2.448.1"
"@walmart/topstock-mini-app": "npm:1.19.4"
- "@walmart/translator-mini-app": "npm:1.3.8"
+ "@walmart/translator-mini-app": "npm:1.3.9"
"@walmart/ui-components": "patch:@walmart/ui-components@npm%3A1.18.7#~/.yarn/patches/@walmart-ui-components-npm-1.18.7-9e23294b76.patch"
"@walmart/walmart-fiscal-week": "npm:^0.3.6"
"@walmart/welcomeme-mini-app": "npm:0.96.0"
@@ -8093,9 +8093,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/translator-mini-app@npm:1.3.8":
- version: 1.3.8
- resolution: "@walmart/translator-mini-app@npm:1.3.8"
+"@walmart/translator-mini-app@npm:1.3.9":
+ version: 1.3.9
+ resolution: "@walmart/translator-mini-app@npm:1.3.9"
peerDependencies:
"@react-native-async-storage/async-storage": ^2.0.0
"@react-native-clipboard/clipboard": ^1.14.2
@@ -8110,7 +8110,7 @@ __metadata:
react-native-svg: ">=14.0.0"
react-native-wm-voice-text: ^1.0.4
uuid: ">=3.0.0"
- checksum: 10c0/2f9e9e9687690d57aa2609449ad827383648eab25496ad0e353253c82d08da65aee5fed7fee7c8b7705db2d0d915b4907cc2d416401f4203a482a4206c12777d
+ checksum: 10c0/4a2b0f9dcb8ef7d290e17c3f104ecdb7bf750198b89a025a39ae9a33dc2ba7e7523e12ebb486d2c1f4bcda041a34023edc1229724ba2f25c05a30a7a4e19b3e0
languageName: node
linkType: hard
| Version bump | Version bump |
7ea39252530cc812b9fed6631a50b5bd52388581 | --- src/presence/sagas.ts
@@ -11,7 +11,7 @@ import {
} from '@walmart/redux-store';
import {getLastOfflineTime, goOnlineForUser} from './service';
import {isNil} from 'lodash';
-import {ClockStatusEnum} from "../utils/ClockStatusEnum";
+import {ClockStatusEnum} from '../utils/ClockStatusEnum';
export function* DoNotDisturbAutoResetSaga() {
const userId: string = yield select(getEncryptedUserId);
--- src/presence/sagas.ts
@@ -11,7 +11,7 @@ import {
} from '@walmart/redux-store';
import {getLastOfflineTime, goOnlineForUser} from './service';
import {isNil} from 'lodash';
-import {ClockStatusEnum} from "../utils/ClockStatusEnum";
+import {ClockStatusEnum} from '../utils/ClockStatusEnum';
export function* DoNotDisturbAutoResetSaga() {
const userId: string = yield select(getEncryptedUserId);
| fix format issue | fix format issue
|
70dc0301c859b68e99359071d26ba8aafc1b2b61 | --- .looper.multibranch.yml
@@ -24,7 +24,7 @@ envs:
ANDROID_BASE_PATH: targets/US/android
branches:
- - spec: feature/drop24
+ - spec: feature/drop24-iteminfo
triggers:
- manual:
name: Publish Packages (Pre-Release)
| revert the looper change | revert the looper change
|
a05b32c10d548b51932734eeddd0b90f7c14c8ee | --- src/utils/teams.ts
@@ -56,13 +56,13 @@ export const sortWorkgroupKeysForTeamList = (
export const sortTeamsAscComparator = (teamA: Team, teamB: Team) => {
if (teamA.teamName && teamB.teamName) {
if (teamA.teamName > teamB.teamName) {
- return 1;
+ return DESC_SORT;
} else if (teamA.teamName < teamB.teamName) {
- return -1;
+ return ASC_SORT;
} else {
- return 0;
+ return NO_SORT;
}
} else {
- return 0;
+ return NO_SORT;
}
};
--- src/utils/teams.ts
@@ -56,13 +56,13 @@ export const sortWorkgroupKeysForTeamList = (
export const sortTeamsAscComparator = (teamA: Team, teamB: Team) => {
if (teamA.teamName && teamB.teamName) {
if (teamA.teamName > teamB.teamName) {
- return 1;
+ return DESC_SORT;
} else if (teamA.teamName < teamB.teamName) {
- return -1;
+ return ASC_SORT;
} else {
- return 0;
+ return NO_SORT;
}
} else {
- return 0;
+ return NO_SORT;
}
};
| updating sort numeric to use const | updating sort numeric to use const
|
71bb920063315b18206e44a6ec4ee29041df3fc8 | --- __tests__/screens/ChannelsScreen/ChannelsScreenTest.tsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import {ChannelsScreen} from '../../../src/screens/ChannelsScreen';
+
+const {renderWithProviders} = require('../../harness');
+describe('ChannelsScreenTest', () => {
+ it('should render channels screen', () => {
+ const channelsScreen = renderWithProviders(<ChannelsScreen />);
+ expect(channelsScreen.toJSON()).toMatchSnapshot();
+ });
+});
--- __tests__/screens/ChannelsScreen/__snapshots__/ChannelsScreenTest.tsx.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ChannelsScreenTest should render channels screen 1`] = `
+<View>
+ <Text>
+ Placeholder For Channels Screen Integration
+ </Text>
+</View>
+`;
+
+exports[`ChannelsScreenTest should render tabs screen with expected elements 1`] = `
+<View>
+ <Text>
+ Placeholder For Channels Screen Integration
+ </Text>
+</View>
+`;
| Adding channels screen test coverage | Adding channels screen test coverage
|
e833314f7e1dac2a14cc8e16e40081975b25365e | --- android/app/build.gradle
@@ -235,6 +235,7 @@ dependencies {
}
implementation "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava"
+ implementation 'com.walmart.ssmp:platform-core:1.0.3'
}
// Run this once to be able to run the application with BUCK
--- android/app/src/main/java/com/walmart/stores/allspark/beta/MainApplication.java
@@ -11,16 +11,10 @@ import com.facebook.react.ReactPackage;
import com.facebook.soloader.SoLoader;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
-import com.walmart.sso.react.SSOReactApplication;
-
-public class MainApplication extends SSOReactApplication implements ReactApplication {
- private static final String REDIRECT_URI = "com.walmart.stores.allspark.beta://SSOLogin";
-
- @Override
- public String getSSORedirectUri() {
- return REDIRECT_URI;
- }
+import com.walmart.ssmp.platform.core.PlatformCoreApplication;
+public class MainApplication extends PlatformCoreApplication implements ReactApplication {
+
private final ReactNativeHost mReactNativeHost =
new ReactNativeHost(this) {
@Override
--- ios/Podfile.lock
@@ -717,8 +717,8 @@ PODS:
- RNWMSSOLibrary (1.1.0):
- AppAuth
- React
- - SSO (= 1.1.5)
- - SSO (1.1.5):
+ - SSO (= 1.1.8)
+ - SSO (1.1.8):
- AppAuth
- Starscream (3.0.6)
- Yoga (1.14.0)
@@ -1055,8 +1055,8 @@ SPEC CHECKSUMS:
RNSketchCanvas: 6939b18677cd1794151cc3d8eb5a0a2158a4a05b
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
- RNWMSSOLibrary: 78ffa8e6b3a515b4bce44b0ee17fe74daeee9cba
- SSO: 6e2ce260ff8736be5c909fbe53823f4dad32dade
+ RNWMSSOLibrary: f380671dac725f608655df6cb08ff8f6bd7c8b27
+ SSO: 70a7e8ba33b6c960d5d2a7fb2c5b34f559ed86b2
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
--- package-lock.json
@@ -12259,9 +12259,9 @@
"integrity": "sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg=="
},
"react-native-ssmp-sso-allspark": {
- "version": "0.0.4",
- "resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-0.0.4.tgz",
- "integrity": "sha512-+3NWR4md2763c61JGxdDUDtuqv40Cbo0Z208I9yFrLNfd3R9QjMWNG7QCfG7wTfqfTsQXofZyLGtwV/n1t68Vw=="
+ "version": "0.1.2",
+ "resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-0.1.2.tgz",
+ "integrity": "sha512-ufyAJ6gSdLpfPA8jW4tSjB6x+aYlWyqc9ix6ZQxBOkdEBB/eCqSNEKSn8ZyTe6ffxZFB5YNOTXZORaHTVHuB5A=="
},
"react-native-sumo-sdk": {
"version": "2.7.3-rc.2",
--- package.json
@@ -93,7 +93,7 @@
"react-native-screens": "^2.10.1",
"react-native-sha256": "^1.3.6",
"react-native-splash-screen": "^3.2.0",
- "react-native-ssmp-sso-allspark": "0.0.4",
+ "react-native-ssmp-sso-allspark": "0.1.2",
"react-native-sumo-sdk": "2.7.3-rc.2",
"react-native-svg": "^12.1.0",
"react-native-tab-view": "^2.15.2",
| SSO Version bump up to 0.1.1 (#275) | SSO Version bump up to 0.1.1 (#275)
* SSO Version bump up to 0.1.1
* Updated division key in getUser api for sso framework
Co-authored-by: Anukalp Katyal - a0k04qv <Anukalp.Katyal@walmartlabs.com>
Co-authored-by: Anthony Helms - awhelms <awhelms@wal-mart.com> |
6ef4589f37110b84b7f2aa7272aa345c11befd8c | --- package.json
@@ -122,7 +122,7 @@
"@walmart/mod-flex-mini-app": "1.27.0",
"@walmart/moment-walmart": "1.0.4",
"@walmart/money-auth-shared-components": "2.3.9",
- "@walmart/myteam-mini-app": "1.41.0",
+ "@walmart/myteam-mini-app": "3.0.1",
"@walmart/native-rfid-scanner": "4.0.22",
"@walmart/onewalmart-miniapp": "1.0.27",
"@walmart/online-w4-mini-app": "0.7.26",
@@ -146,7 +146,7 @@
"@walmart/rfid-scan-mini-app": "2.10.4",
"@walmart/rn-mobile-sdk-pairing": "2.1.8",
"@walmart/rn-receiving-mini-app": "2.4.97",
- "@walmart/roster-mini-app": "2.45.0",
+ "@walmart/roster-mini-app": "3.1.1",
"@walmart/schedule-mini-app": "2.1.3",
"@walmart/shelfavailability-mini-app": "1.5.45",
"@walmart/shop-gnfr-mini-app": "1.0.302",
@@ -162,7 +162,7 @@
"@walmart/welcomeme-mini-app": "1.0.12",
"@walmart/wfm-ui": "3.0.2",
"@walmart/wm-plus-mini-app": "1.5.4",
- "@walmart/wmconnect-mini-app": "2.39.0",
+ "@walmart/wmconnect-mini-app": "3.1.1",
"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",
"axios-cache-interceptor": "patch:axios-cache-interceptor@npm%3A1.5.1#~/.yarn/patches/axios-cache-interceptor-npm-1.5.1-c84dd3f9ed.patch",
--- yarn.lock
@@ -7463,7 +7463,7 @@ __metadata:
"@walmart/mod-flex-mini-app": "npm:1.27.0"
"@walmart/moment-walmart": "npm:1.0.4"
"@walmart/money-auth-shared-components": "npm:2.3.9"
- "@walmart/myteam-mini-app": "npm:1.41.0"
+ "@walmart/myteam-mini-app": "npm:3.0.1"
"@walmart/native-rfid-scanner": "npm:4.0.22"
"@walmart/onewalmart-miniapp": "npm:1.0.27"
"@walmart/online-w4-mini-app": "npm:0.7.26"
@@ -7487,7 +7487,7 @@ __metadata:
"@walmart/rfid-scan-mini-app": "npm:2.10.4"
"@walmart/rn-mobile-sdk-pairing": "npm:2.1.8"
"@walmart/rn-receiving-mini-app": "npm:2.4.97"
- "@walmart/roster-mini-app": "npm:2.45.0"
+ "@walmart/roster-mini-app": "npm:3.1.1"
"@walmart/schedule-mini-app": "npm:2.1.3"
"@walmart/shelfavailability-mini-app": "npm:1.5.45"
"@walmart/shop-gnfr-mini-app": "npm:1.0.302"
@@ -7503,7 +7503,7 @@ __metadata:
"@walmart/welcomeme-mini-app": "npm:1.0.12"
"@walmart/wfm-ui": "npm:3.0.2"
"@walmart/wm-plus-mini-app": "npm:1.5.4"
- "@walmart/wmconnect-mini-app": "npm:2.39.0"
+ "@walmart/wmconnect-mini-app": "npm:3.1.1"
adaptive-expressions: "npm:^4.13.5"
adaptivecards-templating: "npm:^2.1.0"
axios: "npm:~1.6.0"
@@ -7791,9 +7791,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/myteam-mini-app@npm:1.41.0":
- version: 1.41.0
- resolution: "@walmart/myteam-mini-app@npm:1.41.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmyteam-mini-app%2F-%2F%40walmart%2Fmyteam-mini-app-1.41.0.tgz"
+"@walmart/myteam-mini-app@npm:3.0.1":
+ version: 3.0.1
+ resolution: "@walmart/myteam-mini-app@npm:3.0.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fmyteam-mini-app%2F-%2F%40walmart%2Fmyteam-mini-app-3.0.1.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=6.32.0"
expo: ~52.0.46
@@ -7804,7 +7804,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/71ccbeec91b0d3a9eb50c9afad2825191ea956b2079a8feda67e4b9a959fb83e4a037341507ce73a3b20800b07b2c1e39cd412b8178c522e11e8e9299154c04d
+ checksum: 10c0/a30fd7cc6904d9d6da2bbea49356f34851b3ac1fc8aba2f9da55ce80b15e270bf758c368f0aaf3e5b02ae72123930eb4a09ff85b3607f94991d4119e56cdfb66
languageName: node
linkType: hard
@@ -8160,9 +8160,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/roster-mini-app@npm:2.45.0":
- version: 2.45.0
- resolution: "@walmart/roster-mini-app@npm:2.45.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-2.45.0.tgz"
+"@walmart/roster-mini-app@npm:3.1.1":
+ version: 3.1.1
+ resolution: "@walmart/roster-mini-app@npm:3.1.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Froster-mini-app%2F-%2F%40walmart%2Froster-mini-app-3.1.1.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=6.32.0"
expo: ~52.0.46
@@ -8173,7 +8173,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/659e6a4f5e6a8d321d7e830dea675e7fd2105fc31f3fc20936daa5ce2cbdf906a5be290f5f1f97c500389ef1ca0149ae0473f77760ba09aebda6ea9dbb6638fe
+ checksum: 10c0/c992f01a4f72a2eef06795b8a47252dca25e8016c2612a3272d1177063afdbe2f883d270548c18241214b0ee5a17664fd980b06e49a002e4a2d99135f39b0ee0
languageName: node
linkType: hard
@@ -8608,9 +8608,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:2.39.0":
- version: 2.39.0
- resolution: "@walmart/wmconnect-mini-app@npm:2.39.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.39.0.tgz"
+"@walmart/wmconnect-mini-app@npm:3.1.1":
+ version: 3.1.1
+ resolution: "@walmart/wmconnect-mini-app@npm:3.1.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-3.1.1.tgz"
peerDependencies:
"@walmart/allspark-foundation": ">=6.32.0"
expo: ~52.0.46
@@ -8621,7 +8621,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/4bf17de2513473705c723bc3f4767a1c96aa2379b75cf6569dd1d11448345c064eaf0f15d30c499df8062156cab0169648feda7c50e8ff3775dc5f4c2dedb86e
+ checksum: 10c0/02d52dbec11b2444054acfc6cda5fc26fcbeb4bc33948216abb071e43786cc4fb53314b2c654835a7d5fd22cb432159b9dd624f563e63e9ae4a243d77c539108
languageName: node
linkType: hard
| fix(ui): roster mini app graphql error log fix (#4370) | fix(ui): roster mini app graphql error log fix (#4370)
* fix(ui): roster grahql query changes from Drop 30
* feat(ui): revert yarn.lock to match the develop
* feat(ui): update yarn.lock
---------
Co-authored-by: p0d02sx <prasansuresh.dhresh@walmart.com> |
a25ea0054732189053ce3567256511c00631c60d | --- example/src/container/featureRunner.ts
@@ -4,5 +4,12 @@ export const ContainerFeatureRunnerConfig = (e: IContainerEnvironment) => {
return {
authConfigs: [e.auth],
siteIdRequired: true,
+ impersonationConfig: {
+ domains: [
+ {text: 'Homeoffice', code: 'homeoffice'},
+ {text: 'Store', code: 'store'},
+ {text: 'DC', code: 'dc'},
+ ],
+ },
};
};
| chore: example fix for impersonation test | chore: example fix for impersonation test
|
939248a76bff1bd0afb62135efa97f18e4e9afcc | --- package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "@walmart/texting-mini-app",
+ "name": "@walmart/myteam-mini-app",
"version": "2.1.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
- "name": "@walmart/texting-mini-app",
+ "name": "@walmart/myteam-mini-app",
"version": "2.1.0",
"hasInstallScript": true,
"devDependencies": {
--- package.json
@@ -1,13 +1,12 @@
{
- "name": "@walmart/texting-mini-app",
- "version": "2.1.0",
+ "name": "@walmart/myteam-mini-app",
+ "version": "1.0.0",
"private": false,
"main": "dist/index.js",
"files": [
"dist"
],
"scripts": {
- "android": "react-native run-android --active-arch-only",
"android": "react-native run-android --active-arch-only",
"ios": "react-native run-ios",
"coverage": "TZ=UTC jest --coverage",
| updating package name | updating package name
|
083b4b5a1b01a39e8d5493d0b0240a7953767625 | --- package-lock.json
@@ -72,7 +72,7 @@
"@walmart/ims-print-services-ui": "2.10.3",
"@walmart/inbox-mini-app": "0.92.10",
"@walmart/iteminfo-mini-app": "7.10.13",
- "@walmart/learning-mini-app": "20.0.12",
+ "@walmart/learning-mini-app": "20.0.14",
"@walmart/manager-approvals-miniapp": "0.2.4",
"@walmart/me-at-walmart-athena-queries": "6.0.15",
"@walmart/me-at-walmart-common": "6.0.15",
@@ -11731,9 +11731,9 @@
}
},
"node_modules/@walmart/learning-mini-app": {
- "version": "20.0.12",
- "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-20.0.12.tgz",
- "integrity": "sha512-TuviC2KC/qCbTjt1+UOvukPb1NPA8s7Oo+Dlqk5Velb4dHziSD3RCiIgOVsPFw54axl/O2+4dw6Ie4wUUXiLeQ==",
+ "version": "20.0.14",
+ "resolved": "https://npme.walmart.com/@walmart/learning-mini-app/-/learning-mini-app-20.0.14.tgz",
+ "integrity": "sha512-xQRTRohtgAEmWrqrFc9MxAS1BmKG4cVXPjGJ8bOn/Bj8Rm94WrcJ+MVwScacjRM5D2Lo5TBPIGbvgG1FlX6E/w==",
"hasInstallScript": true,
"peerDependencies": {
"@atmt/feedback-component-native": "^8.0.0",
| updated learning changes in package lock file | updated learning changes in package lock file
|
a36ba2cfdfa30aecf6922f157bad874316f5b39a | --- targets/US/package.json
@@ -131,7 +131,7 @@
"@walmart/react-native-encrypted-storage": "~1.1.3",
"@walmart/react-native-env": "~6.3.28",
"@walmart/react-native-logger": "1.35.0",
- "@walmart/react-native-scanner-3.0": "0.9.2",
+ "@walmart/react-native-scanner-3.0": "0.10.1",
"@walmart/react-native-shared-navigation": "~6.3.28",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.7.2-alpha.2",
--- yarn.lock
@@ -7047,7 +7047,7 @@ __metadata:
"@walmart/react-native-encrypted-storage": "npm:~1.1.3"
"@walmart/react-native-env": "npm:~6.3.28"
"@walmart/react-native-logger": "npm:1.35.0"
- "@walmart/react-native-scanner-3.0": "npm:0.9.2"
+ "@walmart/react-native-scanner-3.0": "npm:0.10.1"
"@walmart/react-native-shared-navigation": "npm:~6.3.28"
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.7.2-alpha.2"
@@ -7626,12 +7626,12 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/react-native-scanner-3.0@npm:0.9.2":
- version: 0.9.2
- resolution: "@walmart/react-native-scanner-3.0@npm:0.9.2"
+"@walmart/react-native-scanner-3.0@npm:0.10.1":
+ version: 0.10.1
+ resolution: "@walmart/react-native-scanner-3.0@npm:0.10.1"
peerDependencies:
react-native: ">=0.47.1"
- checksum: 10c0/0e72d45ec8bd4590f08ee28f0782629b9c12f33a1ca8a391189df3ed3fb03efc384de340688c6a09ade031570b3a4a1231e52fc4cce46d6477b89750d0c6dbd2
+ checksum: 10c0/48c777234afaf07d6f4628dbd880870fc3f64016447e26a55d472453d1c397d94d6f270b91e6340ff8f109207f3f6e0d1385369ea197a850cff142d41be45dbc
languageName: node
linkType: hard
| Updated Scanner 3.0 version to 0.10.1 | Updated Scanner 3.0 version to 0.10.1
|
e1f7fe84add65662e23c27b1bb994b6ee7e1a3a5 | --- ios/Podfile.lock
@@ -339,11 +339,11 @@ PODS:
- nanopb (~> 1.30906.0)
- GoogleDataTransport (7.5.1):
- nanopb (~> 1.30906.0)
- - GoogleToolboxForMac/Defines (2.3.0)
- - GoogleToolboxForMac/Logger (2.3.0):
- - GoogleToolboxForMac/Defines (= 2.3.0)
- - "GoogleToolboxForMac/NSData+zlib (2.3.0)":
- - GoogleToolboxForMac/Defines (= 2.3.0)
+ - GoogleToolboxForMac/Defines (2.3.1)
+ - GoogleToolboxForMac/Logger (2.3.1):
+ - GoogleToolboxForMac/Defines (= 2.3.1)
+ - "GoogleToolboxForMac/NSData+zlib (2.3.1)":
+ - GoogleToolboxForMac/Defines (= 2.3.1)
- GoogleUtilities/AppDelegateSwizzler (6.7.2):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
@@ -399,9 +399,9 @@ PODS:
- RNPermissions
- Permission-Notifications (3.0.0):
- RNPermissions
- - PromisesObjC (1.2.11)
+ - PromisesObjC (1.2.12)
- Protobuf (3.14.0)
- - PTT (0.5.10):
+ - PTT (0.5.11):
- BinaryCodable (~> 0.2.1)
- CocoaAsyncSocket (~> 7.6.3)
- Starscream (~> 3.0.2)
@@ -581,8 +581,8 @@ PODS:
- React-Core
- react-native-pdf (6.2.2):
- React-Core
- - react-native-ptt-module (1.2.4):
- - PTT (= 0.5.10)
+ - react-native-ptt-module (1.2.5):
+ - PTT (= 0.5.11)
- React
- react-native-safe-area-context (3.1.8):
- React-Core
@@ -1001,7 +1001,7 @@ SPEC CHECKSUMS:
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
- GoogleToolboxForMac: 1350d40e86a76f7863928d63bcb0b89c84c521c5
+ GoogleToolboxForMac: 471e0c05d39506e50e6398f46fa9a12ae0efeff9
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
"gRPC-C++": 13d8ccef97d5c3c441b7e3c529ef28ebee86fad2
gRPC-Core: 4afa11bfbedf7cdecd04de535a9e046893404ed5
@@ -1010,9 +1010,9 @@ SPEC CHECKSUMS:
nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
Permission-LocationWhenInUse: e09ae67e8db2b1eeefb35f18ca59848d0785de5b
Permission-Notifications: 4325073de6e418cfbbdd8d296822c419d8ddc7ef
- PromisesObjC: 8c196f5a328c2cba3e74624585467a557dcb482f
+ PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97
Protobuf: 0cde852566359049847168e51bd1c690e0f70056
- PTT: 08364784aae6db4fb960f97b16ef678126bd482c
+ PTT: 9aaf05f7d53510d5c760d3db980819371eb84971
RCTRequired: f13f25e7b12f925f1f6a6a8c69d929a03c0129fe
RCTTypeSafety: 44982c5c8e43ff4141eb519a8ddc88059acd1f3a
React: e1c65dd41cb9db13b99f24608e47dd595f28ca9a
@@ -1028,7 +1028,7 @@ SPEC CHECKSUMS:
react-native-logger: 88537463b366327369573223d504dc806fccde02
react-native-netinfo: e36c1bb6df27ab84aa933679b3f5bbf9d180b18f
react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
- react-native-ptt-module: 9d699df88a3d33dd00f654f31bad7cdd47734a49
+ react-native-ptt-module: c59650c285203ee68b084b850a59eb34c9065d81
react-native-safe-area-context: 01158a92c300895d79dee447e980672dc3fb85a6
react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
react-native-sumo-sdk: 8a034fe724417d8c9465951630e229edef2f738f
--- package-lock.json
@@ -3125,9 +3125,9 @@
}
},
"@walmart/push-to-talk-mini-app": {
- "version": "0.0.86",
- "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.0.86.tgz",
- "integrity": "sha512-vbYP7vftCMv6BSXecCbMpegWWnxKPkN0cXplY26zeadlBjDUy4j0FtYzsmmAKzwCzABu15+pxfmFt3aJErKLfA=="
+ "version": "0.2.0",
+ "resolved": "https://npme.walmart.com/@walmart/push-to-talk-mini-app/-/push-to-talk-mini-app-0.2.0.tgz",
+ "integrity": "sha512-ysiDSqAAZwq5CJ/FYM7WY+jigNJ91gt2DEsEhUBMYvxwCsb7rwqdymOG8kz6KiQ10B1SY4ZwEQVDrjKJYUOt/w=="
},
"@walmart/react-native-collapsible": {
"version": "1.5.3",
@@ -12254,9 +12254,9 @@
"integrity": "sha512-PO99dptMocEfUSS3SM7gY6UqophaBxizKjnZ7FcEwa+H4ONVxTk310/JCXJ9vdNunomgpxHluKRXnApfm9Md1w=="
},
"react-native-ptt-module": {
- "version": "1.2.4",
- "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.2.4.tgz",
- "integrity": "sha512-fsdmoq9Be+0nlyTAQEw2M+8+sFyHPhsy5dVp6K8lp7sFjjfUL0/+6F4jcoojKefDDfq/YJH+L3jNcmoqNcTWpA=="
+ "version": "1.2.5",
+ "resolved": "https://npme.walmart.com/react-native-ptt-module/-/react-native-ptt-module-1.2.5.tgz",
+ "integrity": "sha512-++OzmoJTQFDbZRqUFfYo9DkIa+6r/9sA7qKUI9tAhMe8y7bJlHFUMwvCcMCHYwPaJJV8v3ubjgMUwaHjcUpDDw=="
},
"react-native-qrcode-svg": {
"version": "6.0.6",
--- package.json
@@ -58,7 +58,7 @@
"@walmart/impersonation-mini-app": "1.0.12",
"@walmart/inbox-mini-app": "0.0.53",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/push-to-talk-mini-app": "0.0.86",
+ "@walmart/push-to-talk-mini-app": "0.2.0",
"@walmart/react-native-env": "^0.1.0",
"@walmart/react-native-logger": "^1.22.0",
"@walmart/react-native-shared-navigation": "^0.3.0",
@@ -87,7 +87,7 @@
"react-native-pdf": "^6.2.0",
"react-native-permissions": "3.0.0",
"react-native-popup-menu": "^0.15.9",
- "react-native-ptt-module": "1.2.4",
+ "react-native-ptt-module": "1.2.5",
"react-native-qrcode-svg": "^6.0.6",
"react-native-reanimated": "^1.10.2",
"react-native-safe-area-context": "^3.1.3",
| chore: bump to version 0.2.0 for PTT mini app (#347) | chore: bump to version 0.2.0 for PTT mini app (#347)
Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com> |
83d1572eb6f9c4920eef8f00e74598ef357e9a6b | --- __tests__/rbacConfig/RbacSagasTest.tsx
@@ -7,6 +7,13 @@ import {
onRbacRequest,
watchForRbacRequest,
} from '../../src/rbacConfig/RbacSagas';
+import {Logger} from '../../src/core/Logger';
+
+jest.mock('../../src/core/Logger', () => ({
+ Logger: {
+ error: jest.fn(),
+ },
+}));
let meganavData = {
initialized: true,
@@ -74,17 +81,23 @@ describe('onRbacRequest', () => {
expect(iterator.next(rbacData).value).toEqual(select(MeganavSelector));
meganavData.data.data[1].navs[0].enabled = false;
expect(iterator.next(meganavData).value).toEqual(
- put(NavConfigActionCreators.fetchSuccess(meganavData.data)),
+ put(NavConfigActionCreators.fetchSuccess(meganavData?.data)),
);
expect(iterator.next().done).toEqual(true);
});
it('failure case', () => {
const iterator = onRbacRequest();
+ const error = new Error('Something went wrong');
expect(iterator.next().value).toEqual(select(getRbacEnabledApps));
expect(iterator.next().value).toEqual(select(rbacDataSelector));
- expect(iterator.next().value).toEqual(select(MeganavSelector));
- expect(iterator.next().value).toBe(undefined);
+ expect(iterator.throw(error).value).toBeFalsy();
+ expect(Logger.error).toHaveBeenCalledWith(
+ 'Error updating meganav from rbac config',
+ {
+ message: error.message,
+ },
+ );
});
});
--- package-lock.json
@@ -61,8 +61,8 @@
"@walmart/mod-flex-mini-app": "1.2.7",
"@walmart/moment-walmart": "1.0.4",
"@walmart/OneWalmart-MiniApp": "1.0.12",
- "@walmart/pay-stub-miniapp": "^0.9.7",
- "@walmart/payrollsolution_miniapp": "^0.130.4",
+ "@walmart/pay-stub-miniapp": "0.9.7",
+ "@walmart/payrollsolution_miniapp": "0.130.4",
"@walmart/price-changes-mini-app": "1.5.6",
"@walmart/profile-feature-app": "0.74.0",
"@walmart/push-to-talk-mini-app": "1.8.29",
--- package.json
@@ -73,6 +73,7 @@
"@react-navigation/stack": "^6.1.0",
"@sharcoux/slider": "^6.1.1",
"@terrylinla/react-native-sketch-canvas": "0.8.0",
+ "@walmart/OneWalmart-MiniApp": "1.0.12",
"@walmart/allspark-health-survey-mini-app": "0.0.44",
"@walmart/allspark-home-mini-app": "0.6.12",
"@walmart/allspark-neon-core": "0.1.31",
@@ -102,7 +103,6 @@
"@walmart/metrics-mini-app": "0.9.33",
"@walmart/mod-flex-mini-app": "1.2.7",
"@walmart/moment-walmart": "1.0.4",
- "@walmart/OneWalmart-MiniApp": "1.0.12",
"@walmart/pay-stub-miniapp": "0.9.7",
"@walmart/payrollsolution_miniapp": "0.130.4",
"@walmart/price-changes-mini-app": "1.5.6",
--- src/rbacConfig/RbacSagas.tsx
@@ -26,7 +26,7 @@ export function* onRbacRequest(): any {
);
//updating the meganav data
- yield put(NavConfigActionCreators.fetchSuccess(updatedMeganavData.data));
+ yield put(NavConfigActionCreators.fetchSuccess(updatedMeganavData?.data));
} catch (error) {
Logger.error('Error updating meganav from rbac config', {
message: (error as Error).message,
--- src/rbacConfig/utility/updateMeganavData.tsx
@@ -43,22 +43,22 @@ export const compareData = (
) => {
for (let i = 0; i < menus.length; i++) {
if (
- !(navIndex === 3 && level === 2 && menus[i].menuType === 'SEPARATOR') &&
- sanitize(menus[i].id) === splitRbacPolicy[level]
+ !(navIndex === 3 && level === 2 && menus[i]?.menuType === 'SEPARATOR') &&
+ sanitize(menus[i]?.id) === splitRbacPolicy[level]
) {
/*-----------We have got a matching data here. Refer the above comments----------------*/
if (
- splitRbacPolicy.length === RbacPolicyLength.QUICKACTION ||
- splitRbacPolicy.length === RbacPolicyLength.BOTTOMNAV ||
- (splitRbacPolicy.length === RbacPolicyLength.SIDENAV && level === 2)
+ splitRbacPolicy?.length === RbacPolicyLength.QUICKACTION ||
+ splitRbacPolicy?.length === RbacPolicyLength.BOTTOMNAV ||
+ (splitRbacPolicy?.length === RbacPolicyLength.SIDENAV && level === 2)
) {
menus[i].enabled = false;
return meganavClonedData;
} else {
- if (level === 1 && menus[i].enabled === true) {
+ if (level === 1 && menus[i]?.enabled === true) {
/*-----------Only in the case of Sidenav in which mainMenu is enabled----------------*/
level++;
- menus = meganavClonedData?.data?.data[navIndex]?.navs[i]?.subMenus;
+ menus = meganavClonedData?.data?.data?.[navIndex]?.navs[i]?.subMenus;
compareData(
splitRbacPolicy,
meganavClonedData,
@@ -92,7 +92,7 @@ const updateMeganavData = (
meganavData: any,
rbacEnabledApps: string[],
) => {
- if (rbacData.error || !rbacData) {
+ if (rbacData?.error || !rbacData) {
return meganavData;
}
@@ -115,7 +115,7 @@ const updateMeganavData = (
---------------------------------------------------------------------*/
const rbacPermissions =
- rbacClonedData?.data[Config.rmaMegaNavId]?.permissions || [];
+ rbacClonedData?.data?.[Config.rmaMegaNavId]?.permissions || [];
/* we will check if policy exists for rbacEnabledApps or not, if not then we are
going to add them in our policies with Deny action
@@ -132,8 +132,8 @@ const updateMeganavData = (
}
rbacPermissions.forEach((policy) => {
- const action = policy.a;
- const RbacPolicy = policy.rn;
+ const action = policy?.a;
+ const RbacPolicy = policy?.rn;
const splitRbacPolicy = sanitize(RbacPolicy)?.split('/');
const [navType] = splitRbacPolicy;
@@ -144,7 +144,7 @@ const updateMeganavData = (
if (action === 'DENY') {
const navIndex = navTypeToIndex[navType];
if (navIndex) {
- const menus = meganavClonedData?.data?.data[navIndex]?.navs;
+ const menus = meganavClonedData?.data?.data?.[navIndex]?.navs;
meganavClonedData = compareData(
splitRbacPolicy,
meganavClonedData,
| optional chaining added and test case updated | optional chaining added and test case updated
|
ffb109d0a0c6594c84302f7da3339902f6797700 | --- package-lock.json
@@ -44,8 +44,8 @@
"@walmart/compass-sdk-rn": "5.5.0",
"@walmart/config-components": "4.2.5",
"@walmart/copilot-mini-app": "2.3.19",
- "@walmart/core-services": "~2.2.0",
- "@walmart/core-services-allspark": "~2.12.6",
+ "@walmart/core-services": "~2.2.1",
+ "@walmart/core-services-allspark": "~2.12.7",
"@walmart/core-utils": "~2.0.5",
"@walmart/core-widget-registry": "~1.2.4",
"@walmart/counts-component-miniapp": "0.1.6",
@@ -8118,9 +8118,9 @@
}
},
"node_modules/@walmart/core-services": {
- "version": "2.2.0",
- "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-2.2.0.tgz",
- "integrity": "sha512-bn64RZSGtdq/uWdJWzEITuSuz5On9TTDCipI067B3olHgB25+tE48+j4Ziu9XRQytBlTQYJYBbrvd0RTgLKzbA==",
+ "version": "2.2.1",
+ "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-2.2.1.tgz",
+ "integrity": "sha512-uTYVGbSntJvmMj0THjzLpbIj+RJ13IIWW++m0Aocsz/yeWS0kdAtXRFzL9c+ek9nbEuRF9/PVLUQS7GHFAj1AQ==",
"license": "ISC",
"dependencies": {
"@walmart/allspark-http-client": "^2.4.17",
@@ -8142,15 +8142,15 @@
}
},
"node_modules/@walmart/core-services-allspark": {
- "version": "2.12.6",
- "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.12.6.tgz",
- "integrity": "sha512-akgXZd/IyoNQSbR37FNqJYb6ziTAG5dVKRQbVUA/rY+1ULSWNic5Ka9Z1TwBYfNa+Gt4f+LPwR4LiJXP93xCSg==",
+ "version": "2.12.7",
+ "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.12.7.tgz",
+ "integrity": "sha512-gWo0PDlxt3AgsGGsnCJiULl48B89Z1IO41Gm00zFZ9CWXfVOP/QDFThlCNHtf7vu0mD1Wl+6M5ELrIK+DDbZ2A==",
"license": "ISC",
"dependencies": {
"@walmart/allspark-graphql-client": "^1.4.10",
"@walmart/allspark-http-client": "^2.4.17",
"@walmart/allspark-utils": "^1.6.1",
- "@walmart/core-services": "^2.2.0",
+ "@walmart/core-services": "^2.2.1",
"@walmart/me-at-walmart-athena-queries": "^1.7.0",
"crypto-js": "~4.1.1",
"jwt-decode": "^3.1.2",
@@ -33624,9 +33624,9 @@
"integrity": "sha512-r26ehSzcYQ6Wmz53NLLsnr9i2EThB69R8yJ1N/axT24eybEQrsmLNria/5aa/uylq3GYjtcc7eh6+N+39vu80Q=="
},
"@walmart/core-services": {
- "version": "2.2.0",
- "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-2.2.0.tgz",
- "integrity": "sha512-bn64RZSGtdq/uWdJWzEITuSuz5On9TTDCipI067B3olHgB25+tE48+j4Ziu9XRQytBlTQYJYBbrvd0RTgLKzbA==",
+ "version": "2.2.1",
+ "resolved": "https://npme.walmart.com/@walmart/core-services/-/core-services-2.2.1.tgz",
+ "integrity": "sha512-uTYVGbSntJvmMj0THjzLpbIj+RJ13IIWW++m0Aocsz/yeWS0kdAtXRFzL9c+ek9nbEuRF9/PVLUQS7GHFAj1AQ==",
"requires": {
"@walmart/allspark-http-client": "^2.4.13",
"@walmart/allspark-utils": "^1.5.2",
@@ -33638,14 +33638,14 @@
}
},
"@walmart/core-services-allspark": {
- "version": "2.12.6",
- "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.12.6.tgz",
- "integrity": "sha512-akgXZd/IyoNQSbR37FNqJYb6ziTAG5dVKRQbVUA/rY+1ULSWNic5Ka9Z1TwBYfNa+Gt4f+LPwR4LiJXP93xCSg==",
+ "version": "2.12.7",
+ "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.12.7.tgz",
+ "integrity": "sha512-gWo0PDlxt3AgsGGsnCJiULl48B89Z1IO41Gm00zFZ9CWXfVOP/QDFThlCNHtf7vu0mD1Wl+6M5ELrIK+DDbZ2A==",
"requires": {
"@walmart/allspark-graphql-client": "^1.4.5",
"@walmart/allspark-http-client": "^2.4.13",
"@walmart/allspark-utils": "^1.5.2",
- "@walmart/core-services": "~2.2.0",
+ "@walmart/core-services": "~2.2.1",
"@walmart/me-at-walmart-athena-queries": "^1.7.0",
"crypto-js": "^3.3.0",
"jwt-decode": "^3.1.2",
--- package.json
@@ -85,8 +85,8 @@
"@walmart/compass-sdk-rn": "5.5.0",
"@walmart/config-components": "4.2.5",
"@walmart/copilot-mini-app": "2.3.19",
- "@walmart/core-services": "~2.2.0",
- "@walmart/core-services-allspark": "~2.12.6",
+ "@walmart/core-services": "~2.2.1",
+ "@walmart/core-services-allspark": "~2.12.7",
"@walmart/core-utils": "~2.0.5",
"@walmart/core-widget-registry": "~1.2.4",
"@walmart/counts-component-miniapp": "0.1.6",
| fix: bumping core services for permissions fix | fix: bumping core services for permissions fix
|
d3255890a34765d6011ed84e90f6c5af981d7636 | --- src/transforms/user.ts
@@ -99,7 +99,10 @@ export const kGraphUserToRedux = (
returnIfValid(kgUser?.sub) ||
returnIfValid(kgUser?.userPrincipalName) ||
returnIfValid(kgUser?.mail);
- const domain = inferDomain(kgUser?.wmBusinessUnitType, domainFallback);
+ const domain = inferDomain(
+ returnIfValid(kgUser?.wmBusinessUnitType),
+ domainFallback,
+ );
const user: User = {
domain,
| Handling not found for business unit type | Handling not found for business unit type
|
aa024d719cb0fa080f1ebee08e66825459795163 | --- package.json
@@ -90,7 +90,7 @@
"@walmart/avp-feature-app": "0.16.25",
"@walmart/avp-shared-library": "0.10.14",
"@walmart/backroom-mini-app": "1.13.3",
- "@walmart/calling-mini-app": "0.7.63",
+ "@walmart/calling-mini-app": "0.7.64",
"@walmart/checkout-mini-app": "4.14.0",
"@walmart/compass-sdk-rn": "6.2.851",
"@walmart/config-components": "4.10.1",
@@ -139,7 +139,7 @@
"@walmart/react-native-shared-navigation": "~6.3.28",
"@walmart/react-native-store-map": "0.3.7",
"@walmart/react-native-sumo-sdk": "2.8.0",
- "@walmart/react-native-webex-sdk": "0.8.51",
+ "@walmart/react-native-webex-sdk": "0.8.53",
"@walmart/receipt-check-miniapp": "1.32.4",
"@walmart/redux-store": "~6.3.28",
"@walmart/returns-mini-app": "4.17.4",
--- yarn.lock
@@ -6843,9 +6843,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/calling-mini-app@npm:0.7.63":
- version: 0.7.63
- resolution: "@walmart/calling-mini-app@npm:0.7.63::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcalling-mini-app%2F-%2F%40walmart%2Fcalling-mini-app-0.7.63.tgz"
+"@walmart/calling-mini-app@npm:0.7.64":
+ version: 0.7.64
+ resolution: "@walmart/calling-mini-app@npm:0.7.64::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fcalling-mini-app%2F-%2F%40walmart%2Fcalling-mini-app-0.7.64.tgz"
peerDependencies:
"@react-native-community/datetimepicker": ">=5"
"@react-navigation/native": ">=6"
@@ -6890,7 +6890,7 @@ __metadata:
dependenciesMeta:
"@walmart/wmconnect-mini-app":
built: false
- checksum: 10c0/b6d893eb9380f482ad1b1bb88da8590e9c9eebce7d204aadec80ccd811ebba800f813fb59469c9269badbff06577b4a3975fbeef3e3afece34226d821823d183
+ checksum: 10c0/a9b1b7d9370cab9a880399f00998b636b7d8e7dfb80597dc1f5d6d5140c2c3b668bc9f7c80e8c35b496a1c71dfaac674626eb102e75230732c5c6f3f36f8d1a7
languageName: node
linkType: hard
@@ -7603,7 +7603,7 @@ __metadata:
"@walmart/avp-feature-app": "npm:0.16.25"
"@walmart/avp-shared-library": "npm:0.10.14"
"@walmart/backroom-mini-app": "npm:1.13.3"
- "@walmart/calling-mini-app": "npm:0.7.63"
+ "@walmart/calling-mini-app": "npm:0.7.64"
"@walmart/checkout-mini-app": "npm:4.14.0"
"@walmart/compass-sdk-rn": "npm:6.2.851"
"@walmart/config-components": "npm:4.10.1"
@@ -7652,7 +7652,7 @@ __metadata:
"@walmart/react-native-shared-navigation": "npm:~6.3.28"
"@walmart/react-native-store-map": "npm:0.3.7"
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
- "@walmart/react-native-webex-sdk": "npm:0.8.51"
+ "@walmart/react-native-webex-sdk": "npm:0.8.53"
"@walmart/receipt-check-miniapp": "npm:1.32.4"
"@walmart/redux-store": "npm:~6.3.28"
"@walmart/returns-mini-app": "npm:4.17.4"
@@ -8186,14 +8186,14 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/react-native-webex-sdk@npm:0.8.51":
- version: 0.8.51
- resolution: "@walmart/react-native-webex-sdk@npm:0.8.51::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.8.51.tgz"
+"@walmart/react-native-webex-sdk@npm:0.8.53":
+ version: 0.8.53
+ resolution: "@walmart/react-native-webex-sdk@npm:0.8.53::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Freact-native-webex-sdk%2F-%2F%40walmart%2Freact-native-webex-sdk-0.8.53.tgz"
peerDependencies:
react: "*"
react-native: "*"
react-native-logger: "*"
- checksum: 10c0/917f7cbd2d19772096157ea465ce171797c0681d8a09edbf16e8c4d3ed11990321cc79672e1cadb893d9dd4200806507644587b923ab0c17d52d7df0e61166ec
+ checksum: 10c0/e8a7f27ba16fd3dc71f21f17fba3db2b52845eb407fd19238fee48687ab3cd4d435a4e9415d5172d6f22e7b00120703fa0c50393e6365e891bdcefe642982bbe
languageName: node
linkType: hard
| fix(calling): CONAS-2120 Fixing app navigation after dynamic download (#4536) | fix(calling): CONAS-2120 Fixing app navigation after dynamic download (#4536)
|
93a339ba41763dcf3c8032851800fd4c980cc7c3 | --- src/PinAccess/index.ts
@@ -15,7 +15,7 @@ export const PinScreenFeature = new AllsparkFeatureModule('pinScreen', {
animationTypeForReplace: 'push',
},
},
- 'Core.CreatePinScreen': {
+ 'Core.CreatePINScreen': {
tags: [ScreenTags.RootStack],
getComponent: () => require('./CreatePinScreen').CreatePinScreen,
options: {
| fixing pin screen route | fixing pin screen route
|
0ebdb7adb14d1df928cff371f8fbcadd12f90882 | --- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx
@@ -18,6 +18,7 @@ import {
InferRecordKey,
} from './types';
import { LifecylceEventManager } from '../Container/events';
+import { FeatureEventManager } from './events';
/**
* AllsparkFeatureModule is a class that represents a set of feature capabilities.
@@ -244,15 +245,18 @@ export class AllsparkFeatureModule<
this._connectedMap.listeners = true;
const removeList: Array<() => void> = [];
- const { notification, lifecycle } = listeners;
+ const { notification, lifecycle, feature } = listeners;
if (notification) {
// Add notification listeners to AllsparkNotificationClient. Add remove function to removeList.
Object.keys(notification).forEach((e) => {
- const event = e as keyof IAllsparkFeatureListeners['notification'];
+ const event = e as keyof NonNullable<
+ IAllsparkFeatureListeners['notification']
+ >;
const sub = AllsparkNotificationClient.addListener(
event,
- notification[event]!
+ notification[event]!,
+ { id: this.id }
);
removeList.push(sub.remove);
});
@@ -261,15 +265,31 @@ export class AllsparkFeatureModule<
if (lifecycle) {
// Add lifecycle listeners to LifecylceEventManager. Add remove function to removeList.
Object.keys(lifecycle).forEach((e) => {
- const event = e as keyof IAllsparkFeatureListeners['lifecycle'];
+ const event = e as keyof NonNullable<
+ IAllsparkFeatureListeners['lifecycle']
+ >;
const sub = LifecylceEventManager.addListener(
event,
- lifecycle[event]!
+ lifecycle[event]!,
+ { id: this.id }
);
removeList.push(sub.remove);
});
}
+ if (feature) {
+ // Add feature listeners to FeatureEventManager. Add remove function to removeList.
+ Object.keys(feature).forEach((e) => {
+ const event = e as keyof NonNullable<
+ IAllsparkFeatureListeners['feature']
+ >;
+ const sub = FeatureEventManager.addListener(event, feature[event]!, {
+ id: this.id,
+ });
+ removeList.push(sub.remove);
+ });
+ }
+
// Create a subscription to remove all listeners
this._listenerSub = {
remove: () => {
@@ -384,6 +404,30 @@ export class AllsparkFeatureModule<
}
}
+ /**
+ * Runs onConnect event for this feature.
+ * Handles possibility of onConnect listener defined on module not being
+ * connected before the event is fired.
+ */
+ private _runConnectFeatureEvent = (capability?: ConnectCapabilities) => {
+ // If listeners for this feature have not been connected
+ if (!this._connectedMap.listeners) {
+ const listeners = this._resolveCapability(this._listeners);
+
+ // And they have specified an onConnect listener
+ if (listeners?.feature?.onConnect) {
+ // Add their onConnect listener outside of listener connection to handle connection event below
+ FeatureEventManager.addListener(
+ 'onConnect',
+ listeners.feature.onConnect
+ );
+ }
+ }
+
+ // Run onConnect event for this feature
+ FeatureEventManager.runEventListener('onConnect', this.id, capability);
+ };
+
/**
* Connects the feature module to various capabilities.
* @param capability Optional capability to connect to. If not provided, all capabilities will be connected.
@@ -405,6 +449,8 @@ export class AllsparkFeatureModule<
* featureModule.connect();
*/
public connect(capability?: ConnectCapabilities) {
+ this._runConnectFeatureEvent(capability);
+
switch (capability) {
case 'listeners':
this._connectListeners();
@@ -482,6 +528,7 @@ export class AllsparkFeatureModule<
* featureModule.disconnect();
*/
public disconnect(capability?: DisconnectCapabilities) {
+ FeatureEventManager.runEventListener('onDisconnect', this.id, capability);
switch (capability) {
case 'listeners':
this._disconnectListeners();
--- packages/allspark-foundation/src/Feature/events.ts
@@ -0,0 +1,28 @@
+import { EventManager } from '@walmart/allspark-utils';
+import { ConnectCapabilities } from './types';
+
+export type FeatureEventListeners = {
+ onConnect: (capability?: ConnectCapabilities) => void;
+ onDisconnect: (capability?: ConnectCapabilities) => void;
+};
+
+export type FeatureEventTypeMap = {
+ /**
+ * @description Called when the feature capability is connected
+ */
+ onConnect: ConnectCapabilities | undefined;
+
+ /**
+ * @description Called when the feature capability is disconnected
+ */
+ onDisconnect: ConnectCapabilities | undefined;
+};
+
+export const FEATURE_EVENTS_TYPES = ['onConnect', 'onDisconnect'] as const;
+
+/**
+ * Manages the lifecycle events for features
+ */
+export const FeatureEventManager = new EventManager<FeatureEventTypeMap>([
+ ...FEATURE_EVENTS_TYPES,
+]);
--- packages/allspark-foundation/src/Feature/types.ts
@@ -5,8 +5,10 @@ import { NotificationEventListeners } from '../Notification';
import { FeatureTranslationResources } from '../Translation/types';
import { AllsparkModalConfig, AllsparkScreenConfig } from '../Navigation/types';
import { LifecycleEventListeners } from '../Container/events';
+import { FeatureEventListeners } from './events';
export type IAllsparkFeatureListeners = {
+ feature?: Partial<FeatureEventListeners>;
lifecycle?: Partial<LifecycleEventListeners>;
notification?: Partial<NotificationEventListeners>;
};
| feat: add feature event manager for connect and disconnect events | feat: add feature event manager for connect and disconnect events
|
47dec74fec0a20346f58144ff07e1dc8b24227d3 | --- packages/allspark-foundation/src/Translation/client.ts
@@ -90,11 +90,27 @@ export const TranslationClient = (config?: TranslationClientOptions) => {
| undefined;
};
+ /**
+ * Changes the default namespace.
+ */
+ const setDefaultNamespace = (ns: string) => {
+ if (!_instance.options.defaultNS) {
+ _instance.setDefaultNamespace(ns);
+ } else {
+ __DEV__ &&
+ console.warn(
+ 'Attempted to set default namespace on TranslationClient after it was already set.',
+ { current: _instance.options.defaultNS, attempted: ns }
+ );
+ }
+ };
+
return Object.assign(_instance, {
initialize,
isInitialized,
createFeatureClient,
getFeatureClient,
+ setDefaultNamespace,
});
};
| feat: add guarded set default namespace method to translation instance | feat: add guarded set default namespace method to translation instance
|
e52a976e7fd0d8eff33712a01e2aaae09abe9e2d | --- env.dev.js
@@ -3,12 +3,12 @@ export const ENV = 'dev';
export const ENV_OVERRIDES = {
graphql: {
- // url: 'https://developer.api.us.stg.walmart.com/api-proxy/service/ATHENA/GATEWAY/v1',
- url: 'https://athena-gateway.sstage.us.walmart.net',
+ url: 'https://developer.api.us.stg.walmart.com/api-proxy/service/ATHENA/GATEWAY/v1',
+ // url: 'https://athena-gateway.sstage.us.walmart.net',
headers: {
'WM_SVC.ENV': 'stage',
REQUEST_SOURCE: 'API_PROXY',
},
- persistedQueries: false,
+ persistedQueries: true,
},
};
| fix: env overrides were wrong for dev | fix: env overrides were wrong for dev
|
b359d5e863b881dcd262ef90413e3caa4a48f039 | --- src/common/constants.ts
@@ -18,6 +18,8 @@ export const SEVEN_DAYS_AGO_TIMESTAMP = daysAgoTimestamp(7);
export const MESSAGE_SCREEN_PAGE_SIZE = 100;
export const EMP_TYPE_SALARIED = 'S';
export const MANAGEMENT_TEAM_ID = '1111111';
+export const TOTAL_STORE_TEAM_ID = "total";
+export const TOTAL_SITE_TEAM_ID = "total";
export enum messageTypes {
AUDIO = 'AUDIO',
--- src/hooks/teams.ts
@@ -1,20 +1,34 @@
-import {useSelector} from 'react-redux';
-import {Team} from '../queries/schema.types';
-import {UserSelectors} from '@walmart/allspark-foundation/User';
-import { EMP_TYPE_SALARIED, MANAGEMENT_TEAM_ID } from '../common/constants';
+import { useSelector } from 'react-redux';
+import { Team } from '../queries/schema.types';
+import { UserSelectors } from '@walmart/allspark-foundation/User';
+import { EMP_TYPE_SALARIED, MANAGEMENT_TEAM_ID, TOTAL_SITE_TEAM_ID, TOTAL_STORE_TEAM_ID } from '../common/constants';
+import { logger } from '../common/logger';
export const useGetViewersPrimaryTeamId = () => {
- const viewerTeamIds: string[] = useSelector(
- UserSelectors.getTeamIds,
- ) as string[];
+ const viewerTeamIds = useSelector(UserSelectors.getTeamIds);
const isSalaried: boolean = useSelector(UserSelectors.getIsUserSalaried);
const employeeType: string | undefined = useSelector(
- UserSelectors.getEmployeeType
+ UserSelectors.getEmployeeType,
);
const isUserSalariedEmployee: boolean =
employeeType?.toUpperCase() === EMP_TYPE_SALARIED;
- const defaultTeamId: string = (isSalaried || isUserSalariedEmployee) ? MANAGEMENT_TEAM_ID : '';
- return viewerTeamIds.length > 0 ? viewerTeamIds[0] : defaultTeamId;
+ if (!viewerTeamIds?.length) {
+ if (isSalaried || isUserSalariedEmployee) {
+ return MANAGEMENT_TEAM_ID;
+ } else {
+ return TOTAL_STORE_TEAM_ID || TOTAL_SITE_TEAM_ID || '';
+ }
+ }
+ if (viewerTeamIds.length > 0) {
+ if (viewerTeamIds[0] !== null) {
+ return viewerTeamIds[0];
+ } else {
+ logger.error('useGetViewersPrimaryTeamId error', {
+ message: 'error in fetching user\'s primary team id',
+ });
+ }
+ }
+ return TOTAL_STORE_TEAM_ID || TOTAL_SITE_TEAM_ID || '';
};
export const useGetViewersPrimaryTeamName = () => {
--- src/modals/MessagesScreen.tsx
@@ -221,8 +221,7 @@ export const MessagesScreen = ({
const unsubscribeMessages = useRef<() => void>();
const unsubscribeChannelDoc = useRef<() => void>();
const channelExistsRef = useRef<boolean>();
- const primaryTeam = useGetViewersPrimaryTeamId();
- const primaryTeamData = useGetTeamById(primaryTeam);
+ const primaryTeamData = useGetTeamById(viewerTeamId);
const isPrimaryTeamPartialError = !!(
primaryTeamData?.data && primaryTeamData.error
);
| fix(ui): update primary team | fix(ui): update primary team
|
8d53630861cbfd0c1ed2029a45b2743969ad246a | --- packages/associate-exp-hub-mini-app/src/components/modals/hoc/EditTeamsModal.tsx
@@ -49,7 +49,7 @@
* @since 1.0.0
*/
-import React, {useCallback, useEffect, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
import {AllsparkNavigationClient} from '@walmart/allspark-foundation/Navigation';
import {AssociateExpHubFeature} from '../../../utils/feature';
@@ -79,21 +79,17 @@ import {Animations} from '../config/animations';
import {TelemetryHelpers} from '../../../services/telemetry/telemetry';
const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
- const isMounted = useRef(false);
const primaryTeam = useGetViewersPrimaryTeam();
const {enableEditModalUpsert} = useConfig();
const {
- loading: {teamsLoading, preferencesLoading},
- preferences,
+ loading: {teamsLoading},
+ preferences = [],
shiftCodePreferences,
- teamSections,
- error,
- refetch,
+ teamSections = [],
+ error: {teamsError},
+ refetch: {teamsRefetch},
} = useGetTeamsAdapter();
- const teamsError = error?.teamsError;
- const teamsRefetch = refetch?.teamsRefetch;
-
const {upsertSupplyChainPreferences} =
useUpsertSupplyChainAssociatePreference();
@@ -104,7 +100,12 @@ const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
const {upsertStorePreferences} = useUpsertStoreAssociatePreference();
const [upsertError, setUpsertError] = useState(false);
- const [selectedTeams, setSelectedTeams] = React.useState<string[]>([]);
+ const [selectedTeams, setSelectedTeams] = React.useState<string[]>(
+ () =>
+ (preferences?.map(team => team.teamId).filter(Boolean) as string[]) || []
+ );
+
+ const hasInitialized = React.useRef(false);
useEffect(() => {
if (!teamsLoading && teamSections && teamSections.length) {
@@ -176,11 +177,19 @@ const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
}, [teamSections, teamsLoading, isSiteDC]);
useEffect(() => {
- if (!isMounted.current && !preferencesLoading && preferences.length) {
- isMounted.current = true;
- setSelectedTeams(preferences.map(team => team.teamId!));
+ if (!hasInitialized.current && preferences?.length) {
+ const teamIds = preferences
+ .map(team => team.teamId)
+ .filter(Boolean) as string[];
+ setSelectedTeams(prev => {
+ // Only update if the values have actually changed
+ return JSON.stringify(prev) !== JSON.stringify(teamIds)
+ ? teamIds
+ : prev;
+ });
+ hasInitialized.current = true;
}
- }, [preferences, preferencesLoading]);
+ }, [preferences]);
const [translate] = AssociateExpHubTranslationClient.useTranslation();
@@ -192,7 +201,7 @@ const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
element_type: 'search',
action: 'tap', // Changed from 'input' to 'tap' to match allowed actions
value: searchInput,
- element_id: 'team_search_input'
+ element_id: 'team_search_input',
});
const searchApplied = filterTeamsBySearchInput(
teamSections as any[],
@@ -287,7 +296,9 @@ const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
action: 'tap',
value: action,
element_id: `team_${item}`,
- ...(teamIsSelected ? {previous_state: 'selected'} : {previous_state: 'unselected'})
+ ...(teamIsSelected
+ ? {previous_state: 'selected'}
+ : {previous_state: 'unselected'}),
});
if (teamIsSelected) {
@@ -343,7 +354,7 @@ const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
element_type: 'button',
action: 'tap',
value: `save_teams_${selectedTeams.length}`,
- element_id: `save_teams_${isSiteDC ? 'supply_chain' : 'store'}`
+ element_id: `save_teams_${isSiteDC ? 'supply_chain' : 'store'}`,
});
if (!enableEditModalUpsert) {
@@ -375,7 +386,7 @@ const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
element_type: 'modal',
action: 'tap', // Using 'tap' for both open/close to match allowed actions
value: 'edit_teams_modal_open',
- element_id: 'edit_teams_modal'
+ element_id: 'edit_teams_modal',
});
return () => {
@@ -384,7 +395,7 @@ const EditTeamsModal = AssociateExpHubFeature.createModal(() => {
element_type: 'modal',
action: 'tap',
value: `edit_teams_modal_close_teams_${initialTeamsCountRef.current}`,
- element_id: 'edit_teams_modal'
+ element_id: 'edit_teams_modal',
});
};
}, []);
| feat(ui): optimizing initialization of state | feat(ui): optimizing initialization of state
|
6cb2fd4a0a0090074578e02e194d79e0ee22fb3f | --- docs/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [2.35.0](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.34.0...v2.35.0) (2025-05-01)
+
+
+### Features
+
+* **ui:** update lint ([df57e75](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/df57e75f7de3d480d63abc869e512ba9c4ee11fb))
+
# [2.34.0](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.33.0...v2.34.0) (2025-05-01)
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/wmconnect-mini-app",
- "version": "2.34.0",
+ "version": "2.35.0",
"main": "dist/index.js",
"files": [
"dist/"
| chore(release): 2.35.0 [skip ci] | chore(release): 2.35.0 [skip ci]
# [2.35.0](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/compare/v2.34.0...v2.35.0) (2025-05-01)
### Features
* **ui:** update lint ([df57e75](https://gecgithub01.walmart.com/smdv/wmconnect-miniapp/commit/df57e75f7de3d480d63abc869e512ba9c4ee11fb))
|
6f0d5e54da7dbc0b938584b9471ac21d10b7af79 | --- package-lock.json
@@ -25446,9 +25446,9 @@
"integrity": "sha512-tDd8OoNfsef38MR5tx5olytV9lphKVT/vGqHegTUGhosR2NjoQZBj0DE8YjGrcIWq/29x7+V/R1Db0iAgnauyQ=="
},
"@walmart/taskit-mini-app": {
- "version": "0.49.6",
- "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.49.6.tgz",
- "integrity": "sha512-uIOdjSxp9dB/x036dC8bnRom0hkr+FqvXT0GdrX69M+dVEV0rrHGARrBOVqQZIN1U2tg/EhyDh3Et1avL+ZJLw=="
+ "version": "0.49.11",
+ "resolved": "https://npme.walmart.com/@walmart/taskit-mini-app/-/taskit-mini-app-0.49.11.tgz",
+ "integrity": "sha512-D0Oi1XUgIvxIVjQL2wl0nyeTJr0Sqcvtezbag3ZG0tMlwxGJMXNB2PvkQ5n8JBuAV1YRlggsGtIp+yLz+slgCQ=="
},
"@walmart/tcnumber": {
"version": "2.3.3",
--- package.json
@@ -123,7 +123,7 @@
"@walmart/schedule-mini-app": "0.29.0",
"@walmart/settings-mini-app": "1.12.0",
"@walmart/shelfavailability-mini-app": "1.5.2",
- "@walmart/taskit-mini-app": "0.49.6",
+ "@walmart/taskit-mini-app": "0.49.11",
"@walmart/time-clock-mini-app": "0.30.0",
"@walmart/ui-components": "1.9.0",
"@walmart/welcomeme-mini-app": "0.73.0",
| feature/taskit-mini-app-0.49.11 | feature/taskit-mini-app-0.49.11
|
c87728cbd01b616587119d79445217a783bc9843 | --- packages/allspark-foundation/src/Container/AllsparkContainer.tsx
@@ -7,11 +7,7 @@ import { EventManager, RenderGuard } from '@walmart/allspark-utils';
import { noop } from 'lodash';
import { AuthServiceCreator } from '../Auth';
-import {
- AllsparkEnvironment,
- BaseAllsparkEnvironment,
- EnvironmentType,
-} from '../Environment';
+import { AllsparkEnvironment, BaseAllsparkEnvironment } from '../Environment';
import { ClockServiceCreator } from '../Clock';
import { ConfigServiceCreator } from '../Config';
import { DeviceServiceCreator } from '../Device';
@@ -49,6 +45,7 @@ import {
CONTAINER_EVENTS_TYPES,
ContainerEventTypeMap,
ContainerFlowTypes,
+ ContainerInitializationConfig,
ContainerProviderProps,
ContainerSetupTypes,
SetupFunction,
@@ -395,19 +392,25 @@ export class AllsparkContainer<
/**
* Initialize Allspark environment and clients for container configuration.
*/
- public initialize = async (env: EnvironmentType, overrides?: any) => {
+ public initialize = async (config: ContainerInitializationConfig<E>) => {
if (this._initialized) {
return;
}
+ const { environment, version = '1.0.0', libraries = [] } = config;
+ const { env, ...overrides } = environment;
// Environment intialized first for given env and overrides.
// Other client configurations may be dependent on env so this is done first.
AllsparkEnvironment.initialize({
- env: overrides?.env || env,
+ env,
config: this.config.environment,
overrides: { ...overrides, containerName: this.id },
});
+ AllsparkReduxStore.dispatch(
+ ContainerActionCreators.INITIALIZE({ version, libraries })
+ );
+
const redux = await AllsparkEnvironment.resolveDerivedValue(
this.config.redux
);
--- packages/allspark-foundation/src/Container/redux.ts
@@ -33,11 +33,12 @@ export const containerSlice = createSlice({
SET_CONTAINER: (state, action: PayloadAction<string>) => {
state.name = action.payload;
},
- SET_VERSION: (state, action: PayloadAction<string>) => {
- state.version = action.payload;
- },
- SET_LIBRARIES: (state, action: PayloadAction<LibraryInfo[]>) => {
- state.libraries = action.payload;
+ INITIALIZE: (
+ state,
+ action: PayloadAction<{ version: string; libraries: LibraryInfo[] }>
+ ) => {
+ state.version = action.payload.version;
+ state.libraries = action.payload.libraries;
},
STARTUP_BEGIN: (state) => {
state.isStartingUp = true;
--- packages/allspark-foundation/src/Container/types.ts
@@ -26,6 +26,7 @@ import { AllsparkUserService } from '../User';
import { AllsparkLoggerService } from '../Logger';
import { AllsparkTelemetryService } from '../Telemetry';
import { IAllsparkComponentContext } from '../Components/context';
+import { RequiredBy } from '@walmart/allspark-utils';
/**
* Dynamic services defined by the container.
@@ -125,3 +126,9 @@ export type LibraryInfo = {
name: string;
version: string;
};
+
+export type ContainerInitializationConfig<E extends BaseAllsparkEnvironment> = {
+ environment: RequiredBy<E, 'env'>;
+ version?: string;
+ libraries?: LibraryInfo[];
+};
--- packages/allspark-foundation/src/FeatureRunner/index.tsx
@@ -40,10 +40,7 @@ export class AllsparkFeatureRunner<
public App = () => {
// Initialize container
- this._container.initialize(
- this._config.env,
- this._config.environmentOverrides
- );
+ this._container.initialize(this._config);
// Create navigation for feature runner
const Navigation = createFeatureRunnerNavigation(
--- packages/allspark-foundation/src/FeatureRunner/types.ts
@@ -1,7 +1,7 @@
import { ComponentProps, ComponentType } from 'react';
import { AuthConfiguration } from '../Auth';
import { AllsparkContainer } from '../Container';
-import { EnvironmentDerivedValue, EnvironmentType } from '../Environment';
+import { EnvironmentDerivedValue } from '../Environment';
import { AllsparkFeatureModule } from '../Core';
import { ImpersonationFormProps } from '../User';
import { SideMenuItemProps } from './screens/SideMenu';
@@ -18,12 +18,11 @@ export type FeatureRunnerPlugin = {
export type AllsparkFeatureRunnerConfig<
C extends AllsparkContainer<any, any> = AllsparkContainer<any, any>,
-> = ComponentProps<C['Provider']> & {
- env: EnvironmentType;
- environmentOverrides?: Parameters<C['initialize']>[1];
- dependencies?: AllsparkFeatureModule<any, any>[];
- plugins?: FeatureRunnerPlugin[];
-};
+> = Omit<ComponentProps<C['Provider']>, 'children'> &
+ Parameters<C['initialize']>[0] & {
+ dependencies?: AllsparkFeatureModule<any, any>[];
+ plugins?: FeatureRunnerPlugin[];
+ };
export type FeatureRunnerNavigationConfig = {
authConfigs: AuthConfiguration[];
| refactor: change container initialziation to include version and library info | refactor: change container initialziation to include version and library info
|
0c2a6005592294fe8c88bca46a0565005682d149 | --- __tests__/index.test.tsx
@@ -1,62 +0,0 @@
-// import React from 'react';
-// import {renderHookWithProviders} from './harness';
-
-// const {appCheck, mockConfigure} = require('@react-native-firebase/app-check');
-// import {initialize, RosterMiniApp} from '../src';
-
-// describe('initialize', () => {
-// jest.useFakeTimers();
-// it('should initialize Firebase App Check with debug token', async () => {
-// const testValue = 'test_debug';
-// await initialize(testValue);
-
-// expect(appCheck.newReactNativeFirebaseAppCheckProvider).toHaveBeenCalled();
-// expect(mockConfigure).toHaveBeenCalledWith({
-// android: {
-// provider: expect.any(String),
-// debugToken: testValue,
-// },
-// apple: {
-// provider: expect.any(String),
-// debugToken: testValue,
-// },
-// });
-
-// expect(appCheck.initializeAppCheck).toHaveBeenCalledWith({
-// provider: expect.any(Object),
-// isTokenAutoRefreshEnabled: true,
-// });
-// });
-
-// afterAll(() => {
-// global.window.__DEV__ = true;
-// });
-
-// it('should initialize Firebase App Check with __DEV__ false and with debug token', async () => {
-// global.window.__DEV__ = false;
-// const testValue = 'test_debug';
-// await initialize(testValue);
-
-// expect(appCheck.newReactNativeFirebaseAppCheckProvider).toHaveBeenCalled();
-// expect(mockConfigure).toHaveBeenCalledWith({
-// android: {
-// provider: expect.any(String),
-// debugToken: testValue,
-// },
-// apple: {
-// provider: expect.any(String),
-// debugToken: testValue,
-// },
-// });
-
-// expect(appCheck.initializeAppCheck).toHaveBeenCalledWith({
-// provider: expect.any(Object),
-// isTokenAutoRefreshEnabled: true,
-// });
-// });
-
-// it('RosterMiniApp', () => {
-// const instance = renderHookWithProviders(() => <RosterMiniApp />);
-// expect(instance).toBeDefined();
-// });
-// });
--- ios/FeatureAppTemplateTS.xcodeproj/project.pbxproj
@@ -395,7 +395,7 @@
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
- "${PODS_XCFRAMEWORKS_BUILD_DIR}/ScanditBarcodeCapture/ScanditBarcodeCapture.framework/ScanditBarcodeCapture",
+ "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
@@ -454,6 +454,7 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoConstants_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ExpoFileSystem_privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseABTesting_Privacy.bundle",
+ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreExtension_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseCoreInternal_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseInstallations_Privacy.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseMessaging_Privacy.bundle",
| Adding updates | Adding updates
|
d68b0771f0e91e970bf4bab86bcc64a7d8a1da69 | --- .looper-pr.yml
@@ -32,3 +32,4 @@ envs:
SLACK_CHANNEL: "smdv-miniapp"
+
| feat(ui): update scripts | feat(ui): update scripts
|
eb181830316ecab932c0b19ed865e5c9b84dd785 | --- packages/allspark-foundation/cli/link.js
@@ -3,7 +3,7 @@
const fs = require('fs');
const path = require('path');
-const { mergeReactNativeConfig, mergePods } = require('./linkUtils');
+const { linkReactNativeConfig, linkIos } = require('./linkUtils');
// Modules linked through link script
const linkedModules = [];
@@ -19,12 +19,12 @@ function linkModule(name, configFilePath) {
if (react) {
// Merge modules react config with host project react-native.config.js
- mergeReactNativeConfig(react);
+ linkReactNativeConfig(react);
}
if (ios) {
// Merge modules pod config with host projects podfile
- mergePods(ios.pods);
+ linkIos(ios);
}
}
--- packages/allspark-foundation/cli/linkUtils.js
@@ -30,7 +30,7 @@ function writeConfig(config, filePath) {
fs.writeFileSync(filePath, fileContent);
}
-function mergeReactNativeConfig(inputConfig) {
+function linkReactNativeConfig(inputConfig) {
const processPath = process.cwd();
const baseConfigPath = `${processPath}/react-native.config.js`;
const baseConfig = require(baseConfigPath);
@@ -43,32 +43,60 @@ function mergeReactNativeConfig(inputConfig) {
}
}
-function mergePods(inputPods) {
- // Process relative files paths
- const processPath = process.cwd();
- const basePodPath = `${processPath}/ios/Podfile`;
-
- // Base Podfile (what we're merging into)
- const baseData = fs.readFileSync(basePodPath, { encoding: 'utf-8' });
- const baseLines = baseData.split('\n');
- const basePods = baseLines
- .filter((line) => /^\s*pod/i.test(line))
- .map((pod) => pod.trim());
+function mergePods(podfile, pods) {
+ const baseLines = podfile.split('\n');
+ const basePods = baseLines.filter((line) => /^\s*pod/i.test(line));
- // What are we missing from input?
- const missingPods = inputPods
- .filter((pod) => !basePods.includes(pod))
- .map((pod) => ` ${pod}`);
+ // What pods are we missing from input?
+ const missingPods = pods
+ .filter(([podName]) => !basePods.some((pod) => pod.includes(podName)))
+ .map(
+ ([podName, ...rest]) =>
+ ` pod '${podName}'` + (rest ? ` ${rest.join(', ')}` : '')
+ );
// Where to insert missing pods
const podInsertionIndex =
baseLines.findIndex((line) => /^\s*post_install/i.test(line)) - 1;
- // Add missing mods and reform podfile
+ // Add missing mods
baseLines.splice(podInsertionIndex, 0, ...missingPods);
- const outputData = baseLines.join('\n');
- fs.writeFile(basePodPath, outputData, 'utf8', (err) => {
+ return baseLines.join('\n');
+}
+
+function mergeSources(podfile, sources) {
+ const baseLines = podfile.split('\n');
+ const baseSources = baseLines.filter((line) => /^\s*source/i.test(line));
+
+ // What sources are we missing from input?
+ const missingSources = sources
+ .filter((url) => !baseSources.some((source) => source.includes(url)))
+ .map((url) => `source '${url}'`);
+
+ // Where to insert missing sources
+ const sourceInsertionIndex =
+ baseLines.findIndex((line) => /^\s*target/i.test(line)) - 1;
+
+ // Add missing sources
+ baseLines.splice(sourceInsertionIndex, 0, ...missingSources);
+
+ return baseLines.join('\n');
+}
+
+function linkIos(iosConfig) {
+ const { pods, sources } = iosConfig;
+
+ // Process relative files paths
+ const processPath = process.cwd();
+ const basePodPath = `${processPath}/ios/Podfile`;
+
+ // Base Podfile (what we're merging into)
+ const baseData = fs.readFileSync(basePodPath, { encoding: 'utf-8' });
+
+ const mergedPodfile = mergeSources(mergePods(baseData, pods), sources);
+
+ fs.writeFile(basePodPath, mergedPodfile, 'utf8', (err) => {
if (err) {
console.error('Error writing podfile', err);
return;
@@ -77,6 +105,6 @@ function mergePods(inputPods) {
}
module.exports = {
- mergePods,
- mergeReactNativeConfig,
+ linkIos,
+ linkReactNativeConfig,
};
--- packages/allspark-foundation/package.json
@@ -7,7 +7,8 @@
"types": "lib/index.d.ts",
"files": [
"lib",
- "cli"
+ "cli",
+ "allspark.config.js"
],
"bin": {
"allspark-foundation:generate-graphql": "./cli/generate.js",
--- packages/me-at-walmart-container/allspark.config.js
@@ -40,14 +40,18 @@ module.exports = {
},
},
ios: {
+ sources: [
+ 'git@gecgithub01.walmart.com:store-systems-associate-tech-platform/cocoapods-specs.git',
+ 'git@gecgithub01.walmart.com:ssaeSCTP/CocoaPodSpecs.git',
+ ],
pods: [
- "pod 'FirebaseCore', :modular_headers => true",
- "pod 'GoogleUtilities', :modular_headers => true",
- "pod 'GoogleDataTransport', :modular_headers => true",
- "pod 'FirebaseMessaging', :modular_headers => true",
- "pod 'FirebaseInstallations', :modular_headers => true",
- "pod 'FirebaseCoreExtension', :modular_headers => true",
- "pod 'nanopb', :modular_headers => true",
+ ['FirebaseCore', ':modular_headers => true'],
+ ['GoogleUtilities', ':modular_headers => true'],
+ ['GoogleDataTransport', ':modular_headers => true'],
+ ['FirebaseMessaging', ':modular_headers => true'],
+ ['FirebaseInstallations', ':modular_headers => true'],
+ ['FirebaseCoreExtension', ':modular_headers => true'],
+ ['nanopb', ':modular_headers => true'],
],
},
},
--- packages/me-at-walmart-container/package.json
@@ -7,7 +7,7 @@
"files": [
"lib",
"cli",
- "react-native.config.js"
+ "allspark.config.js"
],
"bin": {
"me-at-walmart:link": "./cli/link.js"
| chore: add allspark config to publish and update scripts | chore: add allspark config to publish and update scripts
|
44eba7cf9e22aa281e59eb12cf000457081005fb | --- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingScreen.tsx
@@ -8,18 +8,22 @@ import { ShiftFilterList } from '../../Components/ShiftFilter/ShiftFilterList';
import { mockFilterListData } from '../EditSavedTeamModal/mockTeamsData';
import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation';
import { styles } from './styles';
-import { FEATURE_ID, ONBOARDING_KEY } from '../../constant';
+import { FEATURE_ID, ONBOARDING_KEY, PLATFORM_NAME } from '../../constant';
import {
LoggerService,
useTelemetryService,
AllsparkLocalStorage,
} from '@walmart/allspark-foundation';
+import { AllsparkEnvironment } from '@walmart/allspark-foundation/Environment';
+import { getVersion } from 'react-native-device-info';
import { useOnboardingContext } from './OnboardingContext';
+import { UserSelectors } from '@walmart/allspark-foundation/User';
import { ManagerExperienceCreators } from '../../../Store/Redux/actions';
import { useDispatch, useSelector } from 'react-redux';
// import { hubHeaderEnabled } from '../../Redux';
import { useGetSupplyChainAllTeamsBySite } from '../../Hooks/useGetSupplyChainTeamsByStore';
import { AllTeamsSections } from '../EditSavedTeamModal/types';
+import { useUpsertSupplyChainAssociatePreferenceMutation } from '@walmart/me-at-walmart-athena-queries';
export const OnboardingScreen = () => {
const { t } = useAllsparkTranslation(FEATURE_ID);
@@ -27,16 +31,27 @@ export const OnboardingScreen = () => {
const logger = LoggerService.getContainerInstance();
const { disableOnboarding } = useOnboardingContext();
const { allSiteTeamsSections } = useGetSupplyChainAllTeamsBySite();
+ const site = useSelector(UserSelectors.getWorkingSite);
const [input, setInput] = useState('');
const dispatch = useDispatch();
// const showHubHeader = useSelector(hubHeaderEnabled);
-
+ const win = useSelector(UserSelectors.getWin);
const [selectedTeams, setSelectedTeams] = useState<string[]>([]);
const [selectedShifts, setSelectedShifts] = useState<string[]>([]);
const [sections, setSearchedsections] = useState<typeof allSiteTeamsSections>(
[]
);
-
+ useFocusEffect(
+ useCallback(() => {
+ /**
+ * There is an issue updating data between modals since the Modal component doesn't rerender,
+ * below is to force render and update local State based on redux
+ */
+ if (!sections.length && allSiteTeamsSections.length) {
+ setSearchedsections(allSiteTeamsSections);
+ }
+ }, [selectedTeams, allSiteTeamsSections])
+ );
const showHubHeader = useSelector(hubHeaderEnabled);
const handleSearchInput = useCallback(
@@ -70,7 +85,7 @@ export const OnboardingScreen = () => {
const handleSelectShift = useCallback(
(item: string) => {
const shiftIsSelected = Boolean(
- selectedShifts.find((team) => team === item)
+ selectedShifts.find((shift) => shift === item)
);
if (shiftIsSelected) {
setSelectedShifts(selectedShifts.filter((shift) => shift !== item));
@@ -88,6 +103,19 @@ export const OnboardingScreen = () => {
disableOnboarding();
}, []);
+ const [upsertSupplyChainAssociatePreferenceMutation] =
+ useUpsertSupplyChainAssociatePreferenceMutation({
+ context: {
+ headers: {
+ 'wm_consumer.id': AllsparkEnvironment.getCurrent().consumerId,
+ 'x-o-platform': PLATFORM_NAME,
+ 'x-o-platform-version': getVersion(),
+ },
+ },
+ onCompleted: () => {},
+ onError: () => {},
+ });
+
const handleSaveButton = useCallback(async () => {
logger.info('Onboarding', {
message: 'Onboarding started',
@@ -98,14 +126,38 @@ export const OnboardingScreen = () => {
dispatch(ManagerExperienceCreators.updateSelectedTeamIDs(selectedTeams));
dispatch(ManagerExperienceCreators.updateSelectedShifts(selectedShifts));
await AllsparkLocalStorage.set(ONBOARDING_KEY, 'true');
+ upsertSupplyChainAssociatePreferenceMutation({
+ variables: {
+ associatePreferencesInput: {
+ walmartIdentificationNumber: String(win),
+ meAtWalmartPreferences: {
+ managerExperiencePreferences: {
+ mySupplyChainTeams: {
+ businessUnitNumber: Number(site),
+ shiftCodePreference: selectedShifts,
+ supplyChainTeamPreference: selectedTeams.map((teamId) => ({
+ businessUnitNumber: Number(site),
+ countryCode: 'US',
+ teamId: teamId,
+ })),
+ },
+ },
+ },
+ },
+ businessUnitNumber: Number(site),
+ },
+ });
disableOnboarding();
}, [
- disableOnboarding,
- dispatch,
logger,
+ teamSelectionTelemetry,
+ dispatch,
selectedTeams,
selectedShifts,
- teamSelectionTelemetry,
+ upsertSupplyChainAssociatePreferenceMutation,
+ win,
+ site,
+ disableOnboarding,
]);
const Divider = () => <View style={styles.divider} />;
@@ -113,7 +165,7 @@ export const OnboardingScreen = () => {
return (
<>
<ScrollView contentContainerStyle={styles.rootContainer}>
- {true && (
+ {false && (
<RosterPageHeader
title={t('dashboard.header.title')}
subText={t('dashboard.header.subtitle')}
| Adding onboarding changes | Adding onboarding changes
|
b3dc01cccaa47de1d40deb702d4d78031b4d077a | --- package.json
@@ -82,7 +82,7 @@
"@walmart/allspark-utils": "6.5.1",
"@walmart/config-components": "4.6.5",
"@walmart/expo-config-plugins": "0.1.4",
- "@walmart/gtp-shared-components": "2.2.9-rc.1",
+ "@walmart/gtp-shared-components": "2.2.4",
"@walmart/me-at-walmart-athena-queries": "6.26.1",
"@walmart/me-at-walmart-common": "6.29.0-alpha.0",
"@walmart/me-at-walmart-container": "6.29.0-alpha.0",
--- src/channels/components/UnreadBadge.tsx
@@ -20,7 +20,7 @@ const UnreadBadgeBase = () => {
: Number(unreadMessagesCount);
return unreadCount && isTextingFeatureEnabled ? (
<View testID='unreadBadge'>
- <Badge testID='unreadBadgeCount' color='spark'>
+ <Badge testID='unreadBadgeCount' UNSAFE_style={{borderWidth:0}} color='spark'>
{unreadCountData ?? unreadMessagesCountData}
</Badge>
</View>
--- yarn.lock
@@ -6300,9 +6300,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/gtp-shared-components@npm:2.2.9-rc.1":
- version: 2.2.9-rc.1
- resolution: "@walmart/gtp-shared-components@npm:2.2.9-rc.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fgtp-shared-components%2F-%2F%40walmart%2Fgtp-shared-components-2.2.9-rc.1.tgz"
+"@walmart/gtp-shared-components@npm:2.2.4":
+ version: 2.2.4
+ resolution: "@walmart/gtp-shared-components@npm:2.2.4::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fgtp-shared-components%2F-%2Fgtp-shared-components-2.2.4.tgz"
dependencies:
"@livingdesign/tokens": "npm:0.74.0"
"@walmart/gtp-shared-icons": "npm:1.0.10"
@@ -6318,9 +6318,9 @@ __metadata:
react-native-device-info: "*"
react-native-drop-shadow: "*"
bin:
- installFonts: ./scripts/installFonts
- runCodemods: ./scripts/runCodemods
- checksum: 10c0/f0f2042f9365c12f1f78243398a72db79fc09843337baee5b102a617314be0d3e6bb5b7907a7d96235210a81850c7a9d86e419b0156715337446c3bbeed61e3b
+ installFonts: scripts/installFonts
+ runCodemods: scripts/runCodemods
+ checksum: 10c0/52b172f006e950284c34fee7e2b05637f2eec0c3b857a491f6853302936e1b48efe121fcd209444ec7e5572b23a4495a090a2f55fa41447c00823adaca6c17a2
languageName: node
linkType: hard
@@ -6488,7 +6488,7 @@ __metadata:
"@walmart/allspark-utils": "npm:6.5.1"
"@walmart/config-components": "npm:4.6.5"
"@walmart/expo-config-plugins": "npm:0.1.4"
- "@walmart/gtp-shared-components": "npm:2.2.9-rc.1"
+ "@walmart/gtp-shared-components": "npm:2.2.4"
"@walmart/me-at-walmart-athena-queries": "npm:6.26.1"
"@walmart/me-at-walmart-common": "npm:6.29.0-alpha.0"
"@walmart/me-at-walmart-container": "npm:6.29.0-alpha.0"
| fix(ui): reverting gtp version and adding styles | fix(ui): reverting gtp version and adding styles
|
7ae08ed742c779c7d74d3d6a02322eb49d9856e5 | --- ios/Podfile.lock
@@ -506,14 +506,14 @@ PODS:
- RNWMSSOLibrary (1.1.0):
- AppAuth
- React
- - SSO (= 1.3.4)
+ - SSO (= 1.3.5)
- SDWebImage (5.11.0):
- SDWebImage/Core (= 5.11.0)
- SDWebImage/Core (5.11.0)
- SDWebImageWebPCoder (0.6.1):
- libwebp (~> 1.0)
- SDWebImage/Core (~> 5.7)
- - SSO (1.3.4):
+ - SSO (1.3.5):
- AppAuth
- Starscream (3.0.6)
- Yoga (1.14.0)
@@ -866,10 +866,10 @@ SPEC CHECKSUMS:
RNSoundPlayer: e7f72cf262c8de4f1427b5f29cc47aebadd1d872
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
- RNWMSSOLibrary: 5ac32b2d4c636f762408dfd6c0eb363a9983b8e7
+ RNWMSSOLibrary: c6d6563e0ce6bd65a1c1be9d2ee0ce215432337e
SDWebImage: 7acbb57630ac7db4a495547fb73916ff3e432f6b
SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
- SSO: b411029cd497cccfcf0fb44da1cbda2b9fef086b
+ SSO: 9dec1c3f07d650c868506b0147185898a27eb837
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
Yoga: 7740b94929bbacbddda59bf115b5317e9a161598
--- package-lock.json
@@ -12542,9 +12542,9 @@
"integrity": "sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg=="
},
"react-native-ssmp-sso-allspark": {
- "version": "1.1.4",
- "resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-1.1.4.tgz",
- "integrity": "sha512-lfv1vPjJEywDL5aH2xLgAHwQ25KFGH5yZx2hB0W/tjPiu9H58mI3VCyzUVRZ4MeWQtrRFUoY5laCz2YV/vfcMw=="
+ "version": "1.1.5",
+ "resolved": "https://npme.walmart.com/react-native-ssmp-sso-allspark/-/react-native-ssmp-sso-allspark-1.1.5.tgz",
+ "integrity": "sha512-fYPsMUU89nvYkf3Zw8ZcA5Y2PNuVVVCANSjTjxFqGE7wt8cfjUeX+GU9KTovrG6LJsg9VyVD1CE96NFZk2Ucvw=="
},
"react-native-sumo-sdk": {
"version": "2.7.4-rc.9",
--- package.json
@@ -119,7 +119,7 @@
"react-native-sha256": "^1.3.6",
"react-native-sound-player": "0.10.9",
"react-native-splash-screen": "^3.2.0",
- "react-native-ssmp-sso-allspark": "1.1.4",
+ "react-native-ssmp-sso-allspark": "1.1.5",
"react-native-sumo-sdk": "^2.7.4-rc.9",
"react-native-svg": "^12.1.0",
"react-native-tab-view": "^2.15.2",
| SSO version bump up to 1.1.5 | SSO version bump up to 1.1.5
|
b3e12ea5e5b7f1f5672f8b10af5e054e0f3b4e9f | --- targets/US/ios/Podfile.lock
@@ -2858,7 +2858,7 @@ SPEC CHECKSUMS:
Libuv-gRPC: 55e51798e14ef436ad9bc45d12d43b77b49df378
libvmaf: 27f523f1e63c694d14d534cd0fddd2fab0ae8711
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
- live-access-sdk: d7bab205e141581a1fbee33db4bc9a870247fe66
+ live-access-sdk: acda01c460b8d274fe3a779c13c0a94e8f8b7fa7
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
native-rfid-scanner: e5cc36ba123a17724fa859ca448d47a371780e34
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
| updated podfile.lock | updated podfile.lock
|
05b6b6e10ba398ddb25e33ac75ce5f7c3d023d85 | --- package-lock.json
@@ -63,7 +63,7 @@
"@walmart/gtp-shared-components": "2.1.3",
"@walmart/impersonation-mini-app": "1.20.7",
"@walmart/ims-print-services-ui": "2.8.0",
- "@walmart/inbox-mini-app": "0.90.3",
+ "@walmart/inbox-mini-app": "0.90.4",
"@walmart/iteminfo-mini-app": "7.8.3",
"@walmart/learning-mini-app": "18.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
@@ -9149,9 +9149,9 @@
}
},
"node_modules/@walmart/inbox-mini-app": {
- "version": "0.90.3",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.3.tgz",
- "integrity": "sha512-Xibb65/dLoJcLZszioEyKlT0xX8kNQ1VIYLg9NqiBXj9u0NSNvObPn4IngPBCcMQ6j+97ReX4opkEnqyJT11fw==",
+ "version": "0.90.4",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.4.tgz",
+ "integrity": "sha512-n8K6GxMx0y5qPgsSNxyx5EX18sfXd+TDRQ+dOAb1/PBFXeKIBXVKcWZ3wq9Lq1/0sIXQMcUJNmHTq+XA1341lA==",
"dependencies": {
"@walmart/moment-walmart": "^1.0.4",
"@walmart/walmart-fiscal-week": "^0.3.6"
@@ -33450,9 +33450,9 @@
"integrity": "sha512-Iqe7kNS9WRhmDkaIr7/4GwAE3s0lPQ0vcRYkIwchFeT1NE/PC/FVU3DoiNX2pgq6mXkg09PhyYGxmOe5+9ggUA=="
},
"@walmart/inbox-mini-app": {
- "version": "0.90.3",
- "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.3.tgz",
- "integrity": "sha512-Xibb65/dLoJcLZszioEyKlT0xX8kNQ1VIYLg9NqiBXj9u0NSNvObPn4IngPBCcMQ6j+97ReX4opkEnqyJT11fw==",
+ "version": "0.90.4",
+ "resolved": "https://npme.walmart.com/@walmart/inbox-mini-app/-/inbox-mini-app-0.90.4.tgz",
+ "integrity": "sha512-n8K6GxMx0y5qPgsSNxyx5EX18sfXd+TDRQ+dOAb1/PBFXeKIBXVKcWZ3wq9Lq1/0sIXQMcUJNmHTq+XA1341lA==",
"requires": {
"@walmart/moment-walmart": "1.0.4",
"@walmart/walmart-fiscal-week": "^0.3.6"
--- package.json
@@ -104,7 +104,7 @@
"@walmart/gtp-shared-components": "2.1.3",
"@walmart/impersonation-mini-app": "1.20.7",
"@walmart/ims-print-services-ui": "2.8.0",
- "@walmart/inbox-mini-app": "0.90.3",
+ "@walmart/inbox-mini-app": "0.90.4",
"@walmart/iteminfo-mini-app": "7.8.3",
"@walmart/learning-mini-app": "18.0.3",
"@walmart/manager-approvals-miniapp": "0.2.4",
| inbox version updated | inbox version updated
|
70c73faa9cdeb47baa727da67ec1c79aa263b554 | --- src/screens/TabsScreen.tsx
@@ -29,13 +29,17 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => {
tabBar={LivingDesignTabBar}
screenOptions={{swipeEnabled: false}}>
<MainTab.Screen
- name={t('tabsScreen.rosterTab')}
- options={{lazy: true}}
+ name={'roster'}
+ options={{
+ title: t('tabsScreen.rosterTab')!,
+ lazy: true,
+ }}
component={RosterScreen}
/>
<MainTab.Screen
- name={t('tabsScreen.messagesTab')}
+ name={'messages'}
options={{
+ title: t('tabsScreen.messagesTab')!,
lazy: true,
tabBarBadge: UnreadBadge,
}}
--- src/utils/timestamps.ts
@@ -1,6 +1,7 @@
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(
@@ -8,9 +9,10 @@ export const daysAgoTimestamp = (numDays: number) => {
);
};
+type translationFunction = TFunction;
export const channelRowTimeStamp = (
lastMessageTimeStamp: LastMessageTimeStamp,
- t: any,
+ t: translationFunction,
) => {
const messageTimeStamp = moment(lastMessageTimeStamp);
const currentDate = moment();
--- src/screens/TabsScreen.tsx
@@ -29,13 +29,17 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => {
tabBar={LivingDesignTabBar}
screenOptions={{swipeEnabled: false}}>
<MainTab.Screen
- name={t('tabsScreen.rosterTab')}
- options={{lazy: true}}
+ name={'roster'}
+ options={{
+ title: t('tabsScreen.rosterTab')!,
+ lazy: true,
+ }}
component={RosterScreen}
/>
<MainTab.Screen
- name={t('tabsScreen.messagesTab')}
+ name={'messages'}
options={{
+ title: t('tabsScreen.messagesTab')!,
lazy: true,
tabBarBadge: UnreadBadge,
}}
--- src/utils/timestamps.ts
@@ -1,6 +1,7 @@
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(
@@ -8,9 +9,10 @@ export const daysAgoTimestamp = (numDays: number) => {
);
};
+type translationFunction = TFunction;
export const channelRowTimeStamp = (
lastMessageTimeStamp: LastMessageTimeStamp,
- t: any,
+ t: translationFunction,
) => {
const messageTimeStamp = moment(lastMessageTimeStamp);
const currentDate = moment();
| Added changes for SMDV-4886: Blank screen on language change | Added changes for SMDV-4886: Blank screen on language change
|
7bb6714dea79bae9b4ea2a634f7391c7aa3d4f54 | --- __tests__/app/tabs/_layout.test.tsx
@@ -11,10 +11,13 @@ jest.mock('@walmart/allspark-foundation', () => ({
}));
jest.mock('@/components/BottomNav', () => ({
- TabBarIcon: jest.fn(() => null),
useMyWalmartTabConfig: jest.fn(),
}));
+jest.mock('@walmart/allspark-components-library', () => ({
+ Icon: jest.fn(() => null),
+}));
+
jest.mock('@/app/tabs/for-you', () => jest.fn(() => null));
jest.mock('@/app/tabs/todays-plan', () => jest.fn(() => null));
jest.mock('@/app/tabs/my-team', () => jest.fn(() => null));
--- __tests__/navigation/USHallway/AssociateHallwayNav/MainStackNavTest.tsx
@@ -20,6 +20,10 @@ jest.mock('../../../../src/features/timeclock', () => ({
})),
}));
+jest.mock('@walmart/allspark-components-library', () => ({
+ Icon: jest.fn(() => null),
+}));
+
describe('AssociateHallwayNav', () => {
it('renders MainStackNav', () => {
const {toJSON} = render(<MainStackNav />);
--- package.json
@@ -74,7 +74,7 @@
"@shopify/flash-list": "1.6.4",
"@terrylinla/react-native-sketch-canvas": "patch:@terrylinla/react-native-sketch-canvas@npm%3A0.8.0#~/.yarn/patches/@terrylinla-react-native-sketch-canvas-npm-0.8.0-c7b2afd4cd.patch",
"@walmart/allspark-authentication": "~6.4.10",
- "@walmart/allspark-components-library": "1.1.0-beta.4639+f5a15762",
+ "@walmart/allspark-components-library": "1.1.0-beta.4647+a6b2bab9",
"@walmart/allspark-cope-key-listener": "0.0.18",
"@walmart/allspark-foundation": "6.45.2",
"@walmart/allspark-foundation-hub": "1.6.5",
--- src/app/tabs/_layout.tsx
@@ -6,10 +6,11 @@ import {HeaderButtonProps} from '@react-navigation/elements';
import {useAllsparkTranslation} from '@walmart/allspark-foundation';
import {ChatBubbleIcon, IconButton, UserIcon} from '@walmart/gtp-shared-components';
-import {TabBarIcon, useMyWalmartTabConfig} from '@/components/BottomNav';
+import {useMyWalmartTabConfig} from '@/components/BottomNav';
import ForYou from './for-you';
import TodaysPlan from './todays-plan';
import MyTeam from './my-team';
+import {Icon} from '@walmart/allspark-components-library';
const styles = StyleSheet.create({
headerRight: {
@@ -59,7 +60,7 @@ export default function TabsNavigation() {
component={ForYou}
options={{
title: translate('forYou.tabTitle'),
- tabBarIcon: (props) => <TabBarIcon {...props} icon='ArticleIcon' />,
+ tabBarIcon: (props) => <Icon {...props} name='checklist' size='medium'/>,
tabBarAccessibilityLabel: translate('forYou.tabAccessibilityLabel'),
}}
/>
@@ -69,7 +70,7 @@ export default function TabsNavigation() {
component={TodaysPlan}
options={{
title: translate('todaysPlan.tabTitle'),
- tabBarIcon: (props) => <TabBarIcon {...props} icon='CalendarIcon' />,
+ tabBarIcon: (props) => <Icon {...props} name='calendar' size='medium' />,
tabBarAccessibilityLabel: translate('todaysPlan.tabAccessibilityLabel'),
}}
/>
@@ -79,7 +80,7 @@ export default function TabsNavigation() {
component={MyTeam}
options={{
title: translate('myTeam.tabTitle'),
- tabBarIcon: (props) => <TabBarIcon {...props} icon='AssociateIcon' />,
+ tabBarIcon: (props) => <Icon {...props} name='teams' size='medium' />,
tabBarAccessibilityLabel: translate('myTeam.tabAccessibilityLabel'),
}}
/>
--- yarn.lock
@@ -7351,9 +7351,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/allspark-components-library@npm:1.1.0-beta.4639+f5a15762":
- version: 1.1.0-beta.4639
- resolution: "@walmart/allspark-components-library@npm:1.1.0-beta.4639::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-components-library%2F-%2F%40walmart%2Fallspark-components-library-1.1.0-beta.4639.tgz"
+"@walmart/allspark-components-library@npm:1.1.0-beta.4647+a6b2bab9":
+ version: 1.1.0-beta.4647
+ resolution: "@walmart/allspark-components-library@npm:1.1.0-beta.4647::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fallspark-components-library%2F-%2F%40walmart%2Fallspark-components-library-1.1.0-beta.4647.tgz"
dependencies:
"@react-native-picker/picker": "npm:2.7.5"
"@types/react": "npm:~18.2.79"
@@ -7370,7 +7370,7 @@ __metadata:
react-native: ">=0.74.5"
react-native-device-info: ">=10.13.1"
react-native-web: ">=0.19.10"
- checksum: 10c0/4c28cd7f1af51ecaa196ef1038551e8eecbfb70cd08da345acd265cceaf183347642d7fe1186b5fcfe9090d49f155de126617dc7616705d46b7b5f521b2c4cea
+ checksum: 10c0/8cf094a778068ebc4ae1f4c1799c99fad5cee3bb77059a5fa9df2c51df004d3e55a8394e1620d75bcf44743fdef9485d298b880c6396aece426202235aa3b589
languageName: node
linkType: hard
@@ -8630,7 +8630,7 @@ __metadata:
"@types/react-native-vector-icons": "npm:6.4.18"
"@types/react-test-renderer": "npm:^18.0.7"
"@walmart/allspark-authentication": "npm:~6.4.10"
- "@walmart/allspark-components-library": "npm:1.1.0-beta.4639+f5a15762"
+ "@walmart/allspark-components-library": "npm:1.1.0-beta.4647+a6b2bab9"
"@walmart/allspark-cope-key-listener": "npm:0.0.18"
"@walmart/allspark-foundation": "npm:6.45.2"
"@walmart/allspark-foundation-hub": "npm:1.6.5"
| feat(icon): ALLSPARK-6276 Update icons for bottom nav | feat(icon): ALLSPARK-6276 Update icons for bottom nav
|
4120c1f2dac75977a4f03fd9bc8c905fce8525ea | --- packages/allspark-foundation/src/Container/AllsparkContainer.tsx
@@ -52,6 +52,8 @@ import {
import { ActiveAllsparkContainer } from './ActiveContainerManager';
import { AllsparkComponentProvider } from '../Components/context';
+import { throwIfRequiredKeyMissing } from '../utils';
+
const styles = StyleSheet.create({
gestureRootView: {
flex: 1,
@@ -124,19 +126,14 @@ export class AllsparkContainer<
* @param config - The configuration object for the container.
*/
constructor(id: string, config: AllsparkContainerConfig<E, T>) {
- if (!id || id.length < 1) {
- throw new Error('AllsparkContainer Initialization Error: id is required');
- }
- if (!config.environment) {
- throw new Error(
- 'AllsparkContainer Initialization Error: environment is required'
- );
- }
- if (!config.services) {
- throw new Error(
- 'AllsparkContainer Initialization Error: services is required'
- );
- }
+ throwIfRequiredKeyMissing(
+ {
+ id,
+ environment: config.environment,
+ services: config.services,
+ },
+ 'AllsparkContainer Initialization Error'
+ );
this.id = id;
this.config = config;
this.features = new FeatureModuleManager(`${this.id}-features`);
@@ -386,11 +383,13 @@ export class AllsparkContainer<
// Environment intialized first for given env and overrides.
// Other client configurations may be dependent on env so this is done first.
- if (!env) {
- throw new Error(
- 'AllsparkContainer Initialization Error: env is required in environment'
- );
- }
+ throwIfRequiredKeyMissing(
+ {
+ env,
+ },
+ 'AllsparkContainer Initialization Error',
+ 'environment'
+ );
AllsparkEnvironment.initialize({
env,
@@ -398,30 +397,22 @@ export class AllsparkContainer<
overrides: { ...overrides, containerName: this.id },
});
- // Connects all dynamic services to their global instances.
- const requiredServices: Array<
- keyof AllsparkContainerConfig<E, T>['services']
- > = [
- 'auth',
- 'clock',
- 'config',
- 'device',
- 'logger',
- 'navConfig',
- 'site',
- 'telemetry',
- 'user',
- ];
- const missingServices = requiredServices.filter(
- (service) => !this.config.services[service]
+ throwIfRequiredKeyMissing(
+ {
+ auth: this.config.services.auth,
+ clock: this.config.services.clock,
+ config: this.config.services.config,
+ device: this.config.services.device,
+ logger: this.config.services.logger,
+ navConfig: this.config.services.navConfig,
+ site: this.config.services.site,
+ telemetry: this.config.services.telemetry,
+ user: this.config.services.user,
+ },
+ 'AllsparkContainer Initialization Error',
+ 'services'
);
- if (missingServices.length > 0) {
- throw new Error(
- `AllsparkContainer Initialization Error: Missing required services: ${missingServices.join(
- ', '
- )}`
- );
- }
+ // Connects all dynamic services to their global instances.
AuthServiceCreator(this.config.services.auth);
ClockServiceCreator(this.config.services.clock);
ConfigServiceCreator(this.config.services.config);
--- packages/allspark-foundation/src/utils/index.ts
@@ -1,3 +1,4 @@
export * from './ContextCreator';
export * from './DynamicFeatureServiceCreator';
export * from './DynamicServiceCreator';
+export * from './validation';
--- packages/allspark-foundation/src/utils/validation.ts
@@ -0,0 +1,18 @@
+type Scalar = string | number | boolean | object;
+type Maybe<T> = T | null | undefined;
+
+export type OptionsType = Record<string, Maybe<Scalar>>;
+
+export const throwIfRequiredKeyMissing = (
+ options: OptionsType = {},
+ prefix: string = 'AllSpark Foundation Error',
+ path: string | undefined = undefined
+) => {
+ Object.entries(options).forEach(([idx, value]) => {
+ if (!value) {
+ throw new Error(
+ `${prefix}: ${idx} is required ${path ? `in ${path}` : ''}`
+ );
+ }
+ });
+};
| fix: add validation logic in utils | fix: add validation logic in utils
|
8ab1ec701cd33118c5e9a451994646fa01ad4997 | --- targets/US/package.json
@@ -110,7 +110,7 @@
"@walmart/global-vpi-mini-app": "1.1.1",
"@walmart/gta-react-native-calendars": "0.7.0",
"@walmart/gtp-shared-components": "2.2.4",
- "@walmart/ims-print-services-ui": "2.16.4",
+ "@walmart/ims-print-services-ui": "2.16.5",
"@walmart/inbox-mini-app": "0.97.13",
"@walmart/invue-react-native-sdk": "0.1.26-beta.3",
"@walmart/iteminfo-mini-app": "8.0.4",
--- yarn.lock
@@ -6804,9 +6804,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/ims-print-services-ui@npm:2.16.4":
- version: 2.16.4
- resolution: "@walmart/ims-print-services-ui@npm:2.16.4"
+"@walmart/ims-print-services-ui@npm:2.16.5":
+ version: 2.16.5
+ resolution: "@walmart/ims-print-services-ui@npm:2.16.5"
peerDependencies:
"@react-native-firebase/analytics": ">=10.5.1"
"@react-native-firebase/app": ">=10.5.0"
@@ -6827,7 +6827,7 @@ __metadata:
react-native-segmented-control-tab: ">=4.0.0"
react-native-wm-telemetry: ">=0.2.0"
uuid: ">=3.3.2"
- checksum: 10c0/b0ef161d32554ff70a56a0ca90bc2816386aabcb2602a4f0d1cdf6b63ecab710f0cf4d769cfc6fd5374981839bfa458bb34681a0ba7b9ae11c85d363224014d4
+ checksum: 10c0/de09374b5e337164e62b9fdd75a689d3f3d809f0e9675a9cceb9f3eb46aa271990336a165b59ae32448d0595138558239b703b78d8c2b42181b590d6d171e6a5
languageName: node
linkType: hard
@@ -7347,7 +7347,7 @@ __metadata:
"@walmart/global-vpi-mini-app": "npm:1.1.1"
"@walmart/gta-react-native-calendars": "npm:0.7.0"
"@walmart/gtp-shared-components": "npm:2.2.4"
- "@walmart/ims-print-services-ui": "npm:2.16.4"
+ "@walmart/ims-print-services-ui": "npm:2.16.5"
"@walmart/inbox-mini-app": "npm:0.97.13"
"@walmart/invue-react-native-sdk": "npm:0.1.26-beta.3"
"@walmart/iteminfo-mini-app": "npm:8.0.4"
| Bump Print UI version containing bugfix | Bump Print UI version containing bugfix
|
95bcdd3854b75b7e8f4d7dcb2e2c5f09ebb4b945 | --- package.json
@@ -379,7 +379,7 @@
"@walmart/money-auth-shared-components": "0.1.4",
"@walmart/onewalmart-miniapp": "1.0.24",
"@walmart/pay-stub-miniapp": "0.15.2",
- "@walmart/payrollsolution_miniapp": "0.138.4",
+ "@walmart/payrollsolution_miniapp": "0.140.1",
"@walmart/price-changes-mini-app": "1.10.6",
"@walmart/profile-feature-app": "1.138.2",
"@walmart/react-native-encrypted-storage": "~1.1.3",
| update package.json | update package.json
|
c6be4a349e334d7efd21e7a653304d4311184f5c | --- packages/allspark-foundation/src/HubFeature/Onboarding/TeamSelection/Component/TeamSelectionList.tsx
@@ -5,9 +5,8 @@ import { SelectionBanner } from './SelectionBanner';
import { teamSelectionListStyles as styles } from '../styles';
import { TeamPreference, TeamSelectionListProps } from '../types';
import { HubHeader } from '../../../HubHeader';
-import { colors } from '@walmart/gtp-shared-components';
+import { colors, Spinner } from '@walmart/gtp-shared-components';
import { ListHeader } from './ListHeader';
-import { TeamSelectionLoader } from './TeamSelectionLoader';
import { ErrorScreen } from '../Component/ErrorScreen';
import { UserSelectors } from '../../../../User';
import { SiteSelectors } from '../../../../Site';
@@ -95,7 +94,7 @@ export const TeamSelectionList = ({
};
if (loading) {
- return <TeamSelectionLoader />;
+ return <Spinner size='large' />;
}
if (error) {
| Adding loading spinner to loading state of upsert mutation | Adding loading spinner to loading state of upsert mutation
|
c3c230b85c6294eb092750a868f681633910c918 | --- android/app/build.gradle
@@ -153,8 +153,8 @@ android {
applicationId "com.walmart.stores.allspark.beta"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 891
- versionName "1.8.5"
+ versionCode 892
+ versionName "1.9.0"
}
splits {
abi {
--- ios/AllSpark/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.8.5</string>
+ <string>1.9.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>891</string>
+ <string>892</string>
<key>FirebaseAutomaticScreenReportingEnabled</key>
<false />
<key>LSApplicationQueriesSchemes</key>
--- package-lock.json
@@ -1,6 +1,6 @@
{
"name": "allspark-main",
- "version": "1.8.5",
+ "version": "1.9.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
--- package.json
@@ -1,6 +1,6 @@
{
"name": "allspark-main",
- "version": "1.8.5",
+ "version": "1.9.0",
"private": true,
"scripts": {
"android": "react-native run-android",
| version bump to 1.9.0 | version bump to 1.9.0
|
03b10397cb52b4609ff138a95c75fecbecda9604 | --- package.json
@@ -89,7 +89,7 @@
"@walmart/exception-mini-app": "0.42.1",
"@walmart/facilities-management-miniapp": "0.2.2",
"@walmart/feedback-all-spark-miniapp": "0.6.0",
- "@walmart/financial-wellbeing-feature-app": "1.0.20",
+ "@walmart/financial-wellbeing-feature-app": "1.0.21",
"@walmart/functional-components": "2.0.6",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "1.8.9",
| financial wellbeing feature app - v1.0.21 | financial wellbeing feature app - v1.0.21
|
baa1c68a5be99cf0217bcbda12ee10d0e924be44 | --- packages/allspark-foundation/src/Feature/AllsparkFeatureModule.tsx
@@ -532,6 +532,24 @@ export class AllsparkFeatureModule<
return this;
}
+ /**
+ * Add a listener for the onConnect event.
+ */
+ public onConnect(listener: (capability?: ConnectCapabilities) => void) {
+ return FeatureEventManager.addListener('onConnect', listener, {
+ id: this.id,
+ });
+ }
+
+ /**
+ * Add a listener for the onDisconnect event.
+ */
+ public onDisconnect(listener: (capability?: ConnectCapabilities) => void) {
+ return FeatureEventManager.addListener('onDisconnect', listener, {
+ id: this.id,
+ });
+ }
+
/**
* ConnectGuard component that ensures the AllsparkFeatureModule is connected before rendering its children.
* @param props - The component props.
| feat: add connect and disconnect listener methods to feature module class | feat: add connect and disconnect listener methods to feature module class
|
d6a1b6d37659f420bf3e2efb20abddbeafaa77da | --- example/src/core/home.tsx
@@ -52,12 +52,6 @@ export function HomeScreen() {
onPress={() => AllsparkNavigationClient.navigate('feature2.home')}>
Open Feature 2
</Button>
- <Button
- variant="primary"
- UNSAFE_style={{marginBottom: 10}}
- onPress={() => AllsparkNavigationClient.navigate('teamHub.home')}>
- Open Feature 3
- </Button>
<Button
variant="primary"
UNSAFE_style={{marginBottom: 10}}
--- example/src/core/index.tsx
@@ -106,7 +106,7 @@ const TabStack = () => {
<Tabs.Screen name="container.homeTab" component={HomeNav} />
<Tabs.Screen name="container.tab1" component={Tab1Nav} />
<Tabs.Screen name="container.tab2" component={Tab2Nav} />
- <Tabs.Screen name="Onboarding" component={Tab3Nav} />
+ <Tabs.Screen name="Team" component={Tab3Nav} />
</Tabs.Navigator>
);
};
--- example/src/index.ts
@@ -27,11 +27,3 @@ export const TeamHubStandalone = new AllsparkFeatureRunner(
env: 'dev',
},
);
-
-export const OnboardingStandalone = new AllsparkFeatureRunner(
- TestContainer,
- Onboarding,
- {
- env: 'dev',
- },
-);
--- packages/allspark-foundation/src/Components/TeamOnboarding/index.tsx
@@ -1,3 +1,2 @@
export * from './types';
export * from './Screens';
-export const TeamOnboarding = () => <></>;
| feat: removed unnecessary changes | feat: removed unnecessary changes
|
cd775c2d7bd9d6fcfeec0ee9887ebac454329ac9 | --- __tests__/navigation/__snapshots__/ClockOutGuardTest.tsx.snap
@@ -8,10 +8,10 @@ exports[`ClockOutGuard matches snapshot when clocked in 1`] = `
exports[`ClockOutGuard matches snapshot when clocked out; navigates home on button press 1`] = `
<ClockOutOverlay
- buttonTitle="Me@Walmart home"
- content="You must be clocked in to use App Name"
+ buttonTitle="clockOutGuard.action"
+ content="clockOutGuard.content App Name"
onButtonPress={[Function]}
- title="Must be clocked in"
+ title="clockOutGuard.title"
/>
`;
--- src/navigation/ClockOutGuard.tsx
@@ -1,5 +1,6 @@
import React from 'react';
import {useSelector} from 'react-redux';
+import {useTranslation} from 'react-i18next';
import {useNavigation} from '@react-navigation/native';
import {ClockOutOverlay} from '@walmart/ui-components';
import {getIsClockedOut} from '../redux/SharedSelectors';
@@ -7,15 +8,16 @@ import {getIsClockedOut} from '../redux/SharedSelectors';
export const ClockOutGuard = (props: any) => {
const {appName, children} = props;
const navigation = useNavigation();
+ const [translate] = useTranslation();
const isClockedOut = useSelector(getIsClockedOut);
const onGoHome = () => navigation.navigate('home');
return isClockedOut ? (
<ClockOutOverlay
- title='Must be clocked in'
- content={`You must be clocked in to use ${appName}`}
- buttonTitle='Me@Walmart home'
+ title={translate('clockOutGuard.title')}
+ content={`${translate('clockOutGuard.content')} ${appName}`}
+ buttonTitle={translate('clockOutGuard.action')}
onButtonPress={onGoHome}
/>
) : (
--- src/translations/en-US.ts
@@ -134,5 +134,10 @@ export const enUS = {
FaceID: 'Face ID',
TouchID: 'Touch ID',
},
+ clockOutGuard: {
+ title: 'Must be clocked in',
+ content: 'You must be clocked in to use',
+ action: 'Me@Walmart home',
+ },
},
};
--- src/translations/es-MX.ts
@@ -134,5 +134,10 @@ export const esMX = {
FaceID: 'Face ID',
TouchID: 'Touch ID',
},
+ clockOutGuard: {
+ title: 'Must be clocked in',
+ content: 'You must be clocked in to use',
+ action: 'Me@Walmart home',
+ },
},
};
| Adding translations for clock out guard | Adding translations for clock out guard
|
84f8f36c8cf4648a1f7cb2d28c94a5272e76d969 | --- package-lock.json
@@ -4203,9 +4203,9 @@
"integrity": "sha512-AymRaP39YXybYN3VHLVNFMoA8J4XYZbd9JUT+bQOuc5KGf5SQQFMOhrqSd9UENvnbqnTRrfDbBhn/ua7/E54WA=="
},
"@walmart/exception-mini-app": {
- "version": "0.39.9",
- "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.39.9.tgz",
- "integrity": "sha512-EtgG3wNVcR5gpo5qxtjap0n6hFb8PLa3q42OsxLnsWBqgs63FyqKZHXm4PA3HkeQaC3P2gPodNDc50l000dF6A=="
+ "version": "0.39.10",
+ "resolved": "https://npme.walmart.com/@walmart/exception-mini-app/-/exception-mini-app-0.39.10.tgz",
+ "integrity": "sha512-btkn4VE+5H2cyqPv47O3bytqSA2irOJ/+sT+pNl7CIanF+DuFYjDUNpddeDe7t0HRYTPLsEM07KlIhMrDYOsAA=="
},
"@walmart/feedback-all-spark-miniapp": {
"version": "0.1.25",
--- package.json
@@ -77,7 +77,7 @@
"@walmart/ask-sam-mini-app": "0.40.8",
"@walmart/config-components": "1.0.35",
"@walmart/counts-component-miniapp": "0.0.32",
- "@walmart/exception-mini-app": "0.39.9",
+ "@walmart/exception-mini-app": "0.39.10",
"@walmart/feedback-all-spark-miniapp": "0.1.25",
"@walmart/functional-components": "1.0.34",
"@walmart/gta-react-native-calendars": "0.0.15",
| feature/pinpoint-0.39.10 | feature/pinpoint-0.39.10
|
064bb3d7bc9ef824ae3d13df9f0b5978e5d6f4a2 | --- __tests__/setup.ts
@@ -1,4 +1,3 @@
-jest.setTimeout(120000);
jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter');
jest.mock('@walmart/functional-components', () => {
const mockHttpClient = {
--- __tests__/setup.ts
@@ -1,4 +1,3 @@
-jest.setTimeout(120000);
jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter');
jest.mock('@walmart/functional-components', () => {
const mockHttpClient = {
| removing setTimeout | removing setTimeout
|
69af9486d38030cbf33060dfc6d32c843b1bd97d | --- package.json
@@ -96,7 +96,7 @@
"@walmart/react-native-sumo-sdk": "2.8.0",
"@walmart/redux-store": "6.3.29",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "2.37.1",
+ "@walmart/wmconnect-mini-app": "2.38.0",
"babel-jest": "^29.6.3",
"chance": "^1.1.11",
"crypto-js": "~4.2.0",
--- yarn.lock
@@ -7116,7 +7116,7 @@ __metadata:
"@walmart/react-native-sumo-sdk": "npm:2.8.0"
"@walmart/redux-store": "npm:6.3.29"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:2.37.1"
+ "@walmart/wmconnect-mini-app": "npm:2.38.0"
babel-jest: "npm:^29.6.3"
chance: "npm:^1.1.11"
crypto-js: "npm:~4.2.0"
@@ -7199,9 +7199,9 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:2.37.1":
- version: 2.37.1
- resolution: "@walmart/wmconnect-mini-app@npm:2.37.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.37.1.tgz"
+"@walmart/wmconnect-mini-app@npm:2.38.0":
+ version: 2.38.0
+ resolution: "@walmart/wmconnect-mini-app@npm:2.38.0::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fwmconnect-mini-app%2F-%2F%40walmart%2Fwmconnect-mini-app-2.38.0.tgz"
dependencies:
expo: "npm:~52.0.46"
react: "npm:18.3.1"
@@ -7216,7 +7216,7 @@ __metadata:
dependenciesMeta:
"@walmart/me-at-walmart":
built: false
- checksum: 10c0/da10edb453595540a412568513b18de5565279ff18dc6dae8af57aa197ed746a0f7832d0aa0e793620421e35ec922522271a6fcd2cf2ed7208e7a315ed62fc98
+ checksum: 10c0/58a47b6336b0cbf858911a481bd8d9af7375a4520f110567643c32cb737aa9a481ce173721c1e08ca4e870ba1eee48d2993d27a54e41293420fb8090664ca818
languageName: node
linkType: hard
| feat(ui): wmconnect mini app | feat(ui): wmconnect mini app
|
358637933d7d871a46632afc0aec20b87649c83a | --- package-lock.json
@@ -1892,9 +1892,9 @@
}
},
"@walmart/ask-sam-mini-app": {
- "version": "0.7.5",
- "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.7.5.tgz",
- "integrity": "sha512-Zhb1m7TS/5k2K9AqB6Pcm8+5R19I/KDeMnT76K5gHT5LbFC9zpLWFjl18yot9p1jbwkHffyq+gCdXH8YJOL/1Q==",
+ "version": "0.7.6",
+ "resolved": "https://npme.walmart.com/@walmart/ask-sam-mini-app/-/ask-sam-mini-app-0.7.6.tgz",
+ "integrity": "sha512-iVl5Gh9PhNJK/ZtTi4fsk2IBStjP2yDilTr9C3JADbOeU3Ef3XvMSoyjeKLORpa58vZMXuEN0tOwKGcbhwZW1A==",
"requires": {
"apisauce": "^1.1.2",
"lodash": "^4.17.19",
--- package.json
@@ -48,7 +48,7 @@
"@walmart/allspark-health-survey-mini-app": "0.0.18",
"@walmart/allspark-home-mini-app": "0.1.7",
"@walmart/allspark-me-mini-app": "0.0.14",
- "@walmart/ask-sam-mini-app": "0.7.5",
+ "@walmart/ask-sam-mini-app": "0.7.6",
"@walmart/config-components": "1.0.8",
"@walmart/feedback-all-spark-miniapp": "0.0.30",
"@walmart/functional-components": "^1.0.22",
| ask sam version bump (#228) | ask sam version bump (#228)
|
196f6e8f63ef3541cdfcb96e43be8833e986c8a3 | --- package-lock.json
@@ -3008,9 +3008,9 @@
}
},
"@walmart/allspark-home-mini-app": {
- "version": "0.2.2",
- "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.2.2.tgz",
- "integrity": "sha512-d5BiS02tiZB0Pw8asyJO0XQ7dtzYGqff1GE/KGodmK2Pq8Pfv6ZCGsIr45l6N7zDRISq/KIE9AETaKXG1O6IQw==",
+ "version": "0.3.0",
+ "resolved": "https://npme.walmart.com/@walmart/allspark-home-mini-app/-/allspark-home-mini-app-0.3.0.tgz",
+ "integrity": "sha512-jg378YD2MTQ72Kb7Wj1EJhXW6wbr1Kgx4NfoVmjxE/43kaZYiVsa50274jEbgenbGcm+jt9qd4xUJlzF/YousA==",
"requires": {
"moment": "^2.29.0",
"uuid": "^8.3.1"
--- package.json
@@ -62,7 +62,7 @@
"@sharcoux/slider": "^5.2.1",
"@terrylinla/react-native-sketch-canvas": "^0.8.0",
"@walmart/allspark-health-survey-mini-app": "0.0.34",
- "@walmart/allspark-home-mini-app": "^0.2.2",
+ "@walmart/allspark-home-mini-app": "0.3.0",
"@walmart/allspark-me-mini-app": "0.0.23",
"@walmart/ask-sam-mini-app": "0.15.0",
"@walmart/config-components": "1.0.21",
| home app version bump (#514) | home app version bump (#514)
|
a773e6adb801a52c5cc24476979540e33058d0c0 | --- package-lock.json
@@ -4248,9 +4248,9 @@
}
},
"@walmart/impersonation-mini-app": {
- "version": "1.0.26",
- "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.26.tgz",
- "integrity": "sha512-M+XKwLklp4OjIuNL6xx3yzEx3nVteFtU0y6O1BkE7xeZdnNZqQOi6/Sm5EkYOPdVXja/+QD2WA02JTgMDUUSlA=="
+ "version": "1.0.27",
+ "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.0.27.tgz",
+ "integrity": "sha512-0M7ySb3F2lKlIfwBosm+Slx3kJvdoEHm5haaZ05WKCJ1hctu0F0CzTGDSbZciXWX92HJBmxvsvr8yi2H435R8g=="
},
"@walmart/ims-print-services-ui": {
"version": "0.1.10",
--- package.json
@@ -82,7 +82,7 @@
"@walmart/functional-components": "1.0.34",
"@walmart/gta-react-native-calendars": "0.0.15",
"@walmart/gtp-shared-components": "1.2.0",
- "@walmart/impersonation-mini-app": "1.0.26",
+ "@walmart/impersonation-mini-app": "1.0.27",
"@walmart/ims-print-services-ui": "0.1.10",
"@walmart/inbox-mini-app": "0.23.0",
"@walmart/iteminfo-mini-app": "2.0.16",
| removed refresh token logic from impersoantion app | removed refresh token logic from impersoantion app
|
c35c2bb8362bddfd6397da0aec05096b9984cdeb | --- .looper-pr.yml
@@ -12,6 +12,7 @@ flows:
- (name Yarn Version) yarn --version
- (name Yarn Install) yarn install
- (name Test Coverage) yarn run coverage
+
envs:
global:
--- package.json
@@ -99,7 +99,7 @@
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/redux-store": "3.7.0",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "2.2.1",
+ "@walmart/wmconnect-mini-app": "2.3.0",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
--- yarn.lock
@@ -5974,16 +5974,6 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/react-native-sumo-sdk@npm:*":
- version: 2.7.0
- resolution: "@walmart/react-native-sumo-sdk@npm:2.7.0"
- peerDependencies:
- react: "*"
- react-native: "*"
- checksum: 10c0/91fa7dc49a56cd1335f3b9fd2c6cebb17089c95ed15bd51f8ed1a6756905ddeae1c6e462f00fe4203cbf271e38a3ffb0c7385331793fa2efbb0b20c50a9d2f4f
- languageName: node
- linkType: hard
-
"@walmart/react-native-sumo-sdk@npm:2.6.0":
version: 2.6.0
resolution: "@walmart/react-native-sumo-sdk@npm:2.6.0"
@@ -6080,7 +6070,7 @@ __metadata:
"@walmart/react-native-sumo-sdk": "npm:2.6.0"
"@walmart/redux-store": "npm:3.7.0"
"@walmart/ui-components": "npm:1.15.1"
- "@walmart/wmconnect-mini-app": "npm:2.2.1"
+ "@walmart/wmconnect-mini-app": "npm:2.3.0"
babel-jest: "npm:^29.2.1"
chance: "npm:^1.1.11"
eslint: "npm:8.22.0"
@@ -6209,49 +6199,49 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/wmconnect-mini-app@npm:2.2.1":
- version: 2.2.1
- resolution: "@walmart/wmconnect-mini-app@npm:2.2.1"
- dependencies:
- "@react-native-async-storage/async-storage": "npm:^1.21.0"
- "@react-native-community/netinfo": "npm:^11.0.1"
- "@react-native-firebase/analytics": "npm:~17.4.2"
- "@react-native-firebase/crashlytics": "npm:~17.4.2"
- "@react-native-firebase/database": "npm:~17.4.2"
- "@react-native-firebase/perf": "npm:~17.4.2"
- "@react-navigation/drawer": "npm:^6.6.4"
- "@react-navigation/native": "npm:^6.0.8"
- "@reduxjs/toolkit": "npm:^1.9.7"
- "@types/node": "npm:20.5.9"
- "@walmart/allspark-graphql-client": "npm:^1.4.6"
- "@walmart/allspark-http-client": "npm:6.1.4"
- "@walmart/config-components": "npm:4.4.0"
- "@walmart/core-services": "npm:6.1.4"
- "@walmart/core-services-allspark": "npm:6.1.4"
- "@walmart/core-utils": "npm:6.1.4"
- "@walmart/gtp-shared-components": "npm:2.2.1"
- "@walmart/react-native-encrypted-storage": "npm:~1.1.3"
- "@walmart/react-native-logger": "npm:1.34.8"
- "@walmart/react-native-scanner-3.0": "npm:0.5.1"
- "@walmart/react-native-shared-navigation": "npm:6.1.4"
- "@walmart/react-native-sumo-sdk": "npm:*"
- i18next: "npm:^23.6.0"
- moment-timezone: "npm:~0.5.43"
- npm-run-all: "npm:^4.1.5"
- react-i18next: "npm:^13.3.1"
- react-native-apollo-devtools-client: "npm:^1.0.4"
- react-native-app-auth: "npm:^6.4.3"
- react-native-device-info: "npm:~10.13.1"
- react-native-gesture-handler: "npm:^2.14.0"
- react-native-get-random-values: "npm:~1.10.0"
- react-native-reanimated: "npm:^3.6.0"
- react-native-safe-area-context: "npm:^4.8.2"
- react-native-screens: "npm:^3.28.0"
- react-native-wm-telemetry: "npm:6.1.4"
- redux: "npm:^4.2.1"
- redux-saga: "npm:^1.2.3"
- wifi-store-locator: "npm:1.4.1"
- checksum: 10c0/25ee5c4e2225e94409f2647656ac3e743ff0c0f8a89d02cf5d348276c239bc60217293c9cbf5c2e19ccfb1031d34854f6739a61be63f6df672f4b02c7e84a542
+"@walmart/wmconnect-mini-app@npm:2.3.0":
+ version: 2.3.0
+ resolution: "@walmart/wmconnect-mini-app@npm:2.3.0"
+ peerDependencies:
+ "@react-native-async-storage/async-storage": ^1.21.0
+ "@react-native-community/netinfo": ^11.0.1
+ "@react-native-firebase/analytics": ~17.4.2
+ "@react-native-firebase/crashlytics": ~17.4.2
+ "@react-native-firebase/database": ~17.4.2
+ "@react-native-firebase/perf": ~17.4.2
+ "@react-navigation/drawer": ^6.6.4
+ "@react-navigation/native": ^6.0.8
+ "@reduxjs/toolkit": ^1.9.7
+ "@types/node": 20.5.9
+ "@walmart/allspark-graphql-client": ^1.4.6
+ "@walmart/allspark-http-client": 6.1.4
+ "@walmart/config-components": 4.4.0
+ "@walmart/core-services": 6.1.4
+ "@walmart/core-services-allspark": 6.1.4
+ "@walmart/core-utils": 6.1.4
+ "@walmart/gtp-shared-components": 2.2.1
+ "@walmart/react-native-encrypted-storage": ~1.1.3
+ "@walmart/react-native-logger": 1.34.8
+ "@walmart/react-native-scanner-3.0": 0.5.1
+ "@walmart/react-native-shared-navigation": 6.1.4
+ "@walmart/react-native-sumo-sdk": "*"
+ i18next: ^23.6.0
+ moment-timezone: ~0.5.43
+ npm-run-all: ^4.1.5
+ react-i18next: ^13.3.1
+ react-native-apollo-devtools-client: ^1.0.4
+ react-native-app-auth: ^6.4.3
+ react-native-device-info: ~10.13.1
+ react-native-gesture-handler: ^2.14.0
+ react-native-get-random-values: ~1.10.0
+ react-native-reanimated: ^3.6.0
+ react-native-safe-area-context: ^4.8.2
+ react-native-screens: ^3.28.0
+ react-native-wm-telemetry: 6.1.4
+ redux: ^4.2.1
+ redux-saga: ^1.2.3
+ wifi-store-locator: 1.4.1
+ checksum: 10c0/6aeaeaf41bd50b06a792570f1f27ca2ec2b89dc6374a6409681d9b739064047a484a45c42c9a30d9b7860923e58cca1ae2a6047e6cdd97ffe5735b002627cfc0
languageName: node
linkType: hard
| feat(ui): update version SMDV-5884 | feat(ui): update version SMDV-5884
|
82fe5961df82e85d495352b177f7d5a978aae1de | --- CODEOWNERS
@@ -10,4 +10,13 @@
# subdirectories
-/packages/allspark-foundation/ @allspark/allspark-admin-team
+/packages/allspark-authentication/ @allspark/allspark-admin-team
+/packages/allspark-foundation/ @allspark/allspark-admin-team
+/packages/allspark-graphql-client/ @allspark/allspark-admin-team
+/packages/allspark-http-client/ @allspark/allspark-admin-team
+/packages/allspark-redux-store/ @allspark/allspark-admin-team
+/packages/allspark-utils/ @allspark/allspark-admin-team
+/packages/core-services/ @allspark/allspark-admin-team
+/packages/core-services-allspark/ @allspark/allspark-admin-team
+/packages/me-at-walmart-container/ @allspark/allspark-admin-team
+/packages/me-at-walmart-foundation/ @allspark/allspark-admin-team
| chore: update codeowners file | chore: update codeowners file
|
f7cd313338713127108ec78916ef57c61990eb63 | --- __tests__/__mocks__/react-redux.js
@@ -1,7 +0,0 @@
-const mockDispatch = jest.fn();
-
-module.exports = {
- Provider: 'Provider',
- useSelector: jest.fn(),
- useDispatch: jest.fn(() => mockDispatch),
-};
--- __tests__/harness/redux/index.tsx
@@ -1,27 +1,38 @@
-import React, {PropsWithChildren, ReactNode} from 'react';
+import React, {PropsWithChildren} from 'react';
import {render} from '@testing-library/react-native';
import type {RenderOptions} from '@testing-library/react-native';
import {Provider} from 'react-redux';
-import {getStore} from '@walmart/redux-store';
+import {reducerManager} from '@walmart/redux-store';
+import {PreloadedState} from 'redux';
+import {configureStore} from '@reduxjs/toolkit';
+import {initialStateMock} from './mockState';
+
+const rootReducer = reducerManager.getRootReducer();
-//TODO: Return type should be the rootReducer
export type AppStore = ReturnType<typeof setupStore>;
+export type RootState = ReturnType<typeof rootReducer>;
interface ExtendedRenderOptions extends Omit<RenderOptions, 'queries'> {
store?: AppStore;
+ preloadedState?: PreloadedState<RootState>;
}
-
-//TODO: Add this apps reducers, update to allow for a configurable mock provided state
-export const setupStore = () => {
- return getStore();
+export const setupStore = (preloadedState?: PreloadedState<RootState>) => {
+ return configureStore({
+ reducer: rootReducer,
+ preloadedState,
+ });
};
-export function renderWithProviders(
+export const renderWithProviders: typeof render = (
ui: React.ReactElement,
- {store = setupStore(), ...renderOptions}: ExtendedRenderOptions = {},
-) {
+ {
+ preloadedState = initialStateMock as RootState, //TODO: Create mock RootState to pass in
+ store = setupStore(preloadedState),
+ ...renderOptions
+ }: ExtendedRenderOptions = {},
+) => {
function Wrapper({children}: PropsWithChildren<{}>): React.ReactElement {
return <Provider store={store}>{children}</Provider>;
}
return {store, ...render(ui, {wrapper: Wrapper, ...renderOptions})};
-}
+};
--- __tests__/harness/redux/mockState/appConfigState.ts
@@ -0,0 +1 @@
+
--- __tests__/harness/redux/mockState/authState.ts
--- __tests__/harness/redux/mockState/clockStatusState.ts
@@ -0,0 +1,9 @@
+const clockCheckState = {
+ clockStatus: '2',
+};
+
+export const clockStatusState = {
+ loaded: true,
+ error: false,
+ data: clockCheckState,
+};
--- __tests__/harness/redux/mockState/deviceInfoState.ts
--- __tests__/harness/redux/mockState/index.ts
@@ -0,0 +1,14 @@
+import {GlobalState} from '@walmart/redux-store';
+import {clockStatusState} from './clockStatusState';
+
+//TODO: Move this to the @walmart/redux-store project as a sharable mock?
+export const initialStateMock: GlobalState = {
+ auth: {},
+ user: {},
+ site: {},
+ clockStatus: clockStatusState,
+ locale: {},
+ versions: {},
+ deviceInfo: {},
+ appConfig: {},
+};
--- __tests__/harness/redux/mockState/localeState.ts
--- __tests__/harness/redux/mockState/siteState.ts
--- __tests__/harness/redux/mockState/userState.ts
--- __tests__/harness/redux/mockState/versionsState.ts
--- __tests__/screens/RosterScreenTest.tsx
@@ -1,4 +1,4 @@
-import {render, screen, fireEvent} from '@testing-library/react-native';
+import {screen, fireEvent} from '@testing-library/react-native';
import {RosterScreen} from '../../src/screens/RosterScreen';
import {useNavigation} from '@react-navigation/native';
// @ts-ignore
--- __tests__/__mocks__/react-redux.js
@@ -1,7 +0,0 @@
-const mockDispatch = jest.fn();
-
-module.exports = {
- Provider: 'Provider',
- useSelector: jest.fn(),
- useDispatch: jest.fn(() => mockDispatch),
-};
--- __tests__/harness/redux/index.tsx
@@ -1,27 +1,38 @@
-import React, {PropsWithChildren, ReactNode} from 'react';
+import React, {PropsWithChildren} from 'react';
import {render} from '@testing-library/react-native';
import type {RenderOptions} from '@testing-library/react-native';
import {Provider} from 'react-redux';
-import {getStore} from '@walmart/redux-store';
+import {reducerManager} from '@walmart/redux-store';
+import {PreloadedState} from 'redux';
+import {configureStore} from '@reduxjs/toolkit';
+import {initialStateMock} from './mockState';
+
+const rootReducer = reducerManager.getRootReducer();
-//TODO: Return type should be the rootReducer
export type AppStore = ReturnType<typeof setupStore>;
+export type RootState = ReturnType<typeof rootReducer>;
interface ExtendedRenderOptions extends Omit<RenderOptions, 'queries'> {
store?: AppStore;
+ preloadedState?: PreloadedState<RootState>;
}
-
-//TODO: Add this apps reducers, update to allow for a configurable mock provided state
-export const setupStore = () => {
- return getStore();
+export const setupStore = (preloadedState?: PreloadedState<RootState>) => {
+ return configureStore({
+ reducer: rootReducer,
+ preloadedState,
+ });
};
-export function renderWithProviders(
+export const renderWithProviders: typeof render = (
ui: React.ReactElement,
- {store = setupStore(), ...renderOptions}: ExtendedRenderOptions = {},
-) {
+ {
+ preloadedState = initialStateMock as RootState, //TODO: Create mock RootState to pass in
+ store = setupStore(preloadedState),
+ ...renderOptions
+ }: ExtendedRenderOptions = {},
+) => {
function Wrapper({children}: PropsWithChildren<{}>): React.ReactElement {
return <Provider store={store}>{children}</Provider>;
}
return {store, ...render(ui, {wrapper: Wrapper, ...renderOptions})};
-}
+};
--- __tests__/harness/redux/mockState/appConfigState.ts
@@ -0,0 +1 @@
+
--- __tests__/harness/redux/mockState/authState.ts
--- __tests__/harness/redux/mockState/clockStatusState.ts
@@ -0,0 +1,9 @@
+const clockCheckState = {
+ clockStatus: '2',
+};
+
+export const clockStatusState = {
+ loaded: true,
+ error: false,
+ data: clockCheckState,
+};
--- __tests__/harness/redux/mockState/deviceInfoState.ts
--- __tests__/harness/redux/mockState/index.ts
@@ -0,0 +1,14 @@
+import {GlobalState} from '@walmart/redux-store';
+import {clockStatusState} from './clockStatusState';
+
+//TODO: Move this to the @walmart/redux-store project as a sharable mock?
+export const initialStateMock: GlobalState = {
+ auth: {},
+ user: {},
+ site: {},
+ clockStatus: clockStatusState,
+ locale: {},
+ versions: {},
+ deviceInfo: {},
+ appConfig: {},
+};
--- __tests__/harness/redux/mockState/localeState.ts
--- __tests__/harness/redux/mockState/siteState.ts
--- __tests__/harness/redux/mockState/userState.ts
--- __tests__/harness/redux/mockState/versionsState.ts
--- __tests__/screens/RosterScreenTest.tsx
@@ -1,4 +1,4 @@
-import {render, screen, fireEvent} from '@testing-library/react-native';
+import {screen, fireEvent} from '@testing-library/react-native';
import {RosterScreen} from '../../src/screens/RosterScreen';
import {useNavigation} from '@react-navigation/native';
// @ts-ignore
| setting up files to mock redux state | setting up files to mock redux state
|
a8df9fbafd18b123aeb357d941e3259218bd7d39 | --- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart",
- "version": "1.26.0",
+ "version": "1.27.0",
"private": true,
"workspaces": [
"core",
@@ -26,7 +26,8 @@
"solidarity": "solidarity",
"test": "jest --no-watchman",
"us:ios:dev": "yarn workspaces foreach --from 'me-at-walmart-us' -Rpti run ios:dev",
- "verifyBranchName": "bash ./scripts/verifyBranchName.sh"
+ "verifyBranchName": "bash ./scripts/verifyBranchName.sh",
+ "bumpVersion": "node scripts/bumpVersion.js"
},
"devDependencies": {
"eslint": "^8.19.0",
@@ -269,4 +270,4 @@
"engines": {
"node": ">=18"
}
-}
+}
\ No newline at end of file
--- scripts/bumpVersion.js
@@ -0,0 +1,93 @@
+const fs = require('fs');
+const semver = require('semver'); // For easy version manipulation
+
+const target = process.argv[2];
+const updateType = process.argv[3];
+if(!target || !updateType) {
+ console.error("Syntax: node bumpVersion.js <target> <major | minor | patch>");
+}
+
+// ********* Updating package jsons ****************
+// Read package.json
+const packageJsonPath = './package.json';
+const targetPackageJsonPath = `./targets/${target}/package.json`;
+const packageJson = JSON.parse(fs.readFileSync(packageJsonPath));
+const targetPackageJson = JSON.parse(fs.readFileSync(targetPackageJsonPath));
+
+// Get current version
+const currentVersion = packageJson.version;
+console.log('Current version:', currentVersion);
+
+// Update version (e.g., increment patch version)
+const newVersion = semver.inc(currentVersion, updateType);
+
+// Write updated version to both package.json
+packageJson.version = newVersion;
+targetPackageJson.version = newVersion;
+fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+fs.writeFileSync(targetPackageJsonPath, JSON.stringify(targetPackageJson, null, 2));
+
+// ********* Updating build.gradle ****************
+const buildGradlePath = `./targets/${target}/android/app/build.gradle`;
+
+// ********* Updating versionCode in build.gradle ****************
+const buildGradleContent = fs.readFileSync(buildGradlePath, 'utf-8');
+let versionCodeRegex = /versionCode\s+(\d+)/;
+let versionNameRegex = /versionName\s+"(.+)"/;
+let versionCodeMatch = buildGradleContent.match(versionCodeRegex);
+let versionNameMatch = buildGradleContent.match(versionNameRegex);
+
+let newVersionCode = '';
+if (versionCodeMatch && versionNameMatch) {
+ let oldVersionCode = versionCodeMatch[1];
+ newVersionCode = (Number(oldVersionCode) + 1).toString();
+ let newBuildGradleContent = buildGradleContent.replace(versionCodeRegex, `versionCode ${newVersionCode}`);
+ newBuildGradleContent = newBuildGradleContent.replace(versionNameRegex, `versionName "${newVersion}"`);
+
+ fs.writeFileSync(buildGradlePath, newBuildGradleContent, 'utf-8');
+
+ console.log('Updated versionCode:', newVersionCode);
+ console.log('Updated versionName:', newVersion);
+} else {
+ console.log('versionCode/versionName not found in build.gradle.');
+ return;
+}
+
+// ********* Updating version in info.plist ****************
+const infoPlistPath = `./targets/${target}/ios/Allspark/Info.plist`;
+
+const infoPlistContent = fs.readFileSync(infoPlistPath, 'utf-8');
+
+const updateInfoPlistVersion = (lines, searchName, newVersion) => {
+ let updateNextString = false;
+ const newLines = lines.map((line) => {
+ if (line.includes(`<key>${searchName}</key>`)) {
+ updateNextString = true;
+ return line;
+ }
+ if(updateNextString === true && !line.includes('<!--') && line.includes('<string>')) {
+ updateNextString = false;
+ const startIndex = line.indexOf('<string>') + '<string>'.length;
+ const endIndex = line.indexOf('</string>');
+ const oldVersion = line.substring(startIndex, endIndex);
+ const newLine = line.replace(oldVersion, newVersion);
+ return newLine;
+ }
+ return line;
+ });
+ return newLines;
+
+}
+
+
+const lines = infoPlistContent.split('\n');
+let newLines = updateInfoPlistVersion(lines, 'CFBundleShortVersionString', newVersion);
+newLines = updateInfoPlistVersion(newLines, 'CFBundleVersion', newVersionCode);
+
+const newInfoPlistContent = newLines.join('\n');
+fs.writeFileSync(infoPlistPath, newInfoPlistContent, 'utf-8');
+console.log("Updated version in Info.plist", newVersion);
+
+console.log('Updated version:', newVersion);
+
+
--- 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 938
- versionName "1.26.0"
+ versionCode 939
+ versionName "1.27.0"
}
signingConfigs {
debug {
--- targets/US/ios/AllSpark/Info.plist
@@ -19,12 +19,12 @@
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<!-- @customization - default: <string>$(MARKETING_VERSION)</string> -->
- <string>1.26.0</string>
+ <string>1.27.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<!-- @customization - default: <string>$(CURRENT_PROJECT_VERSION)</string> -->
- <string>934</string>
+ <string>939</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
--- targets/US/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/me-at-walmart-us",
- "version": "1.26.0",
+ "version": "1.27.0",
"private": true,
"scripts": {
"android": "react-native run-android",
@@ -355,4 +355,4 @@
]
}
}
-}
+}
\ No newline at end of file
| chore:bumping version to 1.27.0 | chore:bumping version to 1.27.0
|
788f907965592310559a9151a71feb98c8bd75b0 | --- targets/US/package.json
@@ -106,7 +106,7 @@
"@walmart/financial-wellbeing-feature-app": "1.23.2",
"@walmart/functional-components": "6.3.4",
"@walmart/gta-react-native-calendars": "0.7.0",
- "@walmart/gtp-shared-components": "2.2.1",
+ "@walmart/gtp-shared-components": "2.2.3-rc.0",
"@walmart/ims-print-services-ui": "2.11.1",
"@walmart/inbox-mini-app": "0.93.28",
"@walmart/iteminfo-mini-app": "7.12.1",
--- yarn.lock
@@ -3435,6 +3435,13 @@ __metadata:
languageName: node
linkType: hard
+"@livingdesign/tokens@npm:0.74.0":
+ version: 0.74.0
+ resolution: "@livingdesign/tokens@npm:0.74.0"
+ checksum: 10c0/9c0b0cb534295d2010ded76d1f66173cf5abe2c84f3f6da25cfbac32bd4cfe363d359d5fe51136be613a395e642861d278cf69a8ff84384d9fddd478e968117c
+ languageName: node
+ linkType: hard
+
"@microsoft/recognizers-text-data-types-timex-expression@npm:1.3.0":
version: 1.3.0
resolution: "@microsoft/recognizers-text-data-types-timex-expression@npm:1.3.0"
@@ -6216,12 +6223,12 @@ __metadata:
languageName: node
linkType: hard
-"@walmart/gtp-shared-components@npm:2.2.1":
- version: 2.2.1
- resolution: "@walmart/gtp-shared-components@npm:2.2.1"
+"@walmart/gtp-shared-components@npm:2.2.3-rc.0":
+ version: 2.2.3-rc.0
+ resolution: "@walmart/gtp-shared-components@npm:2.2.3-rc.0"
dependencies:
- "@livingdesign/tokens": "npm:0.63.0"
- "@walmart/gtp-shared-icons": "npm:^1.0.8"
+ "@livingdesign/tokens": "npm:0.74.0"
+ "@walmart/gtp-shared-icons": "npm:^1.0.9"
lodash: "npm:^4.17.15"
moment: "npm:^2.29.4"
react-keyed-flatten-children: "npm:^1.3.0"
@@ -6236,13 +6243,13 @@ __metadata:
bin:
installFonts: scripts/installFonts
runCodemods: scripts/runCodemods
- checksum: 10c0/07e52b291be867f64b38b70f11cedb845a0ac1f8b604064b9860bba369d900f60cf83eb2565db8cdfea96fd10de54fcb0ac3cef6123998cda5a4d580db8627db
+ checksum: 10c0/7997dbbf80ac261c5ab4c908cd35c1a5c552752e9dca50eaed98c8de62e691e8053f3961e312e1378aa4266049f71e3d892908b30ecd17c88f129f9739ce7ca8
languageName: node
linkType: hard
-"@walmart/gtp-shared-icons@npm:^1.0.8":
- version: 1.0.8
- resolution: "@walmart/gtp-shared-icons@npm:1.0.8"
+"@walmart/gtp-shared-icons@npm:^1.0.9":
+ version: 1.0.9
+ resolution: "@walmart/gtp-shared-icons@npm:1.0.9"
dependencies:
"@livingdesign/tokens": "npm:0.63.0"
lodash: "npm:^4.17.15"
@@ -6250,7 +6257,7 @@ __metadata:
peerDependencies:
react: "*"
react-native: "*"
- checksum: 10c0/a1a318850023628fb6642a103341902da672dbf3d2358ae89dde378d5a22d5c653e8332274124db44fef9a9dd732b2a003a2968bb50834cdb671042cd1019d8d
+ checksum: 10c0/0e6417aaa86eb105b26f4cf9b194bfc2837587417f8b0f312e27f75bdf18a6ecc104b79869d7f64a7c18c893b728992883cb82c4f08105e0b6251f0d2c970676
languageName: node
linkType: hard
@@ -6809,7 +6816,7 @@ __metadata:
"@walmart/financial-wellbeing-feature-app": "npm:1.23.2"
"@walmart/functional-components": "npm:6.3.4"
"@walmart/gta-react-native-calendars": "npm:0.7.0"
- "@walmart/gtp-shared-components": "npm:2.2.1"
+ "@walmart/gtp-shared-components": "npm:2.2.3-rc.0"
"@walmart/ims-print-services-ui": "npm:2.11.1"
"@walmart/inbox-mini-app": "npm:0.93.28"
"@walmart/iteminfo-mini-app": "npm:7.12.1"
| feat: bump gtp components for drop 23 | feat: bump gtp components for drop 23
|
92f6a49caabe39f066543fa88996a1fdd09ef3be | --- packages/allspark-authentication/src/Authentication.ts
@@ -321,6 +321,7 @@ export class AllsparkAuthentication {
public signOut = async () => {
try {
const authResult = await this._cachedResult.get();
+ await this._cachedResult.remove();
if (!authResult) {
throw NO_CACHE_ERROR;
}
@@ -329,6 +330,7 @@ export class AllsparkAuthentication {
if (refreshToken) {
const config = await this._cachedConfig.get();
+ this._cachedConfig.remove();
if (!config) {
throw NO_CACHE_ERROR;
}
@@ -341,9 +343,6 @@ export class AllsparkAuthentication {
} catch (e) {
this._runErrorEvent('SIGN_OUT_ERROR', e as AppAuthError);
throw e;
- } finally {
- await this._cachedResult.remove();
- this._cachedConfig.remove();
}
};
}
| fix: clear auth localstorage immediately on signout | fix: clear auth localstorage immediately on signout
|
1d602bf2ce956437f34787690cf26adeae429c4a | --- android/app/src/main/AndroidManifest.xml
@@ -62,20 +62,6 @@
tools:overrideLibrary="com.walmart.stores.google.stt.GoogleSTTRecognitionService"
/>
- <!-- Attempting fix for runtime crash: Didn't find class "androidx.work.impl.WorkManagerInitializer -->
- <!-- <provider
- android:name="androidx.startup.InitializationProvider"
- android:authorities="com.walmart.stores.allspark.beta.androidx-startup"
- android:exported="false"
- tools:node="merge">
- <!-- If you are using androidx.startup to initialize other components -->
- <meta-data
- android:name="androidx.work.WorkManagerInitializer"
- android:value="androidx.startup"
- tools:node="remove"
- />
- </provider> -->
-
<activity
android:name="com.walmart.stores.allspark.beta.MainActivity"
android:theme="@style/SplashTheme"
| android fix | android fix
|
2b4b8b16ce05fe90db53c76da92d983085294ba1 | --- core/__tests__/PinAccess/IndexTest.ts
@@ -0,0 +1,27 @@
+import {PinScreenFeature} from '../../src/PinAccess';
+
+describe('PinScreenFeature', () => {
+ it('render scrren correctly', () => {
+ expect(
+ PinScreenFeature._screens['Core.PinAccessScreen'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ PinScreenFeature._screens['Core.CreatePINScreen'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ PinScreenFeature._screens['Core.PinAccessModal'].getComponent(),
+ ).toBeInstanceOf(Function);
+ expect(
+ PinScreenFeature._screens['Core.PinAccessScreen'].options
+ .headerShown,
+ ).toBe(false);
+ expect(
+ PinScreenFeature._screens['Core.CreatePINScreen'].options
+ .headerShown,
+ ).toBe(true);
+ expect(
+ PinScreenFeature._screens['Core.PinAccessModal'].options
+ .headerShown,
+ ).toBe(false);
+ });
+});
| added test for pinaccess file | added test for pinaccess file
|
38ac5868998db7e5fb2ec7ea788815fd440ff44f | --- package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@walmart/roster-mini-app",
- "version": "1.0.9",
+ "version": "1.0.10",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@walmart/roster-mini-app",
- "version": "1.0.9",
+ "version": "1.0.10",
"hasInstallScript": true,
"devDependencies": {
"@babel/core": "^7.20.0",
@@ -56,7 +56,7 @@
"@walmart/allspark-graphql-client": "^1.4.6",
"@walmart/config-components": "4.2.7",
"@walmart/core-services": "~2.2.1",
- "@walmart/core-services-allspark": "~2.13.7",
+ "@walmart/core-services-allspark": "~2.13.8",
"@walmart/core-utils": "~2.0.5",
"@walmart/functional-components": "~4.0.3",
"@walmart/gtp-shared-components": "2.1.3",
@@ -67,7 +67,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "1.0.8",
+ "@walmart/wmconnect-mini-app": "1.0.9",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
@@ -11596,9 +11596,9 @@
}
},
"node_modules/@walmart/core-services-allspark": {
- "version": "2.13.7",
- "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.13.7.tgz",
- "integrity": "sha512-+XuvMbP6mavOxgSm0gXtZ19uGcVJf8XXGzce/W6aEAs7S7JHlI6ziszU2aHv5NMOUQmeD1lvF1E66NPJzlELdw==",
+ "version": "2.13.8",
+ "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.13.8.tgz",
+ "integrity": "sha512-e1CUA1wCE9W0GdPKw3ayS4ShDl1qgnBKOHiAJjqGNlKjYbDP7h/0tVyljAUiZHfT0YwkHHIB8JoGtKh8yrWp5Q==",
"dev": true,
"license": "ISC",
"dependencies": {
@@ -11853,9 +11853,9 @@
}
},
"node_modules/@walmart/wmconnect-mini-app": {
- "version": "1.0.8",
- "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.8.tgz",
- "integrity": "sha512-HfwvyYHCTm2uJD7j1XF9Tn7ycEKqkxvoe0dBMW5zhX9/LWGYuiPw3O/BYgwXLDnUoASHtsN51hZi5bBQT8ldZw==",
+ "version": "1.0.9",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.9.tgz",
+ "integrity": "sha512-27TkCT13MjQATRNtkjH3WYFOWm9nJTtwcTqNpQxEIxmtxZDmtwDzP67D/nqcvuaQZi2LOFFe7JvwhV5YXiV7ng==",
"dev": true,
"hasInstallScript": true
},
@@ -40934,9 +40934,9 @@
}
},
"@walmart/core-services-allspark": {
- "version": "2.13.7",
- "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.13.7.tgz",
- "integrity": "sha512-+XuvMbP6mavOxgSm0gXtZ19uGcVJf8XXGzce/W6aEAs7S7JHlI6ziszU2aHv5NMOUQmeD1lvF1E66NPJzlELdw==",
+ "version": "2.13.8",
+ "resolved": "https://npme.walmart.com/@walmart/core-services-allspark/-/core-services-allspark-2.13.8.tgz",
+ "integrity": "sha512-e1CUA1wCE9W0GdPKw3ayS4ShDl1qgnBKOHiAJjqGNlKjYbDP7h/0tVyljAUiZHfT0YwkHHIB8JoGtKh8yrWp5Q==",
"dev": true,
"requires": {
"@walmart/allspark-graphql-client": "^1.4.6",
@@ -41071,9 +41071,9 @@
}
},
"@walmart/wmconnect-mini-app": {
- "version": "1.0.8",
- "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.8.tgz",
- "integrity": "sha512-HfwvyYHCTm2uJD7j1XF9Tn7ycEKqkxvoe0dBMW5zhX9/LWGYuiPw3O/BYgwXLDnUoASHtsN51hZi5bBQT8ldZw==",
+ "version": "1.0.9",
+ "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.9.tgz",
+ "integrity": "sha512-27TkCT13MjQATRNtkjH3WYFOWm9nJTtwcTqNpQxEIxmtxZDmtwDzP67D/nqcvuaQZi2LOFFe7JvwhV5YXiV7ng==",
"dev": true
},
"@whatwg-node/events": {
--- package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/roster-mini-app",
- "version": "1.0.9",
+ "version": "1.0.10",
"private": false,
"main": "dist/index.js",
"files": [
@@ -79,7 +79,7 @@
"@walmart/allspark-graphql-client": "^1.4.6",
"@walmart/config-components": "4.2.7",
"@walmart/core-services": "~2.2.1",
- "@walmart/core-services-allspark": "~2.13.7",
+ "@walmart/core-services-allspark": "~2.13.8",
"@walmart/core-utils": "~2.0.5",
"@walmart/functional-components": "~4.0.3",
"@walmart/gtp-shared-components": "2.1.3",
@@ -90,7 +90,7 @@
"@walmart/react-native-shared-navigation": "1.0.2",
"@walmart/react-native-sumo-sdk": "2.6.0",
"@walmart/ui-components": "1.15.1",
- "@walmart/wmconnect-mini-app": "1.0.8",
+ "@walmart/wmconnect-mini-app": "1.0.9",
"babel-jest": "^29.2.1",
"chance": "^1.1.11",
"eslint": "8.22.0",
| Update version | Update version
|
a40636a78c08db1ac4b5f08336caf76770423d5a | --- __tests__/components/widgets/RosterWidget.test.tsx
@@ -68,6 +68,48 @@ jest.mock('../../../src/services', () => ({
analytics: jest.fn(),
}));
+// Mock GTP Shared Components
+jest.mock('@walmart/gtp-shared-components', () => ({
+ Body: ({ children, testID, ...props }: any) => {
+ const MockText = require('react-native').Text;
+ return (
+ <MockText testID={testID || 'body-mock'} {...props}>
+ {children}
+ </MockText>
+ );
+ },
+ Heading: ({ children, testID, ...props }: any) => {
+ const MockText = require('react-native').Text;
+ return (
+ <MockText testID={testID || 'heading-mock'} {...props}>
+ {children}
+ </MockText>
+ );
+ },
+ Caption: ({ children, testID, ...props }: any) => {
+ const MockText = require('react-native').Text;
+ return (
+ <MockText testID={testID || 'caption-mock'} {...props}>
+ {children}
+ </MockText>
+ );
+ },
+ colors: {
+ blue: {
+ 100: '#e3f2fd',
+ },
+ primary: {
+ 100: '#0048d2',
+ },
+ gray: {
+ 20: 'gray',
+ },
+ green: {
+ 60: 'green',
+ },
+ },
+}));
+
// Mock hooks
jest.mock('../../../src/hooks/useWidgetRefresh', () => ({
useWidgetRefresh: jest.fn(() => ({
@@ -276,8 +318,8 @@ describe.skip('RosterWidget', () => {
'RosterWidget data fetched',
{
widgetId: 'roster-widget',
- memberCount: 4,
- scheduledCount: 3, // 3 online members
+ memberCount: 6,
+ scheduledCount: 4, // 4 online members
teamId: 'test-team-123',
message: 'Roster data fetched successfully',
}
@@ -345,8 +387,8 @@ describe.skip('RosterWidget', () => {
'RosterWidget data fetched',
{
widgetId: 'roster-widget',
- memberCount: 4,
- scheduledCount: 3, // 3 online members from mock data
+ memberCount: 6,
+ scheduledCount: 4, // 4 online members from mock data
teamId: 'test-team-123',
message: 'Roster data fetched successfully',
}
| feat(ui): handling error scenarios #SMDV-8152 | feat(ui): handling error scenarios #SMDV-8152
|
ea284cbab668ebbc0c23a340ca8ea96543b82610 | --- packages/allspark-foundation-hub/package.json
@@ -1,6 +1,6 @@
{
"name": "@walmart/allspark-foundation-hub",
- "version": "1.2.17",
+ "version": "1.2.18",
"description": "",
"main": "lib/index.js",
"types": "lib/index.d.ts",
| Update hub | Update hub
|
1f708c80cb8f2f0bb5848bc5a8f3ab1405f13bc3 | --- package.json
@@ -90,7 +90,7 @@
"@walmart/inbox-mini-app": "0.40.0",
"@walmart/iteminfo-mini-app": "4.2.6",
"@walmart/manager-approvals-miniapp": "0.0.62",
- "@walmart/me-field-mini-app": "1.1.11",
+ "@walmart/me-field-mini-app": "1.1.12",
"@walmart/metrics-mini-app": "0.8.1",
"@walmart/moment-walmart": "1.0.4",
"@walmart/payrollsolution_miniapp": "^0.123.2",
| feat: :sparkles: Bump Me@Learning mini app version | feat: :sparkles: Bump Me@Learning mini app version
|
5fb8d229a0137fba3d192496fc428332c96ed07f | --- package-lock.json
@@ -37,7 +37,7 @@
"@terrylinla/react-native-sketch-canvas": "0.8.0",
"@walmart/allspark-graphql-client": "^1.4.5",
"@walmart/allspark-neon-core": "0.1.31",
- "@walmart/amp-mini-app": "1.1.48",
+ "@walmart/amp-mini-app": "1.1.52",
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.13.4",
"@walmart/attendance-mini-app": "0.190.6",
@@ -7895,9 +7895,9 @@
}
},
"node_modules/@walmart/amp-mini-app": {
- "version": "1.1.48",
- "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.48.tgz",
- "integrity": "sha512-wqMIYsV87EZsMfTE/wbuiB/Xa3t5uQgZNYvBVqPnuZFGRAmg9j3mwVg/LnCpwNmLIaHtE798x43ZIV8h9gjXYQ==",
+ "version": "1.1.52",
+ "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.52.tgz",
+ "integrity": "sha512-Vc88NXoj7I7RrtI7kow4kDH8VKlyTLvPP0/hG0pPEwXpebX94Aavyo+TT1KK18c0WPiL3qmaayghv4UpbjZvkQ==",
"hasInstallScript": true,
"peerDependencies": {
"@react-navigation/native": "^6.0.0",
@@ -33446,9 +33446,9 @@
}
},
"@walmart/amp-mini-app": {
- "version": "1.1.48",
- "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.48.tgz",
- "integrity": "sha512-wqMIYsV87EZsMfTE/wbuiB/Xa3t5uQgZNYvBVqPnuZFGRAmg9j3mwVg/LnCpwNmLIaHtE798x43ZIV8h9gjXYQ=="
+ "version": "1.1.52",
+ "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.52.tgz",
+ "integrity": "sha512-Vc88NXoj7I7RrtI7kow4kDH8VKlyTLvPP0/hG0pPEwXpebX94Aavyo+TT1KK18c0WPiL3qmaayghv4UpbjZvkQ=="
},
"@walmart/ask-sam-chat-components": {
"version": "0.2.13",
--- package.json
@@ -78,7 +78,7 @@
"@terrylinla/react-native-sketch-canvas": "0.8.0",
"@walmart/allspark-graphql-client": "^1.4.5",
"@walmart/allspark-neon-core": "0.1.31",
- "@walmart/amp-mini-app": "1.1.48",
+ "@walmart/amp-mini-app": "1.1.52",
"@walmart/ask-sam-chat-components": "^0.2.7",
"@walmart/ask-sam-mini-app": "1.13.4",
"@walmart/attendance-mini-app": "0.190.6",
| AMP version bump | AMP version bump
|
482b9858975ed7592a79c6e94e01b24959cfb98a | --- android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
<resources>
- <string name="app_name">Me@Walmart Beta</string>
+ <string name="app_name">Me@Walmart</string>
</resources>
--- ios/AllSpark.xcodeproj/project.pbxproj
@@ -47,7 +47,7 @@
00E356EE1AD99517003FC87E /* AllSparkTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AllSparkTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* AllSparkTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AllSparkTests.m; sourceTree = "<group>"; };
- 13B07F961A680F5B00A75B9A /* Me@Walmart Beta.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Me@Walmart Beta.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 13B07F961A680F5B00A75B9A /* Me@Walmart.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Me@Walmart.app"; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = AllSpark/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = AllSpark/AppDelegate.m; sourceTree = "<group>"; };
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = AllSpark/Images.xcassets; sourceTree = "<group>"; };
@@ -175,7 +175,7 @@
83CBBA001A601CBA00E9B192 /* Products */ = {
isa = PBXGroup;
children = (
- 13B07F961A680F5B00A75B9A /* Me@Walmart Beta.app */,
+ 13B07F961A680F5B00A75B9A /* Me@Walmart.app */,
00E356EE1AD99517003FC87E /* AllSparkTests.xctest */,
);
name = Products;
@@ -259,7 +259,7 @@
);
name = AllSpark;
productName = AllSpark;
- productReference = 13B07F961A680F5B00A75B9A /* Me@Walmart Beta.app */;
+ productReference = 13B07F961A680F5B00A75B9A /* Me@Walmart.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@@ -751,7 +751,7 @@
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta;
- PRODUCT_NAME = "Me@Walmart Beta";
+ PRODUCT_NAME = "Me@Walmart";
PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) Dev";
SWIFT_OBJC_BRIDGING_HEADER = "AllSpark-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -786,7 +786,7 @@
"-lc++",
);
PRODUCT_BUNDLE_IDENTIFIER = com.walmart.stores.allspark.beta;
- PRODUCT_NAME = "Me@Walmart Beta";
+ PRODUCT_NAME = "Me@Walmart";
PROVISIONING_PROFILE_SPECIFIER = "Allspark (MeAtWM Beta) InHouse Profile";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
--- ios/AllSpark.xcodeproj/xcshareddata/xcschemes/AllSpark.xcscheme
@@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
- BuildableName = "Me@Walmart Beta.app"
+ BuildableName = "Me@Walmart.app"
BlueprintName = "AllSpark"
ReferencedContainer = "container:AllSpark.xcodeproj">
</BuildableReference>
@@ -55,7 +55,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
- BuildableName = "Me@Walmart Beta.app"
+ BuildableName = "Me@Walmart.app"
BlueprintName = "AllSpark"
ReferencedContainer = "container:AllSpark.xcodeproj">
</BuildableReference>
@@ -78,7 +78,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
- BuildableName = "Me@Walmart Beta.app"
+ BuildableName = "Me@Walmart.app"
BlueprintName = "AllSpark"
ReferencedContainer = "container:AllSpark.xcodeproj">
</BuildableReference>
| Change product name from Me@Walmart Beta to Me@Walmart (#93) | Change product name from Me@Walmart Beta to Me@Walmart (#93)
Co-authored-by: Hitesh Arora <> |
56a7104b7526d4bed0cf6589c34f5b3a20738954 | --- __tests__/managerExperience/screens/AllTeamsScreen.test.tsx
@@ -82,14 +82,14 @@ describe('AllTeamsScreen', () => {
it('should render the correct number of clocked in associates', () => {
const {getByLabelText} = renderWithProviders(<AllTeamsScreen />);
- const totalClockedInAssociates =
- mockGetTeamsByStoreQuery.result.data.getTeamsByStore.reduce(
- (acc, currentTeam) => {
- acc += currentTeam?.mewClockedInCount ?? 0;
- return acc;
- },
- 0,
- );
+ // const totalClockedInAssociates =
+ // mockGetTeamsByStoreQuery.result.data.getTeamsByStore.reduce(
+ // (acc, currentTeam) => {
+ // acc += currentTeam?.mewClockedInCount ?? 0;
+ // return acc;
+ // },
+ // 0,
+ // );
const totalClockedInAccessibilityLabel = getByLabelText(`Total store`);
expect(totalClockedInAccessibilityLabel).toBeDefined();
});
| Update roster mini app | Update roster mini app
|
a61f8bd6c6869aae761e1f04af06d2351770d72c | --- packages/allspark-foundation/src/Components/ComponentContainers.tsx
@@ -334,6 +334,11 @@ class ComponentContainerManager<ParamList extends Record<string, any>> {
containerId: string,
config?: ComponentContainerConfig
) => {
+ const existing = this._containers[containerId];
+ if (existing) {
+ return existing;
+ }
+
const container = new ComponentContainer<T>(containerId, config);
// @ts-ignore
--- packages/allspark-foundation/src/Components/DynamicComponents.tsx
@@ -327,6 +327,11 @@ class DynamicComponentManager<
componentId: string,
Component: FC<ComponentRecord<any>>
) => {
+ const existing = this._components[componentId];
+ if (existing) {
+ return existing;
+ }
+
const component = new DynamicComponent<T, K>(Component);
// @ts-ignore
this.register(componentId, component);
| fix: dynamic components and containers did not return existing instance on duplicate create | fix: dynamic components and containers did not return existing instance on duplicate create
|
d8cf9e9ab8dad355760e83075bc8bcd7cde1f234 | --- src/components/Roster/AssociateListItem.tsx
@@ -92,7 +92,7 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = (props) => {
<Button
variant={'secondary'}
UNSAFE_style={styles.actionButtonSpacing}
- onPress={actionButton.action}
+ onPress={() => actionButton.action(associate)}
size={'small'}
disabled={!userIsInRoster}
testID={`actionButton-${actionButton.i18nLabel}`}>
--- src/components/Roster/types.ts
@@ -2,7 +2,7 @@ import {Associate, Team} from '../../types';
export interface RosterActionButton {
i18nLabel: string;
- action: (event: any) => void;
+ action: (event: any) => void; //TODO: Refactor this type, associateList item passes the associate obj. Teams might do something different
}
export interface RosterData {
--- src/screens/SearchScreen.tsx
@@ -163,6 +163,7 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => {
const name = associateDisplayName(associate);
const associateName = namecase(name.slice(0, 20));
dispatch(rosterSlice.actions.SET_SEARCH_TEXT(''));
+ console.log('Storing the associate name for ' + associateName);
storeAssociateName(associateName);
},
};
@@ -177,6 +178,11 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => {
);
};
+ useEffect(() => {
+ console.log('The Recent Search History Data');
+ console.log(recentSearchHistory);
+ }, [recentSearchHistory]);
+
//TODO: Unable to re-use the roster component on this screen so duplicating flashList. Investigate this render bug and fix
return (
<View style={styles.searchScreenContainer}>
| updating associate | updating associate
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.