commit_hash
stringlengths
40
40
input
stringlengths
13
7.99k
output
stringlengths
5
155
full_message
stringlengths
6
8.96k
c2141b12f626d49fe1b96c6cd6aaa7e564ff1115
--- CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.0.15-alpha.0](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.14...v6.0.15-alpha.0) (2024-04-16) + +### Bug Fixes + +- network state was being overridden on update rather than extended ([8aff23f](https://gecgithub01.walmart.com/allspark/allspark/commit/8aff23f18c4c403f62e50f63a12b83e7ec053e86)) + ## [6.0.14](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.13...v6.0.14) (2024-04-15) ### Bug Fixes --- lerna.json @@ -1,5 +1,5 @@ { - "version": "6.0.14", + "version": "6.0.15-alpha.0", "npmClient": "npm", "changelogPreset": "angular", "command": { --- package-lock.json @@ -32894,10 +32894,10 @@ }, "packages/allspark-authentication": { "name": "@walmart/allspark-authentication", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "license": "ISC", "dependencies": { - "@walmart/allspark-utils": "^6.0.14", + "@walmart/allspark-utils": "^6.0.15-alpha.0", "lodash": "~4.17.21", "ts-retry-promise": "~0.7.1" }, @@ -32917,7 +32917,7 @@ }, "packages/allspark-foundation": { "name": "@walmart/allspark-foundation", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "dependencies": { "@apollo/client": "^3.8.6", "@graphql-codegen/cli": "^5.0.0", @@ -32927,7 +32927,7 @@ "@graphql-codegen/typescript-react-apollo": "^4.1.0", "@reduxjs/toolkit": "^1.9.7", "@types/node-fetch": "^2.6.9", - "@walmart/allspark-utils": "^6.0.14", + "@walmart/allspark-utils": "^6.0.15-alpha.0", "axios": "~1.6.0", "axios-cache-interceptor": "^1.3.2", "crypto-js": "~4.2.0", @@ -34395,7 +34395,7 @@ }, "packages/allspark-utils": { "name": "@walmart/allspark-utils", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "license": "ISC", "dependencies": { "crypto-js": "~4.2.0", @@ -34801,10 +34801,10 @@ }, "packages/me-at-walmart-container": { "name": "@walmart/me-at-walmart-container", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "license": "ISC", "dependencies": { - "@walmart/allspark-utils": "^6.0.14", + "@walmart/allspark-utils": "^6.0.15-alpha.0", "jwt-decode": "^3.1.2", "nanoid": "4.0.2", "redux-flipper": "^2.0.2", @@ -34817,8 +34817,8 @@ "@react-native-firebase/database": "~17.4.2", "@react-native-firebase/perf": "~17.4.2", "@types/seamless-immutable": "7.1.16", - "@walmart/allspark-authentication": "^6.0.14", - "@walmart/allspark-foundation": "^6.0.14", + "@walmart/allspark-authentication": "^6.0.15-alpha.0", + "@walmart/allspark-foundation": "^6.0.15-alpha.0", "@walmart/config-components": "4.2.13", "@walmart/me-at-walmart-common": "^6.0.14", "@walmart/react-native-encrypted-storage": "~1.1.13", --- packages/allspark-authentication/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.0.15-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.0.14...v6.0.15-alpha.0) (2024-04-16) + +**Note:** Version bump only for package @walmart/allspark-authentication + ## [6.0.14](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.0.13...v6.0.14) (2024-04-15) **Note:** Version bump only for package @walmart/allspark-authentication --- packages/allspark-authentication/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-authentication", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -22,7 +22,7 @@ "author": "", "license": "ISC", "dependencies": { - "@walmart/allspark-utils": "^6.0.14", + "@walmart/allspark-utils": "^6.0.15-alpha.0", "lodash": "~4.17.21", "ts-retry-promise": "~0.7.1" }, --- packages/allspark-foundation/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.0.15-alpha.0](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.14...v6.0.15-alpha.0) (2024-04-16) + +### Bug Fixes + +- network state was being overridden on update rather than extended ([8aff23f](https://gecgithub01.walmart.com/allspark/allspark/commit/8aff23f18c4c403f62e50f63a12b83e7ec053e86)) + ## [6.0.14](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.13...v6.0.14) (2024-04-15) **Note:** Version bump only for package @walmart/allspark-foundation --- packages/allspark-foundation/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "description": "", "main": "Core/index.js", "types": "Core/index.d.ts", @@ -69,7 +69,7 @@ "@graphql-codegen/typescript-react-apollo": "^4.1.0", "@reduxjs/toolkit": "^1.9.7", "@types/node-fetch": "^2.6.9", - "@walmart/allspark-utils": "^6.0.14", + "@walmart/allspark-utils": "^6.0.15-alpha.0", "axios": "~1.6.0", "axios-cache-interceptor": "^1.3.2", "crypto-js": "~4.2.0", --- packages/allspark-utils/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.0.15-alpha.0](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.14...v6.0.15-alpha.0) (2024-04-16) + +**Note:** Version bump only for package @walmart/allspark-utils + ## [6.0.14](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.13...v6.0.14) (2024-04-15) **Note:** Version bump only for package @walmart/allspark-utils --- packages/allspark-utils/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-utils", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "description": "", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "", --- packages/me-at-walmart-container/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.0.15-alpha.0](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.14...v6.0.15-alpha.0) (2024-04-16) + +**Note:** Version bump only for package @walmart/me-at-walmart-container + ## [6.0.14](https://gecgithub01.walmart.com/allspark/allspark/compare/v6.0.13...v6.0.14) (2024-04-15) ### Bug Fixes --- packages/me-at-walmart-container/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-container", - "version": "6.0.14", + "version": "6.0.15-alpha.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -21,7 +21,7 @@ "author": "", "license": "ISC", "dependencies": { - "@walmart/allspark-utils": "^6.0.14", + "@walmart/allspark-utils": "^6.0.15-alpha.0", "jwt-decode": "^3.1.2", "nanoid": "4.0.2", "redux-flipper": "^2.0.2", @@ -34,8 +34,8 @@ "@react-native-firebase/database": "~17.4.2", "@react-native-firebase/perf": "~17.4.2", "@types/seamless-immutable": "7.1.16", - "@walmart/allspark-authentication": "^6.0.14", - "@walmart/allspark-foundation": "^6.0.14", + "@walmart/allspark-authentication": "^6.0.15-alpha.0", + "@walmart/allspark-foundation": "^6.0.15-alpha.0", "@walmart/config-components": "4.2.13", "@walmart/me-at-walmart-common": "^6.0.14", "@walmart/react-native-encrypted-storage": "~1.1.13",
chore(version): updating package version
chore(version): updating package version
75dddb494bac7cbaf7d3836b2e38c075260ba4ab
--- package-lock.json @@ -65,7 +65,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.124.0", + "@walmart/profile-feature-app": "0.126.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -134,7 +134,6 @@ "react-native-new-snap-carousel": "^3.9.3", "react-native-pager-view": "^6.0.1", "react-native-pdf": "^6.6.2", - "react-native-pell-rich-editor": "^1.8.8", "react-native-permissions": "3.6.1", "react-native-popup-menu": "^0.16.0", "react-native-ptt-module": "1.8.12", @@ -5694,9 +5693,9 @@ } }, "node_modules/@walmart/profile-feature-app": { - "version": "0.124.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.124.0.tgz", - "integrity": "sha512-yAG4ZvLiyQkt6lxnVVH+opFFc2hNhs0XkOM8JeDOTl4EeAvHGCAsYnup4ybuBdrAemXYhRRUygPmzMbsrTYtPQ==", + "version": "0.126.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.126.0.tgz", + "integrity": "sha512-WIhZWRcvsmF0PGkbMrXwJcHzwNEToEA/aGCkDs4lmNafAwj/VPIs6jJpKwMEn8LVI6Nlbsat+W4vcIoDW+JKSA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/bottom-tabs": "^6.0.0", @@ -17874,16 +17873,6 @@ "deprecated-react-native-prop-types": "^2.3.0" } }, - "node_modules/react-native-pell-rich-editor": { - "version": "1.8.8", - "resolved": "https://npme.walmart.com/react-native-pell-rich-editor/-/react-native-pell-rich-editor-1.8.8.tgz", - "integrity": "sha512-pPpj3rVEbmOcGbUMiutuQhpxp5HzOQlhVGhZ6B7aWlsliWWDtsi+lu3RXNV+g62PcQ07qDDtZwKOx1fSzff6HQ==", - "license": "MIT", - "peerDependencies": { - "react-native": ">=0.50.0", - "react-native-webview": ">=7.5.2" - } - }, "node_modules/react-native-permissions": { "version": "3.6.1", "license": "MIT", @@ -25334,9 +25323,9 @@ "integrity": "sha512-TIzjXjT8jlsb/OrY7WPr4xUv5RsCsnNN0wwjawIwOHurrZtrFn8f/WjwkY8e6zUC3AlZ4QsHdaKqCD/pfkgGPg==" }, "@walmart/profile-feature-app": { - "version": "0.124.0", - "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.124.0.tgz", - "integrity": "sha512-yAG4ZvLiyQkt6lxnVVH+opFFc2hNhs0XkOM8JeDOTl4EeAvHGCAsYnup4ybuBdrAemXYhRRUygPmzMbsrTYtPQ==" + "version": "0.126.0", + "resolved": "https://npme.walmart.com/@walmart/profile-feature-app/-/profile-feature-app-0.126.0.tgz", + "integrity": "sha512-WIhZWRcvsmF0PGkbMrXwJcHzwNEToEA/aGCkDs4lmNafAwj/VPIs6jJpKwMEn8LVI6Nlbsat+W4vcIoDW+JKSA==" }, "@walmart/push-to-talk-mini-app": { "version": "1.8.59", @@ -33053,11 +33042,6 @@ "deprecated-react-native-prop-types": "^2.3.0" } }, - "react-native-pell-rich-editor": { - "version": "1.8.8", - "resolved": "https://npme.walmart.com/react-native-pell-rich-editor/-/react-native-pell-rich-editor-1.8.8.tgz", - "integrity": "sha512-pPpj3rVEbmOcGbUMiutuQhpxp5HzOQlhVGhZ6B7aWlsliWWDtsi+lu3RXNV+g62PcQ07qDDtZwKOx1fSzff6HQ==" - }, "react-native-permissions": { "version": "3.6.1" }, --- package.json @@ -107,7 +107,7 @@ "@walmart/pay-stub-miniapp": "0.9.21", "@walmart/payrollsolution_miniapp": "0.130.23", "@walmart/price-changes-mini-app": "1.6.10", - "@walmart/profile-feature-app": "0.124.0", + "@walmart/profile-feature-app": "0.126.0", "@walmart/push-to-talk-mini-app": "1.8.59", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -176,7 +176,6 @@ "react-native-new-snap-carousel": "^3.9.3", "react-native-pager-view": "^6.0.1", "react-native-pdf": "^6.6.2", - "react-native-pell-rich-editor": "^1.8.8", "react-native-permissions": "3.6.1", "react-native-popup-menu": "^0.16.0", "react-native-ptt-module": "1.8.12", --- patches/react-native-pell-rich-editor+1.8.8.patch @@ -1,20 +0,0 @@ -diff --git a/node_modules/react-native-pell-rich-editor/src/RichEditor.js b/node_modules/react-native-pell-rich-editor/src/RichEditor.js -index 74de536..490cd29 100755 ---- a/node_modules/react-native-pell-rich-editor/src/RichEditor.js -+++ b/node_modules/react-native-pell-rich-editor/src/RichEditor.js -@@ -268,7 +268,6 @@ export default class RichTextEditor extends Component { - keyboardDisplayRequiresUserAction={false} - nestedScrollEnabled={!useContainer} - style={[styles.webview, style]} -- {...rest} - ref={that.setRef} - onMessage={that.onMessage} - originWhitelist={['*']} -@@ -278,6 +277,7 @@ export default class RichTextEditor extends Component { - javaScriptEnabled={true} - source={viewHTML} - onLoad={that.init} -+ {...rest} - /> - {Platform.OS === 'android' && <TextInput ref={ref => (that._input = ref)} style={styles._input} />} - </>
Bump profile-feature-app to 0.126.0
Bump profile-feature-app to 0.126.0
85007e7dd5a439bb1dcf00e79c78d9f0170f47cd
--- CHANGELOG.md @@ -3,6 +3,27 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.36.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.3...v6.36.0-alpha.0) (2025-09-03) + + +### Bug Fixes + +* ASE-637 MyWalmart Compensable Check State for associate-listenin… ([#4674](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4674)) ([7e6b114](https://gecgithub01.walmart.com/allspark/allspark-core/commit/7e6b11438a5f936b6dc320d18ad5293c2614d6d3)) +* **compass:** COM-5364 Update compass version with memory fixes ([#4673](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4673)) ([a6a9d48](https://gecgithub01.walmart.com/allspark/allspark-core/commit/a6a9d480cb2e8d53881c21165abaa4554ae61115)) +* **scanner:** VS-9841 Scanner features and bug fixes ([#4684](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4684)) ([f08cad5](https://gecgithub01.walmart.com/allspark/allspark-core/commit/f08cad5f938790837e10d04d1c2d447cc2b76ba4)) +* update version for drop 34 ([#4685](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4685)) ([5bd918c](https://gecgithub01.walmart.com/allspark/allspark-core/commit/5bd918c18a305fc62580fdcf6005a3367f150a24)) +* **version:** disable android foreground for push notification issues ([#4677](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4677)) ([2049f06](https://gecgithub01.walmart.com/allspark/allspark-core/commit/2049f06a8336a6a6d7f8fe96f5a67c5a9795db6e)) + + +### Features + +* **UI:** ADEDS-18651 AutoDetect Translator ([#4492](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4492)) ([966c3aa](https://gecgithub01.walmart.com/allspark/allspark-core/commit/966c3aa4169d6fcac9f2eb6eac7341fee628163d)) +* **welcomeme:** feature/preboarding otp new ([#4610](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4610)) ([3c5371e](https://gecgithub01.walmart.com/allspark/allspark-core/commit/3c5371e8e7ef00de7e025bd18d7adefcfb61102a)) + + + + + ## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) --- lerna.json @@ -1,5 +1,5 @@ { - "version": "6.35.1-alpha.3", + "version": "6.36.0-alpha.0", "npmClient": "yarn", "changelogPreset": "angular", "command": { --- packages/core-services-allspark/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.36.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.3...v6.36.0-alpha.0) (2025-09-03) + +**Note:** Version bump only for package @walmart/core-services-allspark + + + + + ## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) **Note:** Version bump only for package @walmart/core-services-allspark --- packages/core-services-allspark/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-services-allspark", - "version": "6.35.1-alpha.3", + "version": "6.36.0-alpha.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/core-widget-registry/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.36.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.3...v6.36.0-alpha.0) (2025-09-03) + +**Note:** Version bump only for package @walmart/core-widget-registry + + + + + ## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core-services/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) **Note:** Version bump only for package @walmart/core-widget-registry --- packages/core-widget-registry/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/core-widget-registry", - "version": "6.35.1-alpha.3", + "version": "6.36.0-alpha.0", "description": "Repo for Me@Walmart related widget registries", "author": "rlane1 <russell.lane@walmart.com>", "license": "ISC", --- packages/me-at-walmart-common/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.36.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.3...v6.36.0-alpha.0) (2025-09-03) + +**Note:** Version bump only for package @walmart/me-at-walmart-common + + + + + ## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) **Note:** Version bump only for package @walmart/me-at-walmart-common --- packages/me-at-walmart-common/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-common", - "version": "6.35.1-alpha.3", + "version": "6.36.0-alpha.0", "description": "Common utilities and components for Me@Walmat mini apps", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/me-at-walmart-container/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.36.0-alpha.0](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.3...v6.36.0-alpha.0) (2025-09-03) + + +### Features + +* **welcomeme:** feature/preboarding otp new ([#4610](https://gecgithub01.walmart.com/allspark/allspark-core/issues/4610)) ([3c5371e](https://gecgithub01.walmart.com/allspark/allspark-core/commit/3c5371e8e7ef00de7e025bd18d7adefcfb61102a)) + + + + + ## [6.35.1-alpha.3](https://gecgithub01.walmart.com/allspark/allspark-core/compare/v6.35.1-alpha.2...v6.35.1-alpha.3) (2025-09-02) **Note:** Version bump only for package @walmart/me-at-walmart-container --- packages/me-at-walmart-container/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-container", - "version": "6.35.1-alpha.3", + "version": "6.36.0-alpha.0", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts",
chore(version): updating package version
chore(version): updating package version
150f8b1de10701b15cfa73986c95c27df4491bc0
--- src/utils/messages.ts @@ -122,6 +122,12 @@ export const createMessageList = (config: { ); } + // For the first message time stamp + if (lastMoment && docs.length - 1 === index) { + const firstMessageDate = lastMoment.format('ddd, MMM D [at] h:mm A'); + messages.push(firstMessageDate); + } + // Update last message moment lastMoment = createdAt; }); --- src/utils/messages.ts @@ -122,6 +122,12 @@ export const createMessageList = (config: { ); } + // For the first message time stamp + if (lastMoment && docs.length - 1 === index) { + const firstMessageDate = lastMoment.format('ddd, MMM D [at] h:mm A'); + messages.push(firstMessageDate); + } + // Update last message moment lastMoment = createdAt; });
Added the changes for first message timestamp
Added the changes for first message timestamp
348a0e93d0b69bfd837e01da02d02a290b830263
--- __tests__/PinAccess/PinAccessScreenTest.tsx @@ -122,6 +122,18 @@ describe('PinAccess', () => { expect(setStoredPin).toHaveBeenCalledWith(pinCode); }); + it('renders as a Modal for PinScreenModal component', async () => { + defaultStateMock(); + + let component: ReactTestRenderer; + await act(async () => { + component = create( + <PinAccess {...baseProps} route={{name: 'PinAccessModal'}} />, + ); + expect(component.toJSON()).toMatchSnapshot(); + }); + }); + describe('Events', () => { defaultStateMock({dialogState: dialogConfig}); (EncryptedStorage.getItem as jest.Mock).mockResolvedValueOnce(pinCode); --- __tests__/PinAccess/__snapshots__/PinAccessScreenTest.tsx.snap @@ -89,3 +89,5 @@ exports[`PinAccess entry flow; no existing passcode 1`] = ` /> </View> `; + +exports[`PinAccess renders as a Modal for PinScreenModal component 1`] = `null`; --- src/PinAccess/PinAccess.tsx @@ -1,6 +1,6 @@ import React, {useState, FC, useEffect} from 'react'; import {useDispatch, useSelector} from 'react-redux'; -import {View} from 'react-native'; +import {View, Modal} from 'react-native'; import {StackScreenProps} from '@react-navigation/stack'; import {useTranslation} from 'react-i18next'; import EncryptedStorage from 'react-native-encrypted-storage'; @@ -18,7 +18,7 @@ import {useBackButton} from '../hooks/useBackButton'; import {logger} from '../services/Logger'; import {connectedSSO} from '../auth'; import {PinAccessActionCreators} from './PinAccessRedux'; -import {CHANGE, ENTRY, activityName, totalAttemps} from './constants'; +import {CHANGE, ENTRY, activityName, totalAttempts} from './constants'; import { getOriginalUserDisplayName, getPasscodeKey, @@ -43,9 +43,10 @@ type DialogContent = { export const PinAccess: FC<StackScreenProps<any>> = (props) => { const {navigation, route} = props; - const {params: {flow = ENTRY} = {}} = route; + const {params: {flow = ENTRY} = {}, name} = route; const isChangeFlow = flow === CHANGE; const showBackArrow = flow !== ENTRY; + const isModalScreen = name === 'PinAccessModal'; const dispatch = useDispatch(); const {top} = useSafeAreaInsets(); @@ -212,51 +213,63 @@ export const PinAccess: FC<StackScreenProps<any>> = (props) => { } }; - return ( + const PinModalContent = () => { + return ( + <> + <LockScreen + headerTitle={headerTitle} + passcodeLength={4} + title={translate('pinAccess.createPin')} + subtitle={translate('pinAccess.enter4Digit')} + confirmTitle={translate('pinAccess.confirmPin')} + confirmSubtitle={translate('pinAccess.reEnterPin')} + enterPinText={translate('pinAccess.enterPin')} + tryAgainText={translate('pinAccess.tryAgain')} + forgotPinText={translate('pinAccess.forgotPin')} + nextButtonText={translate('pinAccess.next')} + confirmButtonText={translate('pinAccess.confirm')} + signOutText={translate('pinAccess.signOut')} + user={`${translate('pinAccess.salutation')} ${displayName}`} + onRetry={onRetry} + onPasscodeMatch={onPasscodeMatch} + error={error} + errorMsg={errorMsg} + setErrorState={setError} + totalAttemps={totalAttempts} + forgotPinCallback={forgotPinCallback} + onBackArrowClick={goBack} + onSignOut={onSignOut} + flow={flow} + showBackArrow={showBackArrow} + storedPin={storedPin} + onPasscodeCreate={onPasscodeCreate} + handlePinCreateError={handlePinCreateError} + biometric={biometric} + onBiometric={promptBiometric} + /> + <Dialog + visible={showDialog} + onClose={handleBackdropClose} + dailogContainerStyle={styles.dialogContainer} + cardStyle={styles.cardStyle} + headerContainerStyle={styles.dialogHeader} + titleStyle={styles.dialogTitle} + buttonContainerStyle={styles.buttonContainer} + primaryButtonStyle={styles.primaryButton} + primaryButtonPress={primaryDialogButtonPress} + {...dialogContent} + /> + </> + ); + }; + + return isModalScreen ? ( + <Modal style={[styles.container, {paddingTop: top}]}> + <PinModalContent /> + </Modal> + ) : ( <View style={[styles.container, {paddingTop: top}]}> - <LockScreen - headerTitle={headerTitle} - passcodeLength={4} - title={translate('pinAccess.createPin')} - subtitle={translate('pinAccess.enter4Digit')} - confirmTitle={translate('pinAccess.confirmPin')} - confirmSubtitle={translate('pinAccess.reEnterPin')} - enterPinText={translate('pinAccess.enterPin')} - tryAgainText={translate('pinAccess.tryAgain')} - forgotPinText={translate('pinAccess.forgotPin')} - nextButtonText={translate('pinAccess.next')} - confirmButtonText={translate('pinAccess.confirm')} - signOutText={translate('pinAccess.signOut')} - user={`${translate('pinAccess.salutation')} ${displayName}`} - onRetry={onRetry} - onPasscodeMatch={onPasscodeMatch} - error={error} - errorMsg={errorMsg} - setErrorState={setError} - totalAttemps={totalAttemps} - forgotPinCallback={forgotPinCallback} - onBackArrowClick={goBack} - onSignOut={onSignOut} - flow={flow} - showBackArrow={showBackArrow} - storedPin={storedPin} - onPasscodeCreate={onPasscodeCreate} - handlePinCreateError={handlePinCreateError} - biometric={biometric} - onBiometric={promptBiometric} - /> - <Dialog - visible={showDialog} - onClose={handleBackdropClose} - dailogContainerStyle={styles.dialogContainer} - cardStyle={styles.cardStyle} - headerContainerStyle={styles.dialogHeader} - titleStyle={styles.dialogTitle} - buttonContainerStyle={styles.buttonContainer} - primaryButtonStyle={styles.primaryButton} - primaryButtonPress={primaryDialogButtonPress} - {...dialogContent} - /> + <PinModalContent /> </View> ); }; --- src/PinAccess/constants.ts @@ -1,5 +1,5 @@ export const activityName = 'MainActivity'; -export const totalAttemps = 3; +export const totalAttempts = 3; export const CREATE = 'CREATE'; export const ENTRY = 'ENTRY'; export const CHANGE = 'CHANGE';
Feature/handle pin overlap (#565)
Feature/handle pin overlap (#565) * lint fix * Removed lintskip check * typo fix Co-authored-by: Hitesh Arora - h0a006n <Hitesh.Arora@walmart.com>
7fcbe252f863dbfc5ec64e084d00efc79d5eba4b
--- .looper.yml @@ -7,15 +7,16 @@ tools: flavor: azul version: 17 +envs: + global: + variables: + ALLOW_NPM_PUSH_TO_AF: true + flows: default: - call: pr - yarn run build - - yarn publish - - sonar("Sonar"): - - (name Sonar Scanner) sonar-scanner -Dproject.settings=sonar-project.properties - - (name Publish Hygieia to Sonar) hygieia.publishSonar() - - (name Hygieia Publish Build) hygieia.publishBuild() + - npm publish pr: - (name Corepack enable) corepack enable
chore(ui): update looper yml
chore(ui): update looper yml
d423e01d721f85f0c38256ca49e324720e6c288a
--- __tests__/hooks/firestore.test.ts @@ -1,4 +1,8 @@ +/* eslint-disable */ +import {renderHook} from '@testing-library/react-hooks'; import {useEnvironment} from '@walmart/allspark-foundation/Environment'; +import {useFirestore, getFirestoreInstance} from '../../src/hooks/firestore'; +import {FIRESTORE_DB_NAME} from '../../src/common/constants'; // Define constants here to avoid circular dependencies const PROD_ENV = 'prod'; @@ -19,7 +23,7 @@ jest.mock('@react-native-firebase/firestore', () => { }); // Add Timestamp as a static property - mockFirestore.Timestamp = { + (mockFirestore as any).Timestamp = { fromDate: jest.fn().mockReturnValue('mock-timestamp'), now: jest.fn().mockReturnValue('mock-timestamp-now'), serverTimestamp: jest.fn().mockReturnValue('mock-server-timestamp') @@ -48,6 +52,9 @@ describe('Firestore Hook and Utility', () => { // Mock the useEnvironment hook to return prod environment (useEnvironment as jest.Mock).mockReturnValue({env: PROD_ENV}); + // Render the hook + const {result} = renderHook(() => useFirestore()); + // Verify the hook returns the default firestore instance expect(mockFirestore).toHaveBeenCalled(); expect(mockFirestore().app.firestore).not.toHaveBeenCalled(); @@ -57,23 +64,31 @@ describe('Firestore Hook and Utility', () => { // Mock the useEnvironment hook to return non-prod environment (useEnvironment as jest.Mock).mockReturnValue({env: 'dev'}); + // Render the hook + const {result} = renderHook(() => useFirestore()); + // Verify the hook returns the test firestore instance expect(mockFirestore).toHaveBeenCalled(); - expect(mockFirestore().app.firestore).toHaveBeenCalledWith('wmt-allspark-test-db'); + expect(mockFirestore().app.firestore).toHaveBeenCalledWith(FIRESTORE_DB_NAME); }); test('should handle undefined environment gracefully', () => { // Mock the useEnvironment hook to return undefined (useEnvironment as jest.Mock).mockReturnValue({env: undefined}); + // Render the hook + const {result} = renderHook(() => useFirestore()); + // Verify the hook returns the test firestore instance (default for non-prod) expect(mockFirestore).toHaveBeenCalled(); - expect(mockFirestore().app.firestore).toHaveBeenCalledWith('wmt-allspark-test-db'); + expect(mockFirestore().app.firestore).toHaveBeenCalledWith(FIRESTORE_DB_NAME); }); }); describe('getFirestoreInstance', () => { test('should return default firestore instance when environment is prod', () => { + // Call the utility function + const result = getFirestoreInstance(PROD_ENV); // Verify it returns the default firestore instance expect(mockFirestore).toHaveBeenCalled(); @@ -81,15 +96,21 @@ describe('Firestore Hook and Utility', () => { }); test('should return test firestore instance when environment is not prod', () => { + // Call the utility function + const result = getFirestoreInstance('dev'); + // Verify it returns the test firestore instance expect(mockFirestore).toHaveBeenCalled(); - expect(mockFirestore().app.firestore).toHaveBeenCalledWith('wmt-allspark-test-db'); + expect(mockFirestore().app.firestore).toHaveBeenCalledWith(FIRESTORE_DB_NAME); }); test('should handle undefined environment gracefully', () => { + // Call the utility function with undefined + const result = getFirestoreInstance(undefined); + // Verify it returns the test firestore instance (default for non-prod) expect(mockFirestore).toHaveBeenCalled(); - expect(mockFirestore().app.firestore).toHaveBeenCalledWith('wmt-allspark-test-db'); + expect(mockFirestore().app.firestore).toHaveBeenCalledWith(FIRESTORE_DB_NAME); }); }); });
test: update test failures
test: update test failures
60fcd73971ee090c28e30ad628d8dd52550e0690
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/wmconnect-mini-app", - "version": "3.7.0-alpha.1", + "version": "3.7.0-beta.1", "main": "dist/index.js", "files": [ "dist",
feat(ui): update lint fixes
feat(ui): update lint fixes
274aad1d86c6d72db6359727d619f51b11d3983b
--- src/managerExperience/components/RosterDetailPageHeader/RosterDetailPageHeader.tsx @@ -3,8 +3,8 @@ import {RosterDetailPageHeaderProps} from './types'; import {Text, View} from 'react-native'; import {Heading, Link} from '@walmart/gtp-shared-components'; import {getRosterDetailPageHeaderStyles} from './style'; -import {useAllsparkImage} from '../context'; -import {teamImageIcon} from '../../utils/mockData'; +import {useAllsparkImage} from '@walmart/allspark-foundation/Components/context'; +import {teamImageIcon} from '@walmart/allspark-foundation/Components/Hub/Container/mockData'; import {useTranslation} from 'react-i18next'; import {ROSTER_I18N_NAMESPACE} from '../../../translations'; --- src/managerExperience/components/context.tsx @@ -1,49 +0,0 @@ -import React, {FC, PropsWithChildren, createContext, useContext} from 'react'; -import {Image, ImageProps} from 'react-native'; - -import {ErrorMessage, ErrorMessageProps} from '@walmart/gtp-shared-components'; - -const DefaultComponents = { - Image: (props: ImageProps) => <Image {...props} />, - ErrorMessage, -}; - -export type IRosterComponentContext = { - Image?: FC<ImageProps & {placeholder?: string}>; - ErrorMessage?: FC<ErrorMessageProps>; -}; - -/** - * Context for components used by the foundation. - * Set by the active RosterContainer, it is used to customize the components used by the foundation. - */ -export const RosterComponentContext = - createContext<IRosterComponentContext>(DefaultComponents); - -export const RosterComponentProvider = ( - props: PropsWithChildren<{components?: IRosterComponentContext}>, -) => { - const {children, components = DefaultComponents} = props; - - return ( - <RosterComponentContext.Provider value={components}> - {children} - </RosterComponentContext.Provider> - ); -}; - -/** - * Use this hook to get access to a particular component used by the foundation. - */ -export const useRosterComponent = <K extends keyof IRosterComponentContext>( - component: K, -): NonNullable<IRosterComponentContext[K]> => { - const context = useContext(RosterComponentContext); - - return context?.[component] || DefaultComponents[component]; -}; - -/** - * Use this hook to get access to the Image component used by the foundation. - */ -export const useAllsparkImage = () => useRosterComponent('Image'); --- src/managerExperience/utils/mockData.ts @@ -1,81 +0,0 @@ -export const Images = { - adminAndSupport: - 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png', - apparel: - 'https://i5-me.walmartimages.com/images/teams/task-image-apparel-8c318b96d1.png', - assetProtection: - 'https://i5-me.walmartimages.com/images/teams/task-image-assetprotection-667834ffc0.png', - autoCare: - 'https://i5-me.walmartimages.com/images/teams/auto-care-center-mgr-exp-03bf6ac83d.png', - deliAndBakery: - 'https://i5-me.walmartimages.com/images/teams/delibakery-team-9aca808f6d.png', - digital: - 'https://i5-me.walmartimages.com/images/teams/task-image-digital-7738b264bf.png', - digitalOvernight: - 'https://i5-me.walmartimages.com/images/teams/task-image-digital-7738b264bf.png', - entertainment: - 'https://i5-me.walmartimages.com/images/teams/entertainment-mgr-exp-e26362ff74.png', - frontEnd: - 'https://i5-me.walmartimages.com/images/teams/task-image-frontend-280d25ffc2.png', - fuel: 'https://i5-me.walmartimages.com/images/teams/fuel-team-1eeec3363a.png', - hardlines: - 'https://i5-me.walmartimages.com/images/teams/task-image-hardlines-4d16bea505.png', - healthAndBeauty: - 'https://i5-me.walmartimages.com/images/teams/health-and-beauty-mgr-exp-a55a6f0206.png', - home: 'https://i5-me.walmartimages.com/images/teams/task-image-home-d937192739.png', - pharmacy: - 'https://i5-me.walmartimages.com/images/teams/task-image-pharmacy-95002883d0.png', - remodel: - 'https://i5-me.walmartimages.com/images/teams/remodel-mgr-exp-6eaa5f7662.png', - salesFloor: - 'https://i5-me.walmartimages.com/images/teams/salesfloor-mgr-exp-e5d8982b5e.png', - seasonal: - 'https://i5-me.walmartimages.com/images/teams/task-image-seasonal-191e2d4d0f.png', - stockingDay1: - 'https://i5-me.walmartimages.com/images/teams/task-image-stockingday-9904ffa2b6.png', - stockingDay2: - 'https://i5-me.walmartimages.com/images/teams/task-image-stockingday-9904ffa2b6.png', - stockingOvernight: - 'https://i5-me.walmartimages.com/images/teams/task-image-stockingovernight-21b4d8318e.png', - vision: - 'https://i5-me.walmartimages.com/images/teams/task-image-vision-85480258cb.png', - myTeams: - 'https://i5-me.walmartimages.com/images/teams/my-teams-mgr-exp-1edac1ba4a.png', - totalStore: - 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png', - foodAndConsumerables: - 'https://i5-me.walmartimages.com/images/teams/food-consumables-mgr-exp-792b257616.png', - meatAndProduce: - 'https://i5-me.walmartimages.com/images/teams/task-image-meatproduce-a5965a9074.png', - management: - 'https://i5-me.walmartimages.com/images/teams/task-image-store-02bdfd7611.png', -}; - -export const teamImageIcon: Record<string, string> = { - total: Images.totalStore, - myTeams: Images.myTeams, - '1111111': Images.management, - '1000100': Images.adminAndSupport, - '1000282': Images.apparel, - '1000101': Images.assetProtection, - '1000340': Images.autoCare, - '1000329': Images.deliAndBakery, - '1000326': Images.digital, - '1000348': Images.digitalOvernight, - '1000198': Images.entertainment, - '1000318': Images.foodAndConsumerables, - '1000330': Images.frontEnd, - '1000319': Images.fuel, - '1000187': Images.hardlines, - '': Images.healthAndBeauty, - '1000284': Images.home, - '1000317': Images.meatAndProduce, - '1000121': Images.pharmacy, - '1000123': Images.remodel, - '1000328': Images.seasonal, - '1000333': Images.stockingDay1, - '1000346': Images.stockingDay2, - '1000332': Images.stockingOvernight, - '1000197': Images.vision, - '1000316': Images.meatAndProduce, -};
refactor: update imports for images
refactor: update imports for images
6b64ae88e2c04388639300b36da4e9193bfcff5d
--- packages/allspark-foundation-hub/src/HubFeature/Store/Hub/Container/Screens/HubDashboard.tsx @@ -15,7 +15,10 @@ import { hubHeaderEnabled, hubTeamSwitcherEnabled, } from '../../../Redux/selectors'; -import { TOTAL_STORE_TEAM_ID, TOTAL_STORE_TEAM_LABEL } from '../../../Common/constant'; +import { + TOTAL_STORE_TEAM_ID, + TOTAL_STORE_TEAM_LABEL, +} from '../../../Common/constant'; import { TeamSwitcher } from '../../TeamSwitcher'; import styles from '../styles'; import { Body } from '@walmart/gtp-shared-components';
feat(ui): Update the folder structure for manager experience
feat(ui): Update the folder structure for manager experience
0d6ceb86e532e8be099117e3eb930d3580ad0ed5
--- src/components/MessagesHeader.tsx @@ -1,4 +1,4 @@ -import React, {useMemo} from 'react'; +import React from 'react'; import {TouchableOpacity, View, StyleSheet} from 'react-native'; import {useNavigation} from '@react-navigation/native'; import {Body, CloseIcon, colors} from '@walmart/gtp-shared-components'; @@ -75,11 +75,7 @@ export const MessagesHeader = (props: { const channelData = useChannelData(channelId); const channelName = useChannelName(channelId) ?? alternateChannelName; const {data: rosterData} = useDailyRoster(); - // memoizing here to avoid flickering - const showPresence = useMemo( - () => channelData && !channelData.group, - [channelId], - ); + const showPresence = channelData && !channelData?.group; const firstRecipientAssociate = rosterData?.getDailyRoster?.find( (associate) => String(associate?.win) === --- src/components/MessagesHeader.tsx @@ -1,4 +1,4 @@ -import React, {useMemo} from 'react'; +import React from 'react'; import {TouchableOpacity, View, StyleSheet} from 'react-native'; import {useNavigation} from '@react-navigation/native'; import {Body, CloseIcon, colors} from '@walmart/gtp-shared-components'; @@ -75,11 +75,7 @@ export const MessagesHeader = (props: { const channelData = useChannelData(channelId); const channelName = useChannelName(channelId) ?? alternateChannelName; const {data: rosterData} = useDailyRoster(); - // memoizing here to avoid flickering - const showPresence = useMemo( - () => channelData && !channelData.group, - [channelId], - ); + const showPresence = channelData && !channelData?.group; const firstRecipientAssociate = rosterData?.getDailyRoster?.find( (associate) => String(associate?.win) ===
Fixing first time clockedIn/Out status not showing issue
Fixing first time clockedIn/Out status not showing issue
4e48468eba26c75c6d2bcccdbd40f8a5a1a91791
--- package.json @@ -51,7 +51,6 @@ "verifyBranchName": "sh ./scripts/verifyBranchName.sh" }, "dependencies": { - "@livingdesign/tokens": "^0.63.5", "@react-native-async-storage/async-storage": "^1.21.0", "@react-native-camera-roll/camera-roll": "5.6.0", "@react-native-community/art": "^1.2.0",
Drop 22 removing livingdesign package
Drop 22 removing livingdesign package
e0f566e19efc62d31d9eaa15145915d7bb06c16d
--- CODEOWNERS @@ -1 +1,20 @@ -* @smdv/myTeam-devs +# allspark-admin-team will be the default owners of everything in + +# the repo. Unless a later match takes precedence they will be requested + +# for review when someone opens a pull request. + +- @allspark/allspark-admin-team + +# allspark-admin-team will own all changes in these directories and + +# subdirectories + +/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-utils/ @allspark/allspark-admin-team +/packages/core-services/ @allspark/allspark-admin-team +/packages/core-utils/ @allspark/allspark-admin-team +/packages/allspark-foundation-hub @smdv/myTeam-devs --- docs/docusaurus.config.ts @@ -11,11 +11,11 @@ const config: Config = { url: 'https://gecgithub01.walmart.com', // Set the /<baseUrl>/ pathname under which your site is served // For GitHub pages deployment, it is often '/<projectName>/' - baseUrl: '/pages/smdv/allspark/', + baseUrl: '/pages/allspark/allspark/', // GitHub pages deployment config. // If you aren't using GitHub pages, you don't need these. - organizationName: 'smdv', // Usually your GitHub org/user name. + organizationName: 'allspark', // Usually your GitHub org/user name. projectName: 'allspark', // Usually your repo name. deploymentBranch: 'gh-pages', --- example/index.js @@ -7,6 +7,3 @@ AppRegistry.registerComponent(appName, () => App); // import {Feature1Standalone} from './src'; // AppRegistry.registerComponent(appName, Feature1Standalone.App); - -// import {TeamHubStandalone} from './src'; -// AppRegistry.registerComponent(appName, TeamHubStandalone.App); --- 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 Team Hub - </Button> <Button variant="primary" UNSAFE_style={{marginBottom: 10}} --- example/src/core/index.tsx @@ -21,7 +21,6 @@ import {AllsparkTranslationClient} from '@walmart/allspark-foundation/Translatio import Feature1 from '../feature1'; import Feature2 from '../feature2'; -import TeamHub from '../teamHub'; import {TestContainer} from '../container'; import {HomeScreen} from './home'; @@ -83,24 +82,6 @@ const Tab2Nav = () => { ); }; -const Tab3Stack = createStackNavigator(); - -const Tab3Nav = () => { - return ( - <Tab3Stack.Navigator - screenOptions={{ - header: renderHeader, - headerMode: 'float', - headerLeft: DrawerButton, - }}> - {ActiveAllsparkContainer.Screens({ - featureId: 'teamHub', - builder: {Navigator: Tab3Stack}, - })} - </Tab3Stack.Navigator> - ); -}; - // --- Tabs --- // const Tabs = createBottomTabNavigator(); @@ -110,7 +91,6 @@ 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="Team" component={Tab3Nav} /> </Tabs.Navigator> ); }; @@ -186,13 +166,6 @@ const Navigation = () => { params: params, }, }), - teamHub: (name, params) => ({ - screen: 'Team', - params: { - screen: name, - params: params, - }, - }), }); }, []); @@ -209,7 +182,7 @@ const Navigation = () => { ); }; -const getRootFeatures = () => [Feature1, Feature2, TeamHub]; +const getRootFeatures = () => [Feature1, Feature2]; export function App() { return ( @@ -230,7 +203,6 @@ type CoreRootParamList = { 'container.homeTab': undefined; 'container.tab1': NavigatorScreenParams<Allspark.ScreenParams>; 'container.tab2': NavigatorScreenParams<Allspark.ScreenParams>; - Team: NavigatorScreenParams<Allspark.ScreenParams>; }>; }>; };
Update example code and docs
Update example code and docs
a1385eaa0bf69017d744c68beafbf3872c3ced1f
--- packages/expo-config-plugins/package.json @@ -24,4 +24,4 @@ "@types/fs-extra": "^11.0.4", "typescript": "5.0.4" } -} \ No newline at end of file +}
chore: fix package json space generation
chore: fix package json space generation
8f7e7492ce2a4a681f3ee349e1c75c424f2942d2
--- packages/expo-config-plugins/__tests__/withiOSStripBinarySymbols-test.ts @@ -0,0 +1,83 @@ +import withiOSStripBinarySymbols from '../src/withiOSStripBinarySymbols'; +import { withXcodeProject } from '@expo/config-plugins'; + +jest.mock('@expo/config-plugins', () => { + return { + withXcodeProject: jest.fn((config, action) => { + // Call the action with a mock config containing modResults + const xcodeProjectConfig = { + ...config, + modResults: { + addBuildPhase: jest.fn(), + }, + }; + return action(xcodeProjectConfig); + }), + }; +}); + +describe('withiOSStripBinarySymbols', () => { + const mockConfig = { name: 'test-app' }; + const validProps = { + embedFrameworksScriptPath: '/path/to/embed-frameworks.sh', + stripBinaryScriptPath: '/path/to/strip-binary-symbols.sh', + }; + + beforeEach(() => { + jest.clearAllMocks(); + }); + + it('should throw an error if embedFrameworksScriptPath is not provided', () => { + expect(() => { + withiOSStripBinarySymbols(mockConfig, { + embedFrameworksScriptPath: undefined, + stripBinaryScriptPath: validProps.stripBinaryScriptPath, + }); + }).toThrow('Both embedFrameworksScriptPath and stripBinaryScriptPath must be provided'); + }); + + it('should throw an error if stripBinaryScriptPath is not provided', () => { + expect(() => { + withiOSStripBinarySymbols(mockConfig, { + embedFrameworksScriptPath: validProps.embedFrameworksScriptPath, + stripBinaryScriptPath: null, + }); + }).toThrow('Both embedFrameworksScriptPath and stripBinaryScriptPath must be provided'); + }); + + it('should call withXcodeProject with the correct parameters', () => { + withiOSStripBinarySymbols(mockConfig, validProps); + expect(withXcodeProject).toHaveBeenCalledWith(mockConfig, expect.any(Function)); + }); + + it('should add a build phase with the correct configuration', () => { + const result = withiOSStripBinarySymbols(mockConfig, validProps); + + // Extract the addBuildPhase mock + const addBuildPhaseMock = result.modResults.addBuildPhase; + + // Verify addBuildPhase was called + expect(addBuildPhaseMock).toHaveBeenCalledWith( + [], // files + 'PBXShellScriptBuildPhase', + '[CI] Strip Binary Symbols', + null, + expect.objectContaining({ + shellPath: '/bin/sh', + shellScript: expect.stringContaining(validProps.embedFrameworksScriptPath), + runOnlyForDeploymentPostprocessing: 1, + }) + ); + + // Verify shell script contains both paths + const shellScriptArg = addBuildPhaseMock.mock.calls[0][4].shellScript; + expect(shellScriptArg).toContain(validProps.embedFrameworksScriptPath); + expect(shellScriptArg).toContain(validProps.stripBinaryScriptPath); + }); + + it('should return the modified config', () => { + const result = withiOSStripBinarySymbols(mockConfig, validProps); + expect(result).toHaveProperty('name', 'test-app'); + expect(result).toHaveProperty('modResults'); + }); +}); --- packages/expo-config-plugins/src/withiOSStripBinarySymbols.ts @@ -36,6 +36,17 @@ const withiOSStripBinarySymbols: ConfigPlugin<StripBinarySymbolsProps> = ( FRAMEWORKS_SCRIPT_PATH="${embedFrameworksScriptPath}" STRIP_BINARY_PATH="${stripBinaryScriptPath}" + # Check if the files exist + if [ ! -f "$FRAMEWORKS_SCRIPT_PATH" ]; then + echo "Frameworks script not found at $FRAMEWORKS_SCRIPT_PATH, skipping" + exit 0 + fi + + if [ ! -f "$STRIP_BINARY_PATH" ]; then + echo "Strip binary script not found at $STRIP_BINARY_PATH, skipping" + exit 0 + fi + # Check if the strip-binary-symbols.sh reference already exists if grep -q "$STRIP_BINARY_PATH" "$FRAMEWORKS_SCRIPT_PATH"; then echo "The strip-binary-symbols.sh reference already exists in $FRAMEWORKS_SCRIPT_PATH" @@ -57,4 +68,4 @@ const withiOSStripBinarySymbols: ConfigPlugin<StripBinarySymbolsProps> = ( }); }; -module.exports = withiOSStripBinarySymbols; +export default withiOSStripBinarySymbols;
feat(plugin): allspark-6539 code refactor
feat(plugin): allspark-6539 code refactor
8c028d9b265ebac997717e14e9549f71bcc80630
--- .looper.yml @@ -30,24 +30,26 @@ flows: default: - call: pr - yarnInstall: + installDependencies: - (name Yarn Install) corepack enable - (name Yarn Version) yarn --version - (name Install Dependencies) yarn install - preparePackages: - - call: yarnInstall + buildPackages: - (name Build Packages) yarn run build - pr: - - call: yarnInstall - - (name Lint) npm run lint - - (name Build and Test) npm run test:build + testPackages: + - call: buildPackages + - (name Test) npm run test preparePublish: - - call: yarnInstall - - call: preparePackages - - (name Test) npm run test + - call: installDependencies + - call: buildPackages + + pr: + - call: installDependencies + - (name Lint) npm run lint + - call: testPackages publishPatch: - call: preparePublish --- packages/allspark-foundation/package.json @@ -86,9 +86,11 @@ "typed-redux-saga": "^1.5.0" }, "devDependencies": { + "@react-native-community/datetimepicker": "^7.6.2", "@react-native-community/netinfo": "^9.4.1", "@react-native-firebase/analytics": "~17.4.2", "@react-native-firebase/app": "~17.4.2", + "@react-native-picker/picker": "2.4.8", "@react-navigation/drawer": "^6.6.4", "@react-navigation/native": "^6.1.6", "@react-navigation/stack": "^6.3.17", @@ -104,6 +106,7 @@ "react-native": "~0.73.7", "react-native-apollo-devtools-client": "^1.0.4", "react-native-device-info": "~10.13.1", + "react-native-drop-shadow": "^1.0.0", "react-native-flipper": "^0.212.0", "react-native-gesture-handler": "^2.13.3", "react-native-permissions": "^3.10.1", @@ -112,9 +115,11 @@ "react-native-screens": "^3.27.0" }, "peerDependencies": { + "@react-native-community/datetimepicker": "*", "@react-native-community/netinfo": "9.x", "@react-native-firebase/analytics": "17.x", "@react-native-firebase/app": "17.x", + "@react-native-picker/picker": "*", "@react-navigation/drawer": "6.x", "@react-navigation/native": "6.x", "@react-navigation/stack": "6.x", @@ -136,6 +141,7 @@ "react-native": "*", "react-native-apollo-devtools-client": "*", "react-native-device-info": "*", + "react-native-drop-shadow": "*", "react-native-flipper": "*", "react-native-gesture-handler": "2.x", "react-native-get-random-values": "1.x", --- yarn.lock @@ -4299,6 +4299,15 @@ __metadata: languageName: node linkType: hard +"@react-native-community/datetimepicker@npm:^7.6.2": + version: 7.7.0 + resolution: "@react-native-community/datetimepicker@npm:7.7.0" + dependencies: + invariant: "npm:^2.2.4" + checksum: 10c0/c757d4a4d4d6af32a1ef96fb989235d2f3db8234a6ebc5278b50718d5b1ff9a3e72a7bf8c6dcfa1eb148b2bdc408f8db0ad03dae693dc7ad066cfa716bbb3346 + languageName: node + linkType: hard + "@react-native-community/eslint-config@npm:^2.0.0": version: 2.0.0 resolution: "@react-native-community/eslint-config@npm:2.0.0" @@ -4364,6 +4373,16 @@ __metadata: languageName: node linkType: hard +"@react-native-picker/picker@npm:2.4.8": + version: 2.4.8 + resolution: "@react-native-picker/picker@npm:2.4.8" + peerDependencies: + react: ">=16" + react-native: ">=0.57" + checksum: 10c0/809b484587dde6cf4e83a2a0586fc7c2c49b4a8a4b3332cbe392a37f9ce93dc7b773dec668a4a9426849454bf57d85492356eb07fe21e0cff1cbbf16464e00eb + languageName: node + linkType: hard + "@react-native/assets-registry@npm:0.73.1": version: 0.73.1 resolution: "@react-native/assets-registry@npm:0.73.1" @@ -5485,9 +5504,11 @@ __metadata: "@graphql-codegen/typescript": "npm:^4.0.1" "@graphql-codegen/typescript-operations": "npm:^4.0.1" "@graphql-codegen/typescript-react-apollo": "npm:^4.1.0" + "@react-native-community/datetimepicker": "npm:^7.6.2" "@react-native-community/netinfo": "npm:^9.4.1" "@react-native-firebase/analytics": "npm:~17.4.2" "@react-native-firebase/app": "npm:~17.4.2" + "@react-native-picker/picker": "npm:2.4.8" "@react-navigation/drawer": "npm:^6.6.4" "@react-navigation/native": "npm:^6.1.6" "@react-navigation/stack": "npm:^6.3.17" @@ -5515,6 +5536,7 @@ __metadata: react-native: "npm:~0.73.7" react-native-apollo-devtools-client: "npm:^1.0.4" react-native-device-info: "npm:~10.13.1" + react-native-drop-shadow: "npm:^1.0.0" react-native-flipper: "npm:^0.212.0" react-native-gesture-handler: "npm:^2.13.3" react-native-modalfy: "npm:^3.5.2" @@ -5527,9 +5549,11 @@ __metadata: redux-saga: "npm:^1.2.3" typed-redux-saga: "npm:^1.5.0" peerDependencies: + "@react-native-community/datetimepicker": "*" "@react-native-community/netinfo": 9.x "@react-native-firebase/analytics": 17.x "@react-native-firebase/app": 17.x + "@react-native-picker/picker": "*" "@react-navigation/drawer": 6.x "@react-navigation/native": 6.x "@react-navigation/stack": 6.x @@ -5551,6 +5575,7 @@ __metadata: react-native: "*" react-native-apollo-devtools-client: "*" react-native-device-info: "*" + react-native-drop-shadow: "*" react-native-flipper: "*" react-native-gesture-handler: 2.x react-native-get-random-values: 1.x @@ -14423,6 +14448,16 @@ __metadata: languageName: node linkType: hard +"react-native-drop-shadow@npm:^1.0.0": + version: 1.0.0 + resolution: "react-native-drop-shadow@npm:1.0.0" + peerDependencies: + react: "*" + react-native: "*" + checksum: 10c0/e4b503938e01f4d7d0869e0c4c774e83e97f86b57190096d03b78f0399dce915847d4ee004d516d538bef1b5649cc39d57f71f427a3ded5c167c60ac6780ff1a + languageName: node + linkType: hard + "react-native-flipper@npm:^0.212.0": version: 0.212.0 resolution: "react-native-flipper@npm:0.212.0"
chore: add missing peer dependencies. update looper file
chore: add missing peer dependencies. update looper file
5c86cf0366bd1ff38459d4b049528a8521b78677
--- .looper.multibranch.yml @@ -177,7 +177,7 @@ branches: triggers: - push: skipAuthor: jenkinspan - - spec: release + - spec: release/* call: build(rc) triggers: - push:
updating branching spec for release branch
updating branching spec for release branch
9b2e248333fc6ae13de49070619b4a757062dd62
--- packages/allspark-foundation-hub/src/SupplyChain/Components/AllSupplyTeamsList/style.ts @@ -30,7 +30,6 @@ export default StyleSheet.create({ }, listHeaderSubTitle: { lineHeight: 24, - marginBottom: 20, }, editContainer: { marginLeft: -10, // this is needed in Modal
Updating styles
Updating styles
9c0c53a4bdf66bbf0b3a059f8fe01078e783e2da
--- yarn.lock @@ -5879,11 +5879,11 @@ __metadata: "@walmart/compass-sdk-rn@patch:@walmart/compass-sdk-rn@npm%3A5.19.3#~/.yarn/patches/@walmart-compass-sdk-rn-npm-5.19.3-6aa8f19bab.patch": version: 5.19.3 - resolution: "@walmart/compass-sdk-rn@patch:@walmart/compass-sdk-rn@npm%3A5.19.3#~/.yarn/patches/@walmart-compass-sdk-rn-npm-5.19.3-6aa8f19bab.patch::version=5.19.3&hash=edd210" + resolution: "@walmart/compass-sdk-rn@patch:@walmart/compass-sdk-rn@npm%3A5.19.3#~/.yarn/patches/@walmart-compass-sdk-rn-npm-5.19.3-6aa8f19bab.patch::version=5.19.3&hash=a7f4d0" peerDependencies: react: "*" react-native: "*" - checksum: 10c0/ac1a53c871230b39862cf9496aeeaa7e8cbae6f0f5b249f4920f930c266ef4745391b4d037d4eb029c81ab92769be8e5b63e8569fcdf3a5c209e2833e2ab34aa + checksum: 10c0/4f9e4157c3ce677c847f4e6dcdf99ac371f389e7eefd90db5a640443046169d2201caecb20395adabd3f8d374af8647954a88e9f8fb0fd91f4b659b778c973c6 languageName: node linkType: hard
chore: yarn file update
chore: yarn file update
42c68f4c4aec4b200958ba9804f02e7b167eb5e3
--- src/components/AssociateRosterItem/index.tsx @@ -76,7 +76,6 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const name = associateDisplayName(associate); const associateName = namecase(name.slice(0, 20)); - //Todo: Check the logic for 5 limit and reverse the addition, most recent should be on top const storeAssociateName = async () => { const searchHistoryLimit: number = 5; const searchHistoryList = await AsyncStorage.getItem( @@ -90,16 +89,11 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { ) { if (recentSearchHistoryList.length >= searchHistoryLimit) { recentSearchHistoryList.pop(); - await AsyncStorage.setItem( - RECENT_SEARCH_HISTORY_KEY, - JSON.stringify([associateName, ...recentSearchHistoryList]), - ); - } else { - await AsyncStorage.setItem( - RECENT_SEARCH_HISTORY_KEY, - JSON.stringify([associateName, ...recentSearchHistoryList]), - ); } + await AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify([associateName, ...recentSearchHistoryList]), + ); } else { const filteredRecentSearchHistoryList = recentSearchHistoryList.filter( (item: string) => item !== associateName, --- src/screens/SearchScreen.tsx @@ -190,7 +190,6 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { const [recentSearchHistory, setRecentSearchHistory] = useState<Array<string>>( [], ); - const [recentSearchHistoryLength, setRecentSearchHistoryLength] = useState(0); const getRecentSearchHistoryData = useCallback(async () => { const recentSearchAssociates = await AsyncStorage.getItem( @@ -198,11 +197,7 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { ); try { if (recentSearchAssociates) { - const recentSearchHistoryValue = JSON.parse(recentSearchAssociates); - recentSearchHistoryValue && - setRecentSearchHistoryLength(recentSearchHistoryValue.length); - recentSearchHistoryLength !== recentSearchHistoryValue.length && - setRecentSearchHistory(JSON.parse(recentSearchAssociates)); + setRecentSearchHistory(JSON.parse(recentSearchAssociates)); } } catch (error) { logger.error('Error in fetching the recent search history result', { @@ -244,11 +239,15 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { const associateRemoveHandler = (index: number) => { const updatedRecentSearchHistory = [...recentSearchHistory]; updatedRecentSearchHistory.splice(index, 1); - setRecentSearchHistory(updatedRecentSearchHistory); - AsyncStorage.setItem( - RECENT_SEARCH_HISTORY_KEY, - JSON.stringify(updatedRecentSearchHistory), - ); + if (updatedRecentSearchHistory.length > 0) { + setRecentSearchHistory(updatedRecentSearchHistory); + AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify(updatedRecentSearchHistory), + ); + } else { + clearSearchHistoryLinkHandler(); + } }; return ( --- src/components/AssociateRosterItem/index.tsx @@ -76,7 +76,6 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const name = associateDisplayName(associate); const associateName = namecase(name.slice(0, 20)); - //Todo: Check the logic for 5 limit and reverse the addition, most recent should be on top const storeAssociateName = async () => { const searchHistoryLimit: number = 5; const searchHistoryList = await AsyncStorage.getItem( @@ -90,16 +89,11 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { ) { if (recentSearchHistoryList.length >= searchHistoryLimit) { recentSearchHistoryList.pop(); - await AsyncStorage.setItem( - RECENT_SEARCH_HISTORY_KEY, - JSON.stringify([associateName, ...recentSearchHistoryList]), - ); - } else { - await AsyncStorage.setItem( - RECENT_SEARCH_HISTORY_KEY, - JSON.stringify([associateName, ...recentSearchHistoryList]), - ); } + await AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify([associateName, ...recentSearchHistoryList]), + ); } else { const filteredRecentSearchHistoryList = recentSearchHistoryList.filter( (item: string) => item !== associateName, --- src/screens/SearchScreen.tsx @@ -190,7 +190,6 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { const [recentSearchHistory, setRecentSearchHistory] = useState<Array<string>>( [], ); - const [recentSearchHistoryLength, setRecentSearchHistoryLength] = useState(0); const getRecentSearchHistoryData = useCallback(async () => { const recentSearchAssociates = await AsyncStorage.getItem( @@ -198,11 +197,7 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { ); try { if (recentSearchAssociates) { - const recentSearchHistoryValue = JSON.parse(recentSearchAssociates); - recentSearchHistoryValue && - setRecentSearchHistoryLength(recentSearchHistoryValue.length); - recentSearchHistoryLength !== recentSearchHistoryValue.length && - setRecentSearchHistory(JSON.parse(recentSearchAssociates)); + setRecentSearchHistory(JSON.parse(recentSearchAssociates)); } } catch (error) { logger.error('Error in fetching the recent search history result', { @@ -244,11 +239,15 @@ export const SearchScreen: React.FC<SearchScreenProps> = (props) => { const associateRemoveHandler = (index: number) => { const updatedRecentSearchHistory = [...recentSearchHistory]; updatedRecentSearchHistory.splice(index, 1); - setRecentSearchHistory(updatedRecentSearchHistory); - AsyncStorage.setItem( - RECENT_SEARCH_HISTORY_KEY, - JSON.stringify(updatedRecentSearchHistory), - ); + if (updatedRecentSearchHistory.length > 0) { + setRecentSearchHistory(updatedRecentSearchHistory); + AsyncStorage.setItem( + RECENT_SEARCH_HISTORY_KEY, + JSON.stringify(updatedRecentSearchHistory), + ); + } else { + clearSearchHistoryLinkHandler(); + } }; return (
update the recent message history changes
update the recent message history changes
262e3c592db77c0d4b56e86002380579387334db
--- package.json @@ -73,7 +73,7 @@ "@walmart/exception-mini-app": "0.28.0-rc.1", "@walmart/feedback-all-spark-miniapp": "0.0.55", "@walmart/functional-components": "1.0.31", - "@walmart/gtp-shared-components": "^1.1.8", + "@walmart/gtp-shared-components": "^1.2.0", "@walmart/impersonation-mini-app": "1.0.15", "@walmart/ims-print-services-ui": "0.0.19", "@walmart/inbox-mini-app": "0.0.101",
bumping gtp library
bumping gtp library
7d4fb02bab819b0b3bf368c9400016a241459c70
--- ios/AllSpark/Info.plist @@ -82,14 +82,6 @@ <string>We use your gallery for scanning images of barcodes</string> <key>NSSpeechRecognitionUsageDescription</key> <string>We would like to use speech recognition to perform voice searches</string> - <key>NSCameraUsageDescription</key> - <string>$(PRODUCT_NAME) needs access to your Camera.</string> - <key>NSPhotoLibraryUsageDescription</key> - <string>$(PRODUCT_NAME) needs access to your Photo Library.</string> - <key>NSPhotoLibraryAddUsageDescription</key> - <string>$(PRODUCT_NAME) needs access to your Photo Library.</string> - <key>NSMicrophoneUsageDescription</key> - <string>$(PRODUCT_NAME) needs access to your Microphone.</string> <key>UIAppFonts</key> <array> <string>Bogle-ThinItalic.otf</string> @@ -108,21 +100,6 @@ <string>MaterialCommunityIcons.ttf</string> <string>icomoon.ttf</string> <string>PTMono-Regular.ttf</string> - <string>AntDesign.ttf</string> - <string>Entypo.ttf</string> - <string>EvilIcons.ttf</string> - <string>Feather.ttf</string> - <string>FontAwesome.ttf</string> - <string>FontAwesome5_Brands.ttf</string> - <string>FontAwesome5_Regular.ttf</string> - <string>FontAwesome5_Solid.ttf</string> - <string>Fontisto.ttf</string> - <string>Foundation.ttf</string> - <string>Ionicons.ttf</string> - <string>Octicons.ttf</string> - <string>SimpleLineIcons.ttf</string> - <string>Zocial.ttf</string> - <string>DIGIMark-custom.ttf</string> </array> <key>UIBackgroundModes</key> <array>
Update Info.plist
Update Info.plist
594eb02e6591894007d1ae4ceb655826dc7caf02
--- packages/allspark-foundation/src/Translation/client.ts @@ -24,6 +24,7 @@ export const DefaultConfig: TranslationClientOptions = { export const TranslationClient = (config?: TranslationClientOptions) => { const _instance = i18next; let initialized = false; + let _config = config; /** * Returns true if the translation client has been initialized @@ -36,6 +37,7 @@ export const TranslationClient = (config?: TranslationClientOptions) => { const initialize = async (options: TranslationClientOptions) => { const { resources, ...restOptions } = options; Object.assign(_instance.options, restOptions); + _config = _instance.options; await _instance.init(config || {}); initialized = true; @@ -105,9 +107,14 @@ export const TranslationClient = (config?: TranslationClientOptions) => { } }; + /** + * Returns the locale config for the current language + * @example + * TranslationClient.getLocaleConfig(); // { dateFormat: 'MM/DD/YYYY', currency: '$', ... } + */ const getLocaleConfig = () => { const language = _instance.language; - return config?.localeConfig?.[language]; + return _config?.localeConfig?.[language]; }; return Object.assign(_instance, {
fix: translation client not referencing correct config during get locale config
fix: translation client not referencing correct config during get locale config
749606b72bba55d2182f953760f1abae13cd861b
--- targets/US/package.json @@ -86,7 +86,7 @@ "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.24.7", "@walmart/associate-listening-mini-app": "1.2.7", - "@walmart/attendance-mini-app": "3.86.0", + "@walmart/attendance-mini-app": "3.87.0", "@walmart/avp-feature-app": "0.10.7", "@walmart/avp-shared-library": "0.10.1", "@walmart/backroom-mini-app": "1.5.20", --- yarn.lock @@ -6001,9 +6001,9 @@ __metadata: languageName: node linkType: hard -"@walmart/attendance-mini-app@npm:3.86.0": - version: 3.86.0 - resolution: "@walmart/attendance-mini-app@npm:3.86.0" +"@walmart/attendance-mini-app@npm:3.87.0": + version: 3.87.0 + resolution: "@walmart/attendance-mini-app@npm:3.87.0" dependencies: "@walmart/wfm-ui": "npm:^0.2.26" moment-timezone: "npm:0.5.40" @@ -6033,7 +6033,7 @@ __metadata: redux-saga: ^1.2.0 reselect: ^4.1.0 wfm-allspark-data-library: ^3.3.0 - checksum: 10c0/4cf9ae307e78266b6c4306b92e645ae89b8f0995a206b68a6397ae72d7f508d31e737ffabf5194719d5946179c8f40b94b4ac95ed24577d9402e2c70eb491c26 + checksum: 10c0/8001dba9f2b2ca3f68a3a9dafeed726f294ea8aa601db4d0f7a929b93b877fa2c66fae26a97984586d6e678367038119b00900fc0d893015a1263b8eaa50d19d languageName: node linkType: hard @@ -7002,7 +7002,7 @@ __metadata: "@walmart/ask-sam-chat-components": "npm:^0.2.7" "@walmart/ask-sam-mini-app": "npm:1.24.7" "@walmart/associate-listening-mini-app": "npm:1.2.7" - "@walmart/attendance-mini-app": "npm:3.86.0" + "@walmart/attendance-mini-app": "npm:3.87.0" "@walmart/avp-feature-app": "npm:0.10.7" "@walmart/avp-shared-library": "npm:0.10.1" "@walmart/backroom-mini-app": "npm:1.5.20"
bump ama verion 3.87.0
bump ama verion 3.87.0
f1c90bf1282f00a54e543a94ff322a0902967341
--- src/appState/AppStateSagas.ts @@ -37,7 +37,6 @@ export function* watchForAppStateChange(): any { export function* onAppInactive(): any { const user = yield select(getUser); - console.log('onAppInactive'); if (user) { yield call(AsyncStorage.setItem, 'user_was_present', 'true'); @@ -51,7 +50,7 @@ export function* onAppActive(): any { if (currentRoute !== 'login') { const userWasPresent = yield call(AsyncStorage.getItem, 'user_was_present'); - console.log('userWasPresent', userWasPresent); + if (userWasPresent) { try { const user = yield call(WMSingleSignOn.getUser);
Removing logs
Removing logs
7363a01ee505862cd5d20c1f5f991a048b9fad4d
--- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/wmconnect-mini-app", - "version": "3.7.0", + "version": "3.7.1", "main": "dist/index.js", "files": [ "dist",
feat(ada): update versions
feat(ada): update versions
ddac163f93651ab6548e99f1d1f003ea76664861
--- src/auth/ConfirmSignoutPrompt.tsx @@ -48,14 +48,14 @@ export const ConfirmSignoutPrompt = ( ) => { const {navigation, route} = props; const { - params: {reason}, + params: {reason = ''}, } = route; const dispatch = useDispatch(); const [t] = useTranslation('common'); useBackButton(() => true); - const message = AUTO_SIGNOUT_REASONS.includes(reason!) + const message = AUTO_SIGNOUT_REASONS.includes(reason) ? t('signoutConfirmationDialog.network') : Platform.select({ ios: t('signoutConfirmationDialog.ios'), --- src/startup/AppFlow.ts @@ -76,18 +76,19 @@ export function* appFlow(): any { const pinPromptTask: Task = yield spawn(pinPromptFlow); // Wait for sign out, which could happen in startup flow or anytime after - const data: {reason: string | undefined} = yield take( - MeAtWalmartAuthActions.SIGN_OUT_REQUEST, - ); + const data: ReturnType<typeof MeAtWalmartAuthActions.SIGN_OUT_REQUEST> = + yield take(MeAtWalmartAuthActions.SIGN_OUT_REQUEST); //Navigate to login page first resetTo('Core.Login'); //Wait for login page to be loaded. yield take(SIGN_IN_PAGE_LOADED.type); - if (data?.reason && data?.reason !== 'N/A') { + if (data?.payload && data.payload !== 'N/A') { //Show signout prompt and followup instructions - AllsparkNavigationClient.navigate('Core.ConfirmSignoutPrompt', data); + AllsparkNavigationClient.navigate('Core.ConfirmSignoutPrompt', { + reason: data.payload, + }); //Wait for confirmation yield take(SIGN_OUT_REQUEST_ACKNOWLEDGED.type);
fix: sign out prompt fix
fix: sign out prompt fix
02f71b802569237fda512cfc1ff4157872087bf1
--- src/index.tsx @@ -61,15 +61,15 @@ export const initialize = async (debugToken: string) => { provider: rnfbProvider, isTokenAutoRefreshEnabled: true, }); - - reducerManager.addReducer(textingSlice.name, textingSlice.reducer); - initNotificationListeners(); }; export const initTextingPushNotificationListeners = initNotificationListeners; initi18n(); +reducerManager.addReducer(textingSlice.name, textingSlice.reducer); +initNotificationListeners(); + export const MeganavTextingScreen = MeganavScreen; export const TextingMiniApp = () => { --- src/index.tsx @@ -61,15 +61,15 @@ export const initialize = async (debugToken: string) => { provider: rnfbProvider, isTokenAutoRefreshEnabled: true, }); - - reducerManager.addReducer(textingSlice.name, textingSlice.reducer); - initNotificationListeners(); }; export const initTextingPushNotificationListeners = initNotificationListeners; initi18n(); +reducerManager.addReducer(textingSlice.name, textingSlice.reducer); +initNotificationListeners(); + export const MeganavTextingScreen = MeganavScreen; export const TextingMiniApp = () => {
update push notifcation init method outside texting init method for firebase provider
update push notifcation init method outside texting init method for firebase provider
fb3d3a75f2f0eafe3699606467f2cfcf17c49ed2
--- packages/allspark-foundation/__tests__/Navigation/components/Header/AllsparkHeader.test.tsx @@ -189,9 +189,9 @@ describe('AppHeader components', () => { headerTitleAlign: 'left', headerTintColor: 'white', headerBackTitleVisible: false, - headerStyle: { backgroundColor: '#0053e2', height: BaseHeaderHeight, shadowColor: 'transparent' }, - headerTitleContainerStyle: { marginHorizontal: 0 }, - headerLeftContainerStyle: { paddingStart: 4, paddingEnd: 12 }, + headerStyle: {backgroundColor: '#0053e2', height: BaseHeaderHeight, shadowColor: 'transparent'}, + headerTitleContainerStyle: {marginHorizontal: 0}, + headerLeftContainerStyle: {paddingStart: 8, paddingEnd: 12}, headerStatusBarHeight: 0, }); --- packages/allspark-foundation/__tests__/Navigation/components/Header/__snapshots__/AllsparkHeader.test.tsx.snap @@ -15,7 +15,10 @@ exports[`AppHeader components MyWalmartStackHeader renders correctly with merged "headerLeft": [Function], "headerLeftContainerStyle": { "paddingEnd": 12, - "paddingStart": 4, + "paddingStart": 8, + }, + "headerRightContainerStyle": { + "paddingEnd": 8, }, "headerStatusBarHeight": 0, "headerStyle": { --- packages/allspark-foundation/src/Navigation/components/Header/AllsparkHeader.tsx @@ -31,9 +31,12 @@ export const HeaderStyles = StyleSheet.create({ marginHorizontal: 0, }, headerLeftContainerStyle: { - paddingStart: 4, + paddingStart: 8, paddingEnd: 12, }, + headerRightContainerStyle: { + paddingEnd: 8, + }, }); const SupportStyles = StyleSheet.create({ @@ -173,6 +176,7 @@ export const useMyWalmartHeaderOptions = (_: NavigationOptions = {}) => { headerBackTitleVisible: false, headerStyle: HeaderStyles.headerStyle, headerLeftContainerStyle: HeaderStyles.headerLeftContainerStyle, + headerRightContainerStyle: HeaderStyles.headerRightContainerStyle, headerTitleContainerStyle: HeaderStyles.headerTitleContainerStyle, headerTitle: (props) => <HeaderTitle {...props} />, headerLeft: (props) => <HeaderLeft {...props} variant='contextual' backType='chevron' />,
fix(ui): ALLSPARK-7310 updated header padding (#522)
fix(ui): ALLSPARK-7310 updated header padding (#522) * fix(ui): added header padding * fix(ui): added header padding --------- Co-authored-by: Hariharan Sundaram <hariharan.sundaram0@walmart.com> Co-authored-by: Shubhang Shah - s0s0zug <Shubhang.Shah@walmart.com> Co-authored-by: Hariharan Sundaram <121838+h0s0em0@users.noreply.gecgithub01.walmart.com> Co-authored-by: Dylan Lane - rlane1 <Russell.Lane@walmart.com>
a3dda2fa63a7173fc5bd1751bcd408af6d012f46
--- docs/assets/complex.png Binary files /dev/null and b/docs/assets/complex.png differ --- docs/assets/simple.png Binary files /dev/null and b/docs/assets/simple.png differ --- packages/components-library/Contributing.md @@ -0,0 +1,47 @@ +# Contributing guidelines + +### When adding a new component, we require all the devs to make sure of the following: + +- Match the components to the figma as closely as possible. +- Make sure to choose the right components from gtp, you can look for the exact component name and the variant under the properties on the right. +- Type all the props that are required. Make sure to type the correct ReactNode if you're taking a different component as a prop. +- Avoid requiring unnecessary props. +- The complex component builds section of this document explains more about how to compose a more complex component. +- Set good defaults. Make sure the types are optional for the ones that are not required. +- Ensure that ADA tags are correct. +- Verify that it reads out correctly using Accessibility Inspector +- When multiple elements are supposed to read together, make sure to combine them with accessible=true. +- Write stories to show all the features of the components: +- In the storybook, make sure every optional feature is behind a control. +- Make strings available to be edited. +- When components take other components as props, give a couple of examples. +- Write snapshot tests covering all conditions. +- Update the documentation for using the components. (This is still work in progress and will be updated soon) + +### Simple component builds + +The following guidelines will help you create a simple component: + +- Use base elements and icons from gtp-shared-components. +- When you're using an icon, if it is not limited to a few icons by design (mandated by UX), take the whole react node as a prop. +- Take strings and optional additional accessibility strings. Make sure the component doesn't break if the optional elements aren't provided, and falls back to a good default. +- Follow the various lint conventions like no inline styles. +- Use flex everywhere + +![example simple component](../../docs/assets/simple.png) + +### Complex component builds + +Complex components are basically components combining various simple components and LD (gtp) components. + +- Components take a few things as strings where no other information is required to represent them: like the title, description, etc. +- These texts only need the actual text and no other information to represent them. The styling is mandated by our component and (ideally) should not be overriden. +- We would take these base strings and render them using GTP components (like Body). +- For more complex components, we just take the whole component as a prop and render them as is. +- As required, we do provide some styling to place these components in a way that it doesn't break the design. + +![example complex component](../../docs/assets/complex.png) + + + +
Feature/contributing (#301)
Feature/contributing (#301) * fix(components): minor fixes * chore: adding contributing guidelines * Update Contributing.md
0bacfd616a261d88247bb4a88748999fbd8f233e
--- android/app/src/debug/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:networkSecurityConfig="@xml/network_security_config" /> </manifest> --- android/build.gradle @@ -6,6 +6,7 @@ buildscript { minSdkVersion = 23 compileSdkVersion = 29 targetSdkVersion = 29 + googlePlayServicesVersion = "17.0.0" } repositories { google() --- ios/AllSpark/Info.plist @@ -42,28 +42,32 @@ <string>awbs</string> </array> <key>LSRequiresIPhoneOS</key> - <true /> + <true/> <key>NSAppTransportSecurity</key> <dict> <key>NSAllowsArbitraryLoads</key> - <true /> + <true/> <key>NSExceptionDomains</key> <dict> <key>NSExceptionRequiresForwardSecrecy</key> - <false /> + <false/> <key>localhost</key> <dict> <key>NSExceptionAllowsInsecureHTTPLoads</key> - <true /> + <true/> </dict> <key>mobileservices.wal-mart.com</key> - <dict /> + <dict/> </dict> </dict> <key>NSCameraUsageDescription</key> <string>We use your camera for scanning images of barcodes</string> <key>NSLocationWhenInUseUsageDescription</key> - <string /> + <string>Me@Walmart will use your device&apos;s GPS to determine your location while clocking. You may disable this later in your device&apos;s settings.</string> + <key>NSLocationAlwaysUsageDescription</key> + <string>Me@Walmart will use your device&apos;s GPS to determine your location while clocking. You may disable this later in your device&apos;s settings.</string> + <key>NSLocationAlwaysAndWhenInUseUsageDescription</key> + <string>Me@Walmart will use your device&apos;s GPS to determine your location while clocking. You may disable this later in your device&apos;s settings.</string> <key>NSMicrophoneUsageDescription</key> <string>We record your voice when you want to do a voice search</string> <key>NSSpeechRecognitionUsageDescription</key> @@ -107,6 +111,6 @@ <key>UIUserInterfaceStyle</key> <string>Light</string> <key>UIViewControllerBasedStatusBarAppearance</key> - <false /> + <false/> </dict> </plist> --- ios/Podfile.lock @@ -561,6 +561,8 @@ PODS: - React-cxxreact (= 0.63.2) - React-jsi (= 0.63.2) - React-jsinspector (0.63.2) + - react-native-geolocation-service (5.1.1): + - React - react-native-get-random-values (1.5.1): - React-Core - react-native-logger (1.17.0): @@ -733,6 +735,7 @@ DEPENDENCIES: - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) + - react-native-geolocation-service (from `../node_modules/react-native-geolocation-service`) - react-native-get-random-values (from `../node_modules/react-native-get-random-values`) - "react-native-logger (from `../node_modules/@walmart/react-native-logger`)" - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" @@ -847,6 +850,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsiexecutor" React-jsinspector: :path: "../node_modules/react-native/ReactCommon/jsinspector" + react-native-geolocation-service: + :path: "../node_modules/react-native-geolocation-service" react-native-get-random-values: :path: "../node_modules/react-native-get-random-values" react-native-logger: @@ -986,6 +991,7 @@ SPEC CHECKSUMS: React-jsi: 54245e1d5f4b690dec614a73a3795964eeef13a8 React-jsiexecutor: 8ca588cc921e70590820ce72b8789b02c67cce38 React-jsinspector: b14e62ebe7a66e9231e9581279909f2fc3db6606 + react-native-geolocation-service: f33626f1ae12381ca2ae60f98b2f5edd676bf95a react-native-get-random-values: 41f0c91ac0da870e47b307e07752e9e54bc2dc7e react-native-logger: 7b829af1706f15d4aec9c4354a1fe054305b51b9 react-native-netinfo: e36c1bb6df27ab84aa933679b3f5bbf9d180b18f --- package-lock.json @@ -3097,12 +3097,13 @@ "integrity": "sha512-eDS3eLxVfwTsUICU89ERbzln7RdE53bKTfT5gwYg7wn+bo7U/VtRNX5A12r1Et8nRITkwfGh9ZZS05frCO1TYQ==" }, "@walmart/time-clock-mini-app": { - "version": "0.0.23", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.0.23.tgz", - "integrity": "sha512-2oGfQjtHWauo+xhEqupnjc4DsdmiCLlP1cEN03w6AVw+y7ui3xzn2KTsJS+RlrxHMIsTBZ0AP2bfRapF+ybGTg==", + "version": "0.1.2", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-0.1.2.tgz", + "integrity": "sha512-zZngpsMqNjyge8BtE22QyHnfyIgXAa5OgY0Oqlv+rxsMN1tneqRNW7n1OV7o8XcGwx2vhVj6R64mmi/TiQaT1A==", "requires": { "@react-native-community/datetimepicker": "^3.0.3", - "moment-timezone": "^0.5.31" + "moment-timezone": "^0.5.31", + "react-native-geolocation-service": "^5.0.0" } }, "@walmart/ui-components": { @@ -12033,6 +12034,11 @@ "resolved": "https://npme.walmart.com/react-native-device-info/-/react-native-device-info-5.6.5.tgz", "integrity": "sha512-l457wv7gYXSRnm38AH+NpCgKYa1zxxfN0EL8mTBxo+TnasXtk0FZ86zWDLhm4eqpcSH8xpT/+z2MQrATfqCaoA==" }, + "react-native-geolocation-service": { + "version": "5.1.1", + "resolved": "https://npme.walmart.com/react-native-geolocation-service/-/react-native-geolocation-service-5.1.1.tgz", + "integrity": "sha512-HrnOW2x3yuMSc5IIHQJ7GOnpKDhMRyk6SxdHTcuUB16tpadusCNCvrGGQtpkWV6WACp3IjJEIUKclxz/84l1Lg==" + }, "react-native-gesture-handler": { "version": "1.8.0", "resolved": "https://npme.walmart.com/react-native-gesture-handler/-/react-native-gesture-handler-1.8.0.tgz", --- package.json @@ -62,7 +62,7 @@ "@walmart/redux-store": "^1.0.7", "@walmart/schedule-mini-app": "0.2.34", "@walmart/settings-mini-app": "1.1.8", - "@walmart/time-clock-mini-app": "0.0.23", + "@walmart/time-clock-mini-app": "0.1.2", "@walmart/ui-components": "^1.0.81", "i18next": "^19.7.0", "intl": "^1.2.5", @@ -75,6 +75,7 @@ "react-native-circular-progress": "^1.3.6", "react-native-connect-sso-redux": "^1.0.0-rc1", "react-native-device-info": "^5.6.5", + "react-native-geolocation-service": "^5.0.0", "react-native-gesture-handler": "^1.7.0", "react-native-get-random-values": "^1.5.1", "react-native-haptic-feedback": "^1.10.0",
Time Clock Mini App Beta Release (#234)
Time Clock Mini App Beta Release (#234)
449b4a608924542a44889b61cd2e54a1d4d1d3c2
--- package-lock.json @@ -69,7 +69,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.1.32", + "@walmart/react-native-scanner-3.0": "0.2.1", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1", @@ -5806,9 +5806,9 @@ } }, "node_modules/@walmart/react-native-scanner-3.0": { - "version": "0.1.32", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", - "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==", + "version": "0.2.1", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz", + "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg==", "license": "ISC", "peerDependencies": { "react-native": ">=0.47.1" @@ -25383,9 +25383,9 @@ "version": "1.33.0" }, "@walmart/react-native-scanner-3.0": { - "version": "0.1.32", - "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.1.32.tgz", - "integrity": "sha512-eTnQ4DX9rb8YNbj7tfn4iqRuiQotY3YNEJXDOm17/F4IbQ3/raWQgRArVvFAXswMz/pnSfIN7cqJEgUKlYX66Q==" + "version": "0.2.1", + "resolved": "https://npme.walmart.com/@walmart/react-native-scanner-3.0/-/react-native-scanner-3.0-0.2.1.tgz", + "integrity": "sha512-1b8IJIj2yRxWbIR/bGGAjgDEJjxAo/LEDvcgQ/kkniO7ZCVBy9i8MQqJP5rgwPQorY0e78Rqiu29i+Dtdi5Myg==" }, "@walmart/react-native-shared-navigation": { "version": "1.0.2", --- package.json @@ -111,7 +111,7 @@ "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", "@walmart/react-native-logger": "1.33.0", - "@walmart/react-native-scanner-3.0": "0.1.32", + "@walmart/react-native-scanner-3.0": "0.2.1", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.5.1",
upgrade scanner version
upgrade scanner version
7eae95c13ff100d5c659b3f5616694fc47966df7
--- packages/allspark-foundation-hub/src/HubFeature/Store/Onboarding/TeamOnboarding/Screens/TeamOnboardingScreen.tsx @@ -1,10 +1,7 @@ import React, { useEffect } from 'react'; import { TeamOnboarding } from '../Component/TeamOnboarding'; import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigation'; -import { - AllsparkTranslationClient, - useAllsparkTranslation, -} from '@walmart/allspark-foundation/Translation'; +import { useAllsparkTranslation } from '@walmart/allspark-foundation/Translation'; import { useTelemetryService } from '@walmart/allspark-foundation/Telemetry'; import { LoggerService } from '@walmart/allspark-foundation/Logger'; import { OnboardingImages } from '../../../Images/images'; @@ -26,12 +23,13 @@ export const TeamOnboardingScreen = () => { const showHubOnboardingScreen = useSelector(hubOnboardingEnabled); const navigation = useNavigation(); const hubScreeName = useSelector(ManagerExperienceSelectors.getHubScreenName); + const [translate] = useAllsparkTranslation(FEATURE_ID); useEffect(() => { navigation.setOptions({ - title: AllsparkTranslationClient.t('managerExperience.' + hubScreeName), + title: translate('managerExperience.' + hubScreeName), }); - }, [hubScreeName, navigation, t]); + }, [hubScreeName, navigation, translate]); const navigateBack = () => AllsparkNavigationClient.goBack(); --- packages/allspark-foundation-hub/src/HubFeature/Store/translation.ts @@ -82,6 +82,12 @@ export const enUS = { message: 'Refresh this page to try again.', primaryButtonText: 'Got it', }, + managerExperience: { + myTeam: { + root: 'Team', + }, + sidekick: 'Work', + }, }; export const esMX = { @@ -170,4 +176,10 @@ export const esMX = { message: 'Actualice esta página para volver a intentarlo.', primaryButtonText: 'Entiendo', }, + managerExperience: { + myTeam: { + root: 'Equipo', + }, + sidekick: 'Trabajo', + }, };
Update the user domain for team switcher
Update the user domain for team switcher
a57b42383edfd56c881c2ba1321f0cedb87cae01
--- core/src/appReview/sagas.ts @@ -27,7 +27,6 @@ export function* handleAppReviewPrompt() { ); if (canPromptAppReview) { - Logger.debug('AppReview - Prompting app review request from user'); yield call(onAppReviewRequest); } }
chore: removing testing logs
chore: removing testing logs
0a518accb28e001d564da4d6cf94ce275a0dd507
--- package-lock.json @@ -34,7 +34,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.30", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.12.2", "@walmart/attendance-mini-app": "0.190.2", @@ -62,7 +62,7 @@ "@walmart/metrics-mini-app": "0.13.11", "@walmart/mod-flex-mini-app": "1.10.4", "@walmart/moment-walmart": "1.0.4", - "@walmart/onewalmart-miniapp": "1.0.16", + "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.35", "@walmart/payrollsolution_miniapp": "0.130.46", "@walmart/price-changes-mini-app": "1.9.7", @@ -4792,15 +4792,15 @@ } }, "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.30", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.30.tgz", + "integrity": "sha512-PjPnvZvKkdEzj46W6qklv/syMTTDwtpX4Cnx3eMhK/+lDAiSPMJogDpGeWDxQ99G3HbP971O2/INN5NHcixjTg==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", "@walmart/core-services": "^1.4.9", - "@walmart/gtp-shared-components": "^2.0.9", + "@walmart/gtp-shared-components": "^1.8.17", "@walmart/redux-store": "^3.1.3", "react": "^18.2.0", "react-native": "~0.70.5" @@ -5656,9 +5656,9 @@ } }, "node_modules/@walmart/onewalmart-miniapp": { - "version": "1.0.16", - "resolved": "https://npme.walmart.com/@walmart/onewalmart-miniapp/-/onewalmart-miniapp-1.0.16.tgz", - "integrity": "sha512-uL/CS1EtqHy9mWpCspuqwMg7V6oTxQwlqY20PiheiDQ6fxhSu3R29tf/IjQA4NzH4vu9I8sqf2+3ci0xYGhesg==", + "version": "1.0.14", + "resolved": "https://npme.walmart.com/@walmart/onewalmart-miniapp/-/onewalmart-miniapp-1.0.14.tgz", + "integrity": "sha512-NuaNvEfhqwFQI1MXsCoTAr08TAHkBh1J9CllJxF0crH4+/LyODfFYWdjQ36Q2oq/YDPKCipFf6O3j579kJZZUQ==", "dependencies": { "@walmart/functional-components": "^4.0.3" }, @@ -25142,9 +25142,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.30", + "resolved": "https://npme.walmart.com/@walmart/amp-mini-app/-/amp-mini-app-1.1.30.tgz", + "integrity": "sha512-PjPnvZvKkdEzj46W6qklv/syMTTDwtpX4Cnx3eMhK/+lDAiSPMJogDpGeWDxQ99G3HbP971O2/INN5NHcixjTg==" }, "@walmart/ask-sam-chat-components": { "version": "0.2.13", @@ -25404,9 +25404,9 @@ "version": "1.0.4" }, "@walmart/onewalmart-miniapp": { - "version": "1.0.16", - "resolved": "https://npme.walmart.com/@walmart/onewalmart-miniapp/-/onewalmart-miniapp-1.0.16.tgz", - "integrity": "sha512-uL/CS1EtqHy9mWpCspuqwMg7V6oTxQwlqY20PiheiDQ6fxhSu3R29tf/IjQA4NzH4vu9I8sqf2+3ci0xYGhesg==", + "version": "1.0.14", + "resolved": "https://npme.walmart.com/@walmart/onewalmart-miniapp/-/onewalmart-miniapp-1.0.14.tgz", + "integrity": "sha512-NuaNvEfhqwFQI1MXsCoTAr08TAHkBh1J9CllJxF0crH4+/LyODfFYWdjQ36Q2oq/YDPKCipFf6O3j579kJZZUQ==", "requires": { "@walmart/functional-components": "~4.0.3" } --- package.json @@ -76,7 +76,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.30", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.12.2", "@walmart/attendance-mini-app": "0.190.2", @@ -104,7 +104,7 @@ "@walmart/metrics-mini-app": "0.13.11", "@walmart/mod-flex-mini-app": "1.10.4", "@walmart/moment-walmart": "1.0.4", - "@walmart/onewalmart-miniapp": "1.0.16", + "@walmart/onewalmart-miniapp": "1.0.14", "@walmart/pay-stub-miniapp": "0.9.35", "@walmart/payrollsolution_miniapp": "0.130.46", "@walmart/price-changes-mini-app": "1.9.7",
Removed non Platform mini apps
Removed non Platform mini apps
97e7c4ca8ceb8871071155c8ff4f88ca7b6442ff
--- docs/docs/components/icons/icons-core-owned.md @@ -2,4 +2,40 @@ sidebar_position: 3 title: Me@Core-Owned Icons custom_edit_url: null ---- \ No newline at end of file +--- + +There are several Android and iOS specific icons available in the `allspark-core` repository. + +## iOS Icons +These icons are located in the `allspark-core/targets/US/ios/Allspark/Images.xcassets` folder. Most are available in different resolutions. + +### Beta App Icon +![](./images/beta-ios.png) + +### Dev App Icon +![](./images/dev-ios.png) + +### Teflon App Icon +![](./images/teflon-ios.png) + +### Prod App Icon +![](./images/prod-ios.png) + +### App Logo Icon +![](./images/AppLogo.png) + +### Launcher Icon +![](./images/beta-ios.png) + +### Spark Icon +![](./images/spark.png) + + +## Android Icons +These icons are located in the `allspark-core/targets/US/android/app/src` folder. Most are available in different resolutions. Additionally, for the build-specific icons, there is a foreground version, rounded version, and a default version for the launcher. + +### Beta, Dev, Teflon, and Prod Icons +Refer to the iOS section, as the icons are very similar for matching build versions. + +### Notification Icon +![](./images/ic_notification_small.png) \ No newline at end of file --- docs/docs/components/icons/images/AppLogo.png Binary files /dev/null and b/docs/docs/components/icons/images/AppLogo.png differ --- docs/docs/components/icons/images/beta-ios.png Binary files /dev/null and b/docs/docs/components/icons/images/beta-ios.png differ --- docs/docs/components/icons/images/dev-ios.png Binary files /dev/null and b/docs/docs/components/icons/images/dev-ios.png differ --- docs/docs/components/icons/images/ic_notification_small.png Binary files /dev/null and b/docs/docs/components/icons/images/ic_notification_small.png differ --- docs/docs/components/icons/images/prod-ios.png Binary files /dev/null and b/docs/docs/components/icons/images/prod-ios.png differ --- docs/docs/components/icons/images/spark.png Binary files /dev/null and b/docs/docs/components/icons/images/spark.png differ --- docs/docs/components/icons/images/teflon-ios.png Binary files /dev/null and b/docs/docs/components/icons/images/teflon-ios.png differ
docs: updated section on core owned icons
docs: updated section on core owned icons
bfca06a1a9f60a68b26c154fb154cc1f925c910f
--- .yarnrc.yml @@ -8,3 +8,4 @@ logFilters: nodeLinker: node-modules +npmRegistryServer: "https://npme.walmart.com/"
chore: update npme path
chore: update npme path
ca22510b57d113f1be6c8c24758e5662eba10a64
--- lerna.json @@ -28,7 +28,6 @@ "packages/core-services-allspark", "packages/core-utils", "packages/core-widget-registry", - "packages/me-at-walmart-athena-queries", - "packages/allspark-foundation" + "packages/me-at-walmart-athena-queries" ] } --- packages/core-services-allspark/src/graphql/links.ts @@ -36,11 +36,12 @@ const handleDailyRoster = (associates: MewAssociate[]) => { }); }; -export const contentTypeHeaderLink = new ApolloLink((operation, forward) => { +export const headersLink = new ApolloLink((operation, forward) => { operation.setContext((context: DefaultContext) => ({ headers: { ...context.headers, 'Content-Type': 'application/json', + 'X-Apollo-Operation-Name': operation.operationName, }, })); return forward(operation); --- packages/core-services-allspark/src/graphql/provider.tsx @@ -12,7 +12,7 @@ import { } from '../types'; import { ATHENA_SVC_NAME, ATHENA_HTTP_CLIENT_NAME } from './constants'; import { - contentTypeHeaderLink, + headersLink, typeRemappingLink, athenaUriLink, createErrorLoggerLink, @@ -42,7 +42,7 @@ export const AllsparkGraphqlProvider = (props: PropsWithChildren<{}>) => { const links = useMemo(() => { const loggerLink = createErrorLoggerLink(logger); - const defaultLinks = [contentTypeHeaderLink, typeRemappingLink, loggerLink]; + const defaultLinks = [headersLink, typeRemappingLink, loggerLink]; if (!useShadowGateway) { defaultLinks.unshift(athenaUriLink);
fix: add operation name header to graphql requests
fix: add operation name header to graphql requests
62d26a3a7064589122a28cf02edc60d05ef971da
--- package-lock.json @@ -1,12 +1,12 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.17-alpha-12", + "version": "1.0.17-alpha-13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@walmart/roster-mini-app", - "version": "1.0.17-alpha-12", + "version": "1.0.17-alpha-13", "hasInstallScript": true, "devDependencies": { "@babel/core": "^7.20.0", @@ -67,7 +67,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": "1.0.16-alpha-11", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-12", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0", @@ -11836,9 +11836,9 @@ } }, "node_modules/@walmart/wmconnect-mini-app": { - "version": "1.0.16-alpha-11", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-11.tgz", - "integrity": "sha512-HqKyB2VNEmM0ZAfTrmpg4D0mpyWk0VVNgT0O1Douuuk0K5ncO0oboxBOzbvHgnT+HGHKYJaErkf1njgc46EvYA==", + "version": "1.0.16-alpha-12", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-12.tgz", + "integrity": "sha512-g6Dre172+hZ2+qxYGW1Id22tXHZR2t+6YCTHdYVmz8JYYVs9cdjyD7A2M6QNiLgOHnf/7NZSg2S+M0WtnMMZhg==", "dev": true, "hasInstallScript": true }, @@ -41047,9 +41047,9 @@ } }, "@walmart/wmconnect-mini-app": { - "version": "1.0.16-alpha-11", - "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-11.tgz", - "integrity": "sha512-HqKyB2VNEmM0ZAfTrmpg4D0mpyWk0VVNgT0O1Douuuk0K5ncO0oboxBOzbvHgnT+HGHKYJaErkf1njgc46EvYA==", + "version": "1.0.16-alpha-12", + "resolved": "https://npme.walmart.com/@walmart/wmconnect-mini-app/-/wmconnect-mini-app-1.0.16-alpha-12.tgz", + "integrity": "sha512-g6Dre172+hZ2+qxYGW1Id22tXHZR2t+6YCTHdYVmz8JYYVs9cdjyD7A2M6QNiLgOHnf/7NZSg2S+M0WtnMMZhg==", "dev": true }, "@whatwg-node/events": { --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "1.0.17-alpha-12", + "version": "1.0.17-alpha-13", "private": false, "main": "dist/index.js", "files": [ @@ -90,7 +90,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": "1.0.16-alpha-11", + "@walmart/wmconnect-mini-app": "1.0.16-alpha-12", "babel-jest": "^29.2.1", "chance": "^1.1.11", "eslint": "8.22.0",
Update version
Update version
3e1cb8075b801331fd25c5fd7f8b7b8b8bf2ebe1
--- src/screens/RosterDetailScreen/SupplyChainRosterDetailScreen.tsx @@ -126,7 +126,7 @@ export const SupplyChainRosterDetailScreen = ({ isPeopleLead || isHomeOffice); const defaultTeamLabel = initialTeamName || TOTAL_SITE_TEAM_LABEL; - const defaultTeamIds = [initialTeamId] || [TOTAL_SITE_TEAM_ID]; + const defaultTeamIds = initialTeamId ? [initialTeamId] : [TOTAL_SITE_TEAM_ID]; const userIsInRoster = useUserIsInRoster(); const [switcherTeamState, setSwitcherTeamState] = useState<{ shiftIds: string[]; @@ -346,9 +346,8 @@ export const SupplyChainRosterDetailScreen = ({ [allTeamsData?.supplyChainTeamsByBusinessUnit?.teams, filteredAssociates], ); - const filterCount = useMemo( - () => getFilterCount(isSalariedOrLead ? switcherTeamState : teamState), - [isSalariedOrLead, switcherTeamState, teamState], + const filterCount = getFilterCount( + isSalariedOrLead ? switcherTeamState : teamState, ); // Filter chips based on site type
feat(ui): fixed few bugs
feat(ui): fixed few bugs
c2a136289eafef8e0cd7dd459a8b3d2461f7c947
--- metro.config.js @@ -5,16 +5,27 @@ * @format */ -module.exports = { - transformer: { - getTransformOptions: async () => ({ - transform: { - experimentalImportSupport: false, - inlineRequires: false, - }, - }), - }, - resolver: { - useWatchman: !process.env.CI, - }, -}; +const {getDefaultConfig} = require('metro-config'); + +module.exports = (async () => { + const { + resolver: {sourceExts, assetExts}, + } = await getDefaultConfig(); + + return { + transformer: { + getTransformOptions: async () => ({ + transform: { + experimentalImportSupport: false, + inlineRequires: false, + }, + }), + babelTransformerPath: require.resolve('react-native-svg-transformer'), + }, + resolver: { + assetExts: assetExts.filter((ext) => ext !== 'svg'), + sourceExts: [...sourceExts, 'svg'], + useWatchman: !process.env.CI, + }, + }; +})();
Added metro config for svg images
Added metro config for svg images
e1801d2f82a93e5381c2153d4a9d1cee759bb148
--- .looper.yml @@ -15,18 +15,6 @@ scheduling: concurrent branches: - spec: feature/* triggers: - - manual: - name: Publish Changed - call: publishFromChanges - - manual: - name: Publish From Package - call: publishFromPackage - - manual: - name: Publish Pre-Release - call: publishPrerelease - - manual: - name: Publish Graduate - call: publishGraduate - manual: name: Canary Release call: canaryRelease --- README.md @@ -4,9 +4,7 @@ Allspark is the framework Me@Walmart uses to build container and feature apps in ## CI: -Temporarily, looper can be accessed here: https://ci.walmart.com/job/allspark/job/allspark-core/job/Experiments/job/allspark-clone-multibranch/ - -A new multibranch looper is being set up on the new looper. Use the above looper job to trigger builds from inside the branches. +Builds can be triggered from this multibranch job on LooperPro: https://dx.walmart.com/nextgenci/v2/detail/900238b0-930c-4c5d-93fd-8c5f3226fd76 ### Testing changes
chore(ci): ALLSPARK-5690 canary release only for feature branches (#241)
chore(ci): ALLSPARK-5690 canary release only for feature branches (#241) * chore(ci): ALLSPARK-5690 canary release only for feature branches * chore(ci): trigger branch
7139688bddd0d6e22956bbb7ffaf9926b670836a
--- packages/allspark-foundation-hub/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.9.9](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.9.8...@walmart/allspark-foundation-hub@1.9.9) (2025-06-02) + +**Note:** Version bump only for package @walmart/allspark-foundation-hub + ## [1.9.8](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/allspark-foundation-hub@1.9.7...@walmart/allspark-foundation-hub@1.9.8) (2025-05-30) **Note:** Version bump only for package @walmart/allspark-foundation-hub --- packages/allspark-foundation-hub/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/allspark-foundation-hub", - "version": "1.9.8", + "version": "1.9.9", "description": "", "main": "lib/index.js", "types": "lib/index.d.ts", --- packages/me-at-walmart-athena-queries/CHANGELOG.md @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [6.33.0](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.32.2...@walmart/me-at-walmart-athena-queries@6.33.0) (2025-06-02) + +### Bug Fixes + +- **graphql:** change name ([42d1f32](https://gecgithub01.walmart.com/allspark/allspark/commit/42d1f3233f4d12df65f681028960ddd7ec0f0231)) +- **graphql:** fix typo ([d467d32](https://gecgithub01.walmart.com/allspark/allspark/commit/d467d324924aa3d0bbf66e28fe5b907e2cfe3bca)) +- **graphql:** query name ([c6d2978](https://gecgithub01.walmart.com/allspark/allspark/commit/c6d2978da91f4227bb0523699582ca36a4a880e7)) + +### Features + +- **graphql:** Change imports ([756ee83](https://gecgithub01.walmart.com/allspark/allspark/commit/756ee838066e5fb629cfe90662ff1df7d2457adb)) +- **graphql:** New Query for header ([6106670](https://gecgithub01.walmart.com/allspark/allspark/commit/610667010dd16412f44c6dd6575ce7cc0bc17712)) + ## [6.32.2](https://gecgithub01.walmart.com/allspark/allspark/compare/@walmart/me-at-walmart-athena-queries@6.32.1...@walmart/me-at-walmart-athena-queries@6.32.2) (2025-05-06) **Note:** Version bump only for package @walmart/me-at-walmart-athena-queries --- packages/me-at-walmart-athena-queries/package.json @@ -1,6 +1,6 @@ { "name": "@walmart/me-at-walmart-athena-queries", - "version": "6.32.2", + "version": "6.33.0", "description": "> TODO: description", "author": "rlane1 <russell.lane@walmart.com>", "homepage": "",
chore(version): updating package version
chore(version): updating package version - @walmart/allspark-foundation-hub@1.9.9 - @walmart/me-at-walmart-athena-queries@6.33.0
702181f686712fa888a17023a1bc10d51bd496d3
--- src/services/PushNotificationApi.ts @@ -1,6 +1,5 @@ import {CommonHttpClient} from '@walmart/allspark-http-client'; import {HTTP_CLIENT_KEY} from './config'; -import axios from 'axios'; //TODO: Configure the baseURL based on environment. const pushNotificationBaseURL = @@ -41,23 +40,23 @@ export const PushNotificationApi: IPushNotificationApi = { channelId, imageUrl, ) => { - return axios - .post( - 'http://texting-notification-service-dev.smdv-backend.k8s.glb.us.walmart.net/notifyRecipients', - { + return BasePushNotificationApi.post( + 'http://texting-notification-service-dev.smdv-backend.k8s.glb.us.walmart.net/notifyRecipients', + { + data: { title: senderName, alert: message, recipients: recipients, storeNumber: storeNumber, channelId: channelId, + imageUrl: imageUrl, }, - { - headers: { - 'Content-Type': 'application/json', - 'wm_correlation.id': '123-123', - }, + headers: { + 'Content-Type': 'application/json', + 'wm_correlation.id': '123-123', }, - ) + }, + ) .then((resp) => console.log(resp)) .catch((e) => { console.log('Error with request'); --- src/services/PushNotificationApi.ts @@ -1,6 +1,5 @@ import {CommonHttpClient} from '@walmart/allspark-http-client'; import {HTTP_CLIENT_KEY} from './config'; -import axios from 'axios'; //TODO: Configure the baseURL based on environment. const pushNotificationBaseURL = @@ -41,23 +40,23 @@ export const PushNotificationApi: IPushNotificationApi = { channelId, imageUrl, ) => { - return axios - .post( - 'http://texting-notification-service-dev.smdv-backend.k8s.glb.us.walmart.net/notifyRecipients', - { + return BasePushNotificationApi.post( + 'http://texting-notification-service-dev.smdv-backend.k8s.glb.us.walmart.net/notifyRecipients', + { + data: { title: senderName, alert: message, recipients: recipients, storeNumber: storeNumber, channelId: channelId, + imageUrl: imageUrl, }, - { - headers: { - 'Content-Type': 'application/json', - 'wm_correlation.id': '123-123', - }, + headers: { + 'Content-Type': 'application/json', + 'wm_correlation.id': '123-123', }, - ) + }, + ) .then((resp) => console.log(resp)) .catch((e) => { console.log('Error with request');
using allspark http client lib
using allspark http client lib
e2bc81f6d1e8f2ee655add0388f5bab607c9d7a8
--- targets/US/ios/Podfile.lock @@ -1939,7 +1939,7 @@ PODS: - React-Core - react-native-safe-area-context (4.10.8): - React-Core - - react-native-scanner-3.0 (0.10.4): + - react-native-scanner-3.0 (0.10.6): - Firebase/Analytics - Osiris (= 0.8.3-rc.6) - OsirisBarcode (= 0.8.3-rc.6) @@ -2269,7 +2269,7 @@ PODS: - FirebaseMessaging (<= 10.29.0) - StructuredLogAssistantIOS (= 0.0.7) - TOCropViewController (2.7.4) - - topstock-mini-app (1.19.2): + - topstock-mini-app (1.19.4): - React - VisionCamera (3.7.1): - React @@ -2872,7 +2872,7 @@ SPEC CHECKSUMS: react-native-pdf: 103940c90d62adfd259f63cca99c7c0c306b514c react-native-render-html: 984dfe2294163d04bf5fe25d7c9f122e60e05ebe react-native-safe-area-context: b7daa1a8df36095a032dff095a1ea8963cb48371 - react-native-scanner-3.0: feb691881135ab06bcc2d55d787315ab125ca1f8 + react-native-scanner-3.0: e02f585bc732978a4af69b604a0c141623c2dce4 react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253 react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688 @@ -2943,12 +2943,12 @@ SPEC CHECKSUMS: StructuredLogAssistantIOS: d48c327b3b67366d954435891dc1e748a6aeb9c1 SumoSDK: 1ae76023f89989810383327e1e5f415fcab45804 TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 - topstock-mini-app: 8094204c19ad9dd7f2bf44e30fd5a9c8b689cf8b + topstock-mini-app: a8538da2e375ab737e794c49597ce3f3fed99378 VisionCamera: ef56ac9d3e0fef4b94c7cf75735aaccc2326e35a walmart-react-native-sumo-sdk: 49d6a1873b29b2279433bd4346755206ac60e1fd WebexSDK: 8a46648ec5992f1a10de5375e91df35750275445 wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3 - Yoga: c716aea2ee01df6258550c7505fa61b248145ced + Yoga: 47d399a73c0c0caa9ff824e5c657eae31215bfee zxing-cpp: fcaae9c9427f24066af415055963582be8200d05 PODFILE CHECKSUM: e45caceff59820fc357600d6b2277634c8242734
fix():bumped up topstock version
fix():bumped up topstock version
d6bc33a60ce1b6c8e56308ed3e151faf7f816f10
--- env.teflon.js @@ -42,7 +42,7 @@ export default { url: 'https://developer.api.us.stg.walmart.com/api-proxy/service/ATHENA/GATEWAY/v1', headers: { 'WM_SVC.NAME': 'ATHENA-GATEWAY', - 'WM_SVC.ENV': 'dev', + 'WM_SVC.ENV': 'teflon', }, persistedQueries: true, }, --- package-lock.json @@ -57,7 +57,7 @@ "@walmart/inbox-mini-app": "0.84.1", "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", - "@walmart/me-field-mini-app": "12.0.25", + "@walmart/me-field-mini-app": "12.0.26", "@walmart/metrics-mini-app": "0.12.10", "@walmart/mod-flex-mini-app": "1.9.4", "@walmart/moment-walmart": "1.0.4", @@ -5418,9 +5418,9 @@ } }, "node_modules/@walmart/me-field-mini-app": { - "version": "12.0.25", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.25.tgz", - "integrity": "sha512-1mxrkjgtoltK8qzmoiVy9/rViZ/GoViHZG+1uYL1rV3o+ByksY7d8+foyY6BNzDfbg/6W2G24bdRMs7vpNf2qw==", + "version": "12.0.26", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.26.tgz", + "integrity": "sha512-LO4kPU2ukqvXVdKytklY+ZFK6g0imOKGEQRNkDUsy3iIk/kde5uVuF9tgeUf0ftJ0rzzGHgoOPNLXV7i/q7vlg==", "hasInstallScript": true, "peerDependencies": { "@atmt/feedback-component-native": "^8.0.0", @@ -25237,9 +25237,9 @@ } }, "@walmart/me-field-mini-app": { - "version": "12.0.25", - "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.25.tgz", - "integrity": "sha512-1mxrkjgtoltK8qzmoiVy9/rViZ/GoViHZG+1uYL1rV3o+ByksY7d8+foyY6BNzDfbg/6W2G24bdRMs7vpNf2qw==" + "version": "12.0.26", + "resolved": "https://npme.walmart.com/@walmart/me-field-mini-app/-/me-field-mini-app-12.0.26.tgz", + "integrity": "sha512-LO4kPU2ukqvXVdKytklY+ZFK6g0imOKGEQRNkDUsy3iIk/kde5uVuF9tgeUf0ftJ0rzzGHgoOPNLXV7i/q7vlg==" }, "@walmart/metrics-mini-app": { "version": "0.12.10", --- package.json @@ -99,7 +99,7 @@ "@walmart/inbox-mini-app": "0.84.1", "@walmart/iteminfo-mini-app": "7.3.4", "@walmart/manager-approvals-miniapp": "0.2.4", - "@walmart/me-field-mini-app": "12.0.25", + "@walmart/me-field-mini-app": "12.0.26", "@walmart/metrics-mini-app": "0.12.10", "@walmart/mod-flex-mini-app": "1.9.4", "@walmart/moment-walmart": "1.0.4",
feat: :package: Updated learning mini app package to 12.0.26
feat: :package: Updated learning mini app package to 12.0.26
86f6e0d15536bfe963dd38336106f0521cd4127f
--- src/config/foundationConfig.ts @@ -8,6 +8,6 @@ export const foundationModuleConfig = { name: FEATURE_ID, tags: [FeatureTags.associate], screens: rosterScreens, - translations: rosterTranslations, redux: rosterRedux, + translations: rosterTranslations, };
feat: update order or values
feat: update order or values
4884c5cef04b357ba7583df34c32cf29addecf97
--- targets/US/package.json @@ -99,7 +99,7 @@ "@walmart/core-utils": "6.3.9", "@walmart/core-widget-registry": "workspace:^", "@walmart/counts-component-miniapp": "0.1.13", - "@walmart/emergency-mini-app": "1.29.9", + "@walmart/emergency-mini-app": "1.29.10", "@walmart/exception-mini-app": "1.8.11", "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.14.6#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.14.6-2a58bc097a.patch", "@walmart/feedback-all-spark-miniapp": "0.9.66", --- yarn.lock @@ -6317,9 +6317,9 @@ __metadata: languageName: node linkType: hard -"@walmart/emergency-mini-app@npm:1.29.9": - version: 1.29.9 - resolution: "@walmart/emergency-mini-app@npm:1.29.9" +"@walmart/emergency-mini-app@npm:1.29.10": + version: 1.29.10 + resolution: "@walmart/emergency-mini-app@npm:1.29.10" dependencies: "@walmart/allspark-utils": "npm:^1.6.5" "@walmart/core-widget-registry": "npm:^0.6.6" @@ -6334,7 +6334,7 @@ __metadata: react-native: "*" react-redux: ^7.2.1 redux: ^4.1.2 - checksum: 10c0/d6b0d7f6795f1c952d4102e6647fcc9a26ebea2628de972eb8f58fccb8cc7676a21dff6af04b1dc7843bbf04d123ef10a581fcc052e6dbeed0984b5fdce1b60d + checksum: 10c0/1acc1637f33ee47b5525e4bb32c7041c15bd730b5c328671998e444b3d572996b15466816a02ae3554e7bea827ca508f9ed85d5ca3b3fdff811eb2dc60473ce1 languageName: node linkType: hard @@ -7015,7 +7015,7 @@ __metadata: "@walmart/core-utils": "npm:6.3.9" "@walmart/core-widget-registry": "workspace:^" "@walmart/counts-component-miniapp": "npm:0.1.13" - "@walmart/emergency-mini-app": "npm:1.29.9" + "@walmart/emergency-mini-app": "npm:1.29.10" "@walmart/exception-mini-app": "npm:1.8.11" "@walmart/facilities-management-miniapp": "patch:@walmart/facilities-management-miniapp@npm%3A0.14.6#~/.yarn/patches/@walmart-facilities-management-miniapp-npm-0.14.6-2a58bc097a.patch" "@walmart/feedback-all-spark-miniapp": "npm:0.9.66"
inbox version increased
inbox version increased
37776b678cffeda8ab9962a9ff148c2fc61bfeef
--- package-lock.json @@ -5366,11 +5366,11 @@ "@walmart/counts-component-miniapp": ">=0.0.21", "@walmart/functional-components": ">=2.0.6", "@walmart/gtp-shared-components": ">=2.0.2", - "@walmart/ims-print-services-ui": ">=2.0.6", + "@walmart/ims-print-services-ui": ">=2.0.1", "@walmart/price-changes-mini-app": ">=1.4.5", "@walmart/react-native-env": ">=0.2.0", "@walmart/react-native-logger": ">=1.29.0", - "@walmart/react-native-scanner-3.0": ">=0.1.29", + "@walmart/react-native-scanner-3.0": ">=0.1.26", "@walmart/react-native-store-map": ">=0.3.7", "@walmart/redux-store": ">=3.1.2", "@walmart/ui-components": ">=1.6.0",
Bump item info dependencies
Bump item info dependencies
5e29d47cee2ffcd05684e094d0ac2ac0fdc65fa4
--- src/containers/RosterFilters.tsx @@ -59,7 +59,6 @@ export const RosterFilters = (props: { const offlineUserIds = useOfflineIds(); const viewerId = useSelector(getEncryptedUserId); - // const isSalariedOrTeamLead = useIsSalariedOrTeamLead(); const isAllFilterChipsVisible = useRbacConfigWithJobCode(); // Used for reference, does not need to trigger render --- src/containers/RosterFilters.tsx @@ -59,7 +59,6 @@ export const RosterFilters = (props: { const offlineUserIds = useOfflineIds(); const viewerId = useSelector(getEncryptedUserId); - // const isSalariedOrTeamLead = useIsSalariedOrTeamLead(); const isAllFilterChipsVisible = useRbacConfigWithJobCode(); // Used for reference, does not need to trigger render
remove commented code
remove commented code
f37a1c907280b522a4315df0e49d52928e24982e
--- android/app/src/main/assets/fonts/icomoon.ttf Binary files a/android/app/src/main/assets/fonts/icomoon.ttf and b/android/app/src/main/assets/fonts/icomoon.ttf differ --- ios/icomoon.ttf Binary files a/ios/icomoon.ttf and b/ios/icomoon.ttf differ --- package-lock.json @@ -1972,9 +1972,9 @@ } }, "@walmart/settings-mini-app": { - "version": "1.0.2", - "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.0.2.tgz", - "integrity": "sha512-hIwfEUGpCaPbf7LLWZkcztq8P6Pny3tkJ32ZLjBCgALFHViBlZ0BA6WW7UZkBXpMgr1G4Tj1zzrR5SVhkKJCOg==" + "version": "1.1.3", + "resolved": "https://npme.walmart.com/@walmart/settings-mini-app/-/settings-mini-app-1.1.3.tgz", + "integrity": "sha512-NzNAMe5IkZi4z/ZBbk8qZmSzFX1AYEs94KPN3Dj3mprbJG44SQ2bSNq3ljmQBAsr+wcNxMnGWq1Snrt1Qzgi3g==" }, "@walmart/time-clock-mini-app": { "version": "0.0.13", @@ -1986,9 +1986,9 @@ } }, "@walmart/ui-components": { - "version": "1.0.70", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.0.70.tgz", - "integrity": "sha512-D8bEPfq/vWjUiXkAayago+NxzSzcafs23RL+R1y9uemaCB3wXwbcl0WpoNATcB75XWqR7454etJU3xU9vA8qqA==", + "version": "1.0.75", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.0.75.tgz", + "integrity": "sha512-rOvJAvai1zfc87i47NrBG5OssDTJsgCg2e4Zws6w7As6raZKpeOOAvRPuqYQ8OCjkNbkcHCrdEk49iqTlBjaWA==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -53,9 +53,9 @@ "@walmart/react-native-shared-navigation": "^0.2.0", "@walmart/redux-store": "^1.0.7", "@walmart/schedule-mini-app": "0.2.19", - "@walmart/settings-mini-app": "1.0.2", + "@walmart/settings-mini-app": "1.1.3", "@walmart/time-clock-mini-app": "0.0.13", - "@walmart/ui-components": "^1.0.70", + "@walmart/ui-components": "^1.0.75", "i18next": "^19.7.0", "intl": "^1.2.5", "lodash": "^4.17.20",
Feature/settings version increase (#129)
Feature/settings version increase (#129) * settings & ui-components version bump * settings mini app version bump Co-authored-by: Rahil Manzar<rahil.manzar@walmartlabs.com> & Ashutosh Singh <ashutosh.singh@walmartlabs.com>
8eadcd8e63e913200dd5a99b5a250c8dcfe468aa
--- package-lock.json @@ -54,7 +54,7 @@ "@walmart/impersonation-mini-app": "1.17.2", "@walmart/ims-print-services-ui": "2.1.2", "@walmart/inbox-mini-app": "0.82.5", - "@walmart/iteminfo-mini-app": "7.1.5", + "@walmart/iteminfo-mini-app": "7.1.6", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.3.0", "@walmart/metrics-mini-app": "0.9.61", @@ -5347,9 +5347,9 @@ } }, "node_modules/@walmart/iteminfo-mini-app": { - "version": "7.1.5", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.5.tgz", - "integrity": "sha512-8vb5dAC9TIR3PRu8qGfsUy3ZDv7m67K9zg00cQjRx5OLcbfEJ2QPAdmVXpun+j+jmUCa9iROnETq1G+9ldJc1A==", + "version": "7.1.6", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.6.tgz", + "integrity": "sha512-W5upZGAkeGBXyEOVmPVC7oGKvvUOqqfV78mWl4Mev2l6FIkBPF+1YzvJkyjInM0WPyJuUfg8/XTTwX6OZGnuhg==", "peerDependencies": { "@react-native-community/async-storage": ">=1.12.1", "@react-native-community/netinfo": ">=9.3.6", @@ -25187,9 +25187,9 @@ } }, "@walmart/iteminfo-mini-app": { - "version": "7.1.5", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.5.tgz", - "integrity": "sha512-8vb5dAC9TIR3PRu8qGfsUy3ZDv7m67K9zg00cQjRx5OLcbfEJ2QPAdmVXpun+j+jmUCa9iROnETq1G+9ldJc1A==" + "version": "7.1.6", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.1.6.tgz", + "integrity": "sha512-W5upZGAkeGBXyEOVmPVC7oGKvvUOqqfV78mWl4Mev2l6FIkBPF+1YzvJkyjInM0WPyJuUfg8/XTTwX6OZGnuhg==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.1" --- package.json @@ -96,7 +96,7 @@ "@walmart/impersonation-mini-app": "1.17.2", "@walmart/ims-print-services-ui": "2.1.2", "@walmart/inbox-mini-app": "0.82.5", - "@walmart/iteminfo-mini-app": "7.1.5", + "@walmart/iteminfo-mini-app": "7.1.6", "@walmart/manager-approvals-miniapp": "0.2.1", "@walmart/me-field-mini-app": "1.3.0", "@walmart/metrics-mini-app": "0.9.61",
updated iteminfo version with the httpclient error log fix
updated iteminfo version with the httpclient error log fix
ee065174dd6e75600e03abd116e089df16a34045
--- example/src/teamHub/screens/screen.tsx @@ -1,5 +1,5 @@ import React, {useEffect} from 'react'; -import {View} from 'react-native'; +import {View, Text} from 'react-native'; import {Button} from '@walmart/gtp-shared-components'; import {useNavigation} from '@react-navigation/core'; @@ -37,6 +37,22 @@ export const HomeScreen = TeamHub.createScreen( }> Team Container </Button> + <HubWidget + iconName='ArticleIcon' + moduleTitle="Module Title" + shortIntro="Short Introduction or instructions (optional)" + content={ + <View style={{height: 100}}> + <Text>Content goes here!</Text> + </View> + } + insightVariant='actionable' + actionText="Time-sensitive action that is highly recommended" + btnText="Do something" + onActionPress={actionBtnPress} + variant='content' + isDisabled={false} + /> </View> ); }, --- packages/allspark-foundation/__tests__/Components/HubWidget.test.tsx @@ -0,0 +1,67 @@ +import React from 'react'; +import { Text } from 'react-native'; +import { render, fireEvent } from '@testing-library/react-native'; +import { HubWidget } from '../../src/Components/Hub/HubWidget/index'; +import { Icons } from '@walmart/gtp-shared-components'; +import { HubWidgetTypes } from '../../src/Components/Hub/HubWidget/types'; + +const defaultProps: HubWidgetTypes = { + iconName: 'ArticleIcon' as keyof typeof Icons, + moduleTitle: 'Module Title', + shortIntro: 'Short Introduction or instructions (optional)', + content: <Text>Content goes here!</Text>, + insightVariant: 'actionable' as 'actionable' | 'informational' | 'none', + actionText: 'Time-sensitive action that is highly recommended', + btnText: 'Do something!', + onActionPress: jest.fn(), + isDisabled: false, + variant: 'content' as 'content' | 'restricted' | 'clockedOut', +}; + +const renderComponent = (props: {}) => + render(<HubWidget {...defaultProps} {...props} />); + +describe('HubWidget', () => { + it('Test 1: renders component correctly with default props', () => { + const { getByText, getByTestId } = renderComponent({}); + const heading = getByTestId('heading'); + const intro = getByTestId('shortIntro'); + expect(heading.children).toContain(defaultProps.moduleTitle); + expect(intro.children).toContain(defaultProps.shortIntro); + expect(getByText('Content goes here!')).toBeTruthy(); + }); + + it('Test 3: renders actionable insight variant correctly', () => { + const { getByTestId } = renderComponent({ insightVariant: 'actionable' }); + const actionTxt = getByTestId('actionTxt'); + expect(actionTxt.children).toContain(defaultProps.actionText); + fireEvent.press(getByTestId('action-btn')); + expect(defaultProps.onActionPress).toHaveBeenCalled(); + }); + + it('Test 4: disables button when isDisabled is true', () => { + const { getByTestId } = renderComponent({ + insightVariant: 'actionable', + isDisabled: true, + }); + const button = getByTestId('action-btn'); + expect(button.props.disabled).toBe(true); + }); + + it('Test 5: render icon correctly with different props', () => { + const { getByTestId, rerender } = renderComponent({ iconName: 'BellIcon' }); + let IconComponent = Icons['BellIcon']; + expect(getByTestId('icon')).toBeTruthy(); + expect(IconComponent).toBeTruthy(); + + rerender(<HubWidget {...defaultProps} iconName='BoxIcon' />); + IconComponent = Icons['BoxIcon']; + expect(getByTestId('icon')).toBeTruthy(); + expect(IconComponent).toBeTruthy(); + + rerender(<HubWidget {...defaultProps} iconName='CameraIcon' />); + IconComponent = Icons['CameraIcon']; + expect(getByTestId('icon')).toBeTruthy(); + expect(IconComponent).toBeTruthy(); + }); +}); --- packages/allspark-foundation/src/Components/Hub/HubWidget/index.tsx @@ -0,0 +1,78 @@ +import React from 'react'; +import { View } from 'react-native'; +import { HubWidgetTypes } from './types'; +import { HubWidgetStyles } from './styles'; +import { + Icons, + Button, + Body, + Heading, + colors, +} from '@walmart/gtp-shared-components'; + +export const HubWidget = ({ + iconName, + moduleTitle, + shortIntro, + content, + insightVariant, + actionText, + btnText, + onActionPress, + isDisabled, + variant = 'content', +}: HubWidgetTypes) => { + const styles = HubWidgetStyles(); + const IconComponent = Icons[iconName]; + //need clarity on which case needs to be followed here for declaring constants, used camelcase for + const isActionableContent = + insightVariant === 'actionable' && variant === 'content'; + + return ( + <View style={styles.container}> + {/* HEADER */} + <View style={styles.heading}> + <IconComponent size='medium' color={colors.blue['100']} testID='icon' /> + <Heading UNSAFE_style={styles.title} size='medium' testID='heading'> + {moduleTitle} + </Heading> + <Icons.ChevronRightIcon size='medium' UNSAFE_style={styles.leftIcon} /> + </View> + + {shortIntro && ( + <Body + size='medium' + UNSAFE_style={styles.instruction} + testID='shortIntro' + > + {shortIntro} + </Body> + )} + + {/* CONTENT SLOT */} + <View style={styles.contentSlot}>{content}</View> + + {/* ACTIONABLE VARIANT */} + {isActionableContent && ( + <View style={styles.actionableVar}> + <Body + UNSAFE_style={styles.actionTxt} + size='medium' + testID='actionTxt' + > + {actionText} + </Body> + <Button + variant='secondary' + isFullWidth + disabled={isDisabled || false} + onPress={onActionPress} + testID='action-btn' + > + {btnText} + </Button> + </View> + )} + </View> + ); +}; --- packages/allspark-foundation/src/Components/Hub/HubWidget/styles.ts @@ -0,0 +1,52 @@ +import { StyleSheet } from 'react-native'; +import { colors } from '@walmart/gtp-shared-components'; + +export const HubWidgetStyles = () => + StyleSheet.create({ + container: { + paddingTop: 24, + paddingBottom: 24, + paddingLeft: 16, + paddingRight: 16, + backgroundColor: colors.white, + borderWidth: 1, + borderColor: colors.blue['10'], + }, + heading: { + flexDirection: 'row', + alignItems: 'center', + }, + title: { + marginTop: 1, + marginLeft: 8, + fontSize: 20, + fontFamily: 'Bogle-Bold', + color: colors.black['160'], + marginRight: 4, + }, + leftIcon: { + marginTop: 1, + }, + instruction: { + marginTop: 4, + fontSize: 16, + color: colors.black['160'], + fontFamily: 'Bogle-Regular', + }, + contentSlot: { + padding: 16, + minHeight: 70, + }, + actionableVar: { + padding: 16, + paddingTop: 12, + backgroundColor: colors.blue['10'], + borderRadius: 8, + }, + actionTxt: { + fontSize: 16, + fontFamily: 'Bogle-Regular', + color: colors.black['160'], + marginBottom: 16, + }, + }); --- packages/allspark-foundation/src/Components/Hub/HubWidget/types.ts @@ -0,0 +1,15 @@ +import { ReactNode } from 'react'; +import { Icons } from '@walmart/gtp-shared-components'; + +export interface HubWidgetTypes { + iconName: keyof typeof Icons; + moduleTitle: string; + shortIntro?: string; + content: ReactNode; + insightVariant?: 'actionable' | 'informational' | 'none'; + actionText: string; + btnText: string; + isDisabled?: boolean; + onActionPress: () => void; + variant?: 'content' | 'restricted' | 'clockedOut'; +}
feat: updated test cases and added living design comps
feat: updated test cases and added living design comps
bed9d6153fa828591d92464ef7b72ca046511e27
--- __tests__/harness/redux/mockState/index.ts @@ -19,5 +19,5 @@ export const initialStateMock: GlobalState = { versions: versionsState, deviceInfo: deviceInfoState, appConfig: appConfigState, - texting: textingState, + roster: textingState, };
Update roster tests
Update roster tests
88947f5f005739e071aa4cb5244083062d49d044
--- package-lock.json @@ -4548,9 +4548,9 @@ } }, "@walmart/ui-components": { - "version": "1.3.0-beta.5", - "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-beta.5.tgz", - "integrity": "sha512-kA6TH+g+BO5z0ti9vlAFwc8zHdlb3bs1dE1Fkjrd5yhiz0xyLKpN+ravjDuJtPV/2etjQqGJWL1Z/0p8wLYbNA==", + "version": "1.3.0-beta.10", + "resolved": "https://npme.walmart.com/@walmart/ui-components/-/ui-components-1.3.0-beta.10.tgz", + "integrity": "sha512-EWcpz6XjdAMKIOFHxJ3tHyZjB4VujAfIxmsRNgrsVvRNFfwz1liwlTQGCupXp7H1djXb80icR7BI+Evqo9wkVg==", "requires": { "react-native-calendars": "1.299.0" } --- package.json @@ -99,7 +99,7 @@ "@walmart/shelfavailability-mini-app": "0.6.8", "@walmart/taskit-mini-app": "0.0.77-rc.0", "@walmart/time-clock-mini-app": "0.4.25", - "@walmart/ui-components": "1.3.0-beta.5", + "@walmart/ui-components": "1.3.0-beta.10", "@walmart/welcomeme-mini-app": "0.30.4", "@walmart/wfm-ui": "^0.1.50", "axios-cache-adapter": "2.7.3",
version bump for ui-components
version bump for ui-components
7e7b963cede7b9bf9aec5c9657f883aea64ce09e
--- package.json @@ -160,7 +160,7 @@ "@walmart/me-at-walmart-container": "workspace:^", "@walmart/moment-walmart": "1.0.4", "@walmart/redux-store": "~6.3.28", - "@walmart/ui-components": "1.20.0", + "@walmart/ui-components": "1.20.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", "crypto-js": "~4.2.0", --- targets/US/package.json @@ -155,7 +155,7 @@ "@walmart/time-clock-mini-app": "2.448.1", "@walmart/topstock-mini-app": "1.20.4", "@walmart/translator-mini-app": "1.4.2", - "@walmart/ui-components": "1.20.0", + "@walmart/ui-components": "1.20.4", "@walmart/walmart-fiscal-week": "^0.3.6", "@walmart/welcomeme-mini-app": "0.99.0", "@walmart/wfm-ui": "2.4.0", --- yarn.lock @@ -6039,25 +6039,6 @@ __metadata: languageName: node linkType: hard -"@types/react-native-vector-icons@npm:^6.4.6": - version: 6.4.18 - resolution: "@types/react-native-vector-icons@npm:6.4.18" - dependencies: - "@types/react": "npm:*" - "@types/react-native": "npm:^0.70" - checksum: 10c0/b27f2295c5baaba9ce2ff9ade6e505e4d1fe4f40a628df13dc26d0e1b3ccee9775846f3613a443d91cfe86844703b81e9e64a10cc4b7fac1edfde96cb82c893b - languageName: node - linkType: hard - -"@types/react-native@npm:^0.70": - version: 0.70.19 - resolution: "@types/react-native@npm:0.70.19" - dependencies: - "@types/react": "npm:*" - checksum: 10c0/09a5191dd0f3b85abfa8939df585860ba11a666d888846c7fd7d8d5d1cd72a39224e154403f90a5b82f1dc6c896fa3447e4f5061b2d3e102d0ce798e559d7f13 - languageName: node - linkType: hard - "@types/react-redux@npm:^7.1.9": version: 7.1.34 resolution: "@types/react-redux@npm:7.1.34" @@ -7895,7 +7876,7 @@ __metadata: "@walmart/time-clock-mini-app": "npm:2.448.1" "@walmart/topstock-mini-app": "npm:1.20.4" "@walmart/translator-mini-app": "npm:1.4.2" - "@walmart/ui-components": "npm:1.20.0" + "@walmart/ui-components": "npm:1.20.4" "@walmart/walmart-fiscal-week": "npm:^0.3.6" "@walmart/welcomeme-mini-app": "npm:0.99.0" "@walmart/wfm-ui": "npm:2.4.0" @@ -8947,29 +8928,28 @@ __metadata: languageName: node linkType: hard -"@walmart/ui-components@npm:1.20.0": - version: 1.20.0 - resolution: "@walmart/ui-components@npm:1.20.0" - dependencies: - "@walmart/ui-components": "npm:^1.15.11" - react-hook-form: "npm:^7.33.1" - react-native-calendars: "npm:1.299.0" - react-native-elements: "npm:^3.4.2" +"@walmart/ui-components@npm:1.20.4": + version: 1.20.4 + resolution: "@walmart/ui-components@npm:1.20.4" peerDependencies: "@react-navigation/stack": ">=6.1.0" + "@walmart/allspark-foundation": "*" "@walmart/allspark-utils": ">=1.6.5" "@walmart/gtp-shared-components": ">=2.0.0" javascript-time-ago: ">=2.3.4" react: "*" + react-hook-form: "*" react-native: "*" react-native-background-timer: ">=2.4.1" + react-native-calendars: "*" + react-native-elements: "*" react-native-hyperlink: ">=0.0.19" react-native-modal: ">=11.6.1" react-native-reanimated: ">=1.13.2" react-native-safe-area-context: ">=3.1.3" react-native-vector-icons: ">=7.0.0" react-native-webview: ">=10.10.2" - checksum: 10c0/f1cc53bfb426c86446295ac94bf7fcaeeb1685780cf89edaade36e818c410af43457955c72c631b999cb9b3545b9b8017dffa52a588aee617ec91e78456cfd84 + checksum: 10c0/93c05137b864a6c8d4d3baa3ae402640915bdcac36cd7ba1539bb463890900812e74baa39d92c21a4010e3fe1353be345bf1e9375f5931632fa8479363acf7dd languageName: node linkType: hard @@ -10931,7 +10911,7 @@ __metadata: languageName: node linkType: hard -"color-convert@npm:^1.9.0, color-convert@npm:^1.9.3": +"color-convert@npm:^1.9.0": version: 1.9.3 resolution: "color-convert@npm:1.9.3" dependencies: @@ -10963,7 +10943,7 @@ __metadata: languageName: node linkType: hard -"color-string@npm:^1.6.0, color-string@npm:^1.9.0": +"color-string@npm:^1.9.0": version: 1.9.1 resolution: "color-string@npm:1.9.1" dependencies: @@ -10973,16 +10953,6 @@ __metadata: languageName: node linkType: hard -"color@npm:^3.1.2": - version: 3.2.1 - resolution: "color@npm:3.2.1" - dependencies: - color-convert: "npm:^1.9.3" - color-string: "npm:^1.6.0" - checksum: 10c0/39345d55825884c32a88b95127d417a2c24681d8b57069413596d9fcbb721459ef9d9ec24ce3e65527b5373ce171b73e38dbcd9c830a52a6487e7f37bf00e83c - languageName: node - linkType: hard - "color@npm:^4.2.3": version: 4.2.3 resolution: "color@npm:4.2.3" @@ -19692,25 +19662,6 @@ __metadata: languageName: node linkType: hard -"react-native-elements@npm:^3.4.2": - version: 3.4.3 - resolution: "react-native-elements@npm:3.4.3" - dependencies: - "@types/react-native-vector-icons": "npm:^6.4.6" - color: "npm:^3.1.2" - deepmerge: "npm:^4.2.2" - hoist-non-react-statics: "npm:^3.3.2" - lodash.isequal: "npm:^4.5.0" - opencollective-postinstall: "npm:^2.0.3" - react-native-ratings: "npm:8.0.4" - react-native-size-matters: "npm:^0.3.1" - peerDependencies: - react-native-safe-area-context: ">= 3.0.0" - react-native-vector-icons: ">7.0.0" - checksum: 10c0/0ee536c0e8000248bc33526fd63245a28e9ba8021ba2df4a21bc8315fd9a6e6a418163abe40bb42d9a72cca7f597ddf8014d44208a24e8a0f3d85450aa285fd8 - languageName: node - linkType: hard - "react-native-error-boundary@npm:^1.1.6": version: 1.2.7 resolution: "react-native-error-boundary@npm:1.2.7" @@ -20028,18 +19979,6 @@ __metadata: languageName: node linkType: hard -"react-native-ratings@npm:8.0.4": - version: 8.0.4 - resolution: "react-native-ratings@npm:8.0.4" - dependencies: - lodash: "npm:^4.17.15" - peerDependencies: - react: "*" - react-native: "*" - checksum: 10c0/a7f295fb51c4b0529f77e627ebd2ffcc9c0790d3e793013bba90c769fc91d13eee0193c937c82b701e337bf3f83bdeabd964d9433060e70a60aae3ca8f410015 - languageName: node - linkType: hard - "react-native-reanimated@npm:^3.6.0": version: 3.16.7 resolution: "react-native-reanimated@npm:3.16.7" @@ -20120,15 +20059,6 @@ __metadata: languageName: node linkType: hard -"react-native-size-matters@npm:^0.3.1": - version: 0.3.1 - resolution: "react-native-size-matters@npm:0.3.1" - peerDependencies: - react-native: "*" - checksum: 10c0/3723a84592864d4248ff5c05fb4fc032cbb3b6a96f4452f1cca78a53d78b8fae8ef99158c6f48e89047405e2e91dcf563b01f3463d29ff4dbc7904432530b795 - languageName: node - linkType: hard - "react-native-sound-player@npm:0.13.2": version: 0.13.2 resolution: "react-native-sound-player@npm:0.13.2"
Bumped ui-components
Bumped ui-components
e6dfe9911e87ad39fad42ad714d8eee5061bfb10
--- src/screens/SearchScreen.tsx @@ -35,7 +35,7 @@ import {useDailyRoster} from '../hooks'; import {TextingNavParamsMap} from '../navigation'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../translations'; -import {associateDisplayName} from "../utils"; +import {associateDisplayName} from '../utils'; const styles = StyleSheet.create({ header: { --- src/screens/SearchScreen.tsx @@ -35,7 +35,7 @@ import {useDailyRoster} from '../hooks'; import {TextingNavParamsMap} from '../navigation'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../translations'; -import {associateDisplayName} from "../utils"; +import {associateDisplayName} from '../utils'; const styles = StyleSheet.create({ header: {
fix lint
fix lint
8b7a513c6e5ca955fe3e167328fa94bcec836dcf
--- package-lock.json @@ -86,7 +86,7 @@ "@walmart/shelfavailability-mini-app": "1.5.16", "@walmart/taskit-mini-app": "2.40.8", "@walmart/texting-mini-app": "2.0.29", - "@walmart/time-clock-mini-app": "2.169.0", + "@walmart/time-clock-mini-app": "2.170.0", "@walmart/topstock-mini-app": "1.0.13", "@walmart/ui-components": "1.15.1", "@walmart/welcomeme-mini-app": "0.82.1", @@ -9201,9 +9201,9 @@ "hasInstallScript": true }, "node_modules/@walmart/time-clock-mini-app": { - "version": "2.169.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.169.0.tgz", - "integrity": "sha512-aYTextO1Q5LLanDQWk1Bzs2dJK0Ex4+zMpxma1uB++DdIMvObs4YSENTCY/r6iFnvwmuhxIqJ+XuP4G/70c1tA==", + "version": "2.170.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.170.0.tgz", + "integrity": "sha512-GxR6Wg+LfzQNCek1Fh3SuL6ZZqIlhNb3ps+afDMHCZXXKrz5KwNBRMpYanoyeOZtNTP0+n6SvxGUWMRiFfBVNA==", "hasInstallScript": true, "license": "UNLICENSED", "dependencies": { @@ -33888,9 +33888,9 @@ "integrity": "sha512-Du6CSDtOyhYWft5l8q5TYYNy9c5QE4nRwQ83YyEKH8rbXUbAY3ImmBVoIbocGtR0nKYsILgaCcWjOKWfhFRqTQ==" }, "@walmart/time-clock-mini-app": { - "version": "2.169.0", - "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.169.0.tgz", - "integrity": "sha512-aYTextO1Q5LLanDQWk1Bzs2dJK0Ex4+zMpxma1uB++DdIMvObs4YSENTCY/r6iFnvwmuhxIqJ+XuP4G/70c1tA==", + "version": "2.170.0", + "resolved": "https://npme.walmart.com/@walmart/time-clock-mini-app/-/time-clock-mini-app-2.170.0.tgz", + "integrity": "sha512-GxR6Wg+LfzQNCek1Fh3SuL6ZZqIlhNb3ps+afDMHCZXXKrz5KwNBRMpYanoyeOZtNTP0+n6SvxGUWMRiFfBVNA==", "requires": { "@react-navigation/elements": "^1.3.1", "moment-timezone": "0.5.33", --- package.json @@ -127,7 +127,7 @@ "@walmart/shelfavailability-mini-app": "1.5.16", "@walmart/taskit-mini-app": "2.40.8", "@walmart/texting-mini-app": "2.0.29", - "@walmart/time-clock-mini-app": "2.169.0", + "@walmart/time-clock-mini-app": "2.170.0", "@walmart/topstock-mini-app": "1.0.13", "@walmart/ui-components": "1.15.1", "@walmart/welcomeme-mini-app": "0.82.1",
tcma version upgrade
tcma version upgrade
41bdede374c48a761869f9b283bf6fea2e790bc2
--- __tests__/updates/UpdateCheckViewTest.tsx @@ -43,6 +43,14 @@ const mockUpdateInfo = { releaseNotes: { 'en-US': ['Bug Fixes'], 'es-MX': ['Bug Fixes in Spanish'], + title: { + 'en-US': 'It is time to update the app.', + 'es-MX': 'It is time to update the app in Spanish', + }, + button: { + 'en-US': 'Update now', + 'es-MX': 'Update now in Spanish', + }, }, }; --- __tests__/updates/__snapshots__/UpdateCheckViewTest.tsx.snap @@ -90,7 +90,7 @@ exports[`UpdateVersionModal calls onDownloadPress with correct url 1`] = ` } } > - updates.timeToUpdateApp + It is time to update the app. </Text> <Text style={ @@ -211,7 +211,7 @@ exports[`UpdateVersionModal dispatches expected actions on close button press 1` } } > - updates.timeToUpdateApp + It is time to update the app. </Text> <Text style={ @@ -440,7 +440,7 @@ exports[`UpdateVersionModal matches snapshot 1`] = ` } } > - updates.timeToUpdateApp + It is time to update the app. </Text> <Text style={ @@ -533,7 +533,7 @@ exports[`UpdateVersionModal matches snapshot when update is forced 1`] = ` } } > - updates.timeToUpdateApp + It is time to update the app. </Text> <Text style={ --- src/updates/UpdateVersionView.tsx @@ -30,7 +30,12 @@ const UpdateVersionModal = () => { const {updateInfo, prompt} = useSelector(getUpdateCheckState); const url = Platform.OS === 'ios' ? updateInfo?.ipaURL : updateInfo?.apkURL; const releaseNotes = updateInfo?.releaseNotes[i18n.language] || []; - + const releaseTitleText = + updateInfo?.releaseNotes?.title?.[i18n.language] || + translate('updates.timeToUpdateApp'); + const releaseButtonText = + updateInfo?.releaseNotes?.button?.[i18n.language] || + translate('updates.updateNow'); const onPressClose = () => { dispatch(UpdateCheckActionCreators.setPrompt(false)); dispatch(UpdateCheckActionCreators.checkForUpdatesComplete()); @@ -61,17 +66,14 @@ const UpdateVersionModal = () => { <Image source={Images.Close} /> </TouchableOpacity> )} - <Text style={styles.title}> - {translate('updates.timeToUpdateApp')} - </Text> + <Text style={styles.title}>{releaseTitleText}</Text> {releaseNotes.map(renderReleaseNote)} <View style={styles.downloadView}> <PrimaryButton style={styles.button} testID='downloadButton' - block={true} onPress={onUpdate}> - {translate('updates.updateNow')} + {releaseButtonText} </PrimaryButton> </View> </View> --- src/updates/UpdateVersionViewStyle.ts @@ -46,7 +46,6 @@ export default StyleSheet.create({ justifyContent: 'flex-end', }, button: { - width: 132, marginTop: 32, }, newFeatures: {
Fix/update app screen (#440)
Fix/update app screen (#440) * moving app version check text to CCM and also updating podfile for RN Logger * removing fixed width Co-authored-by: Hitesh Arora <> Co-authored-by: Anthony Helms - awhelms <awhelms@wal-mart.com>
9266086296303d5638ace26cdc95603fefd5284c
--- src/queries/schema.types.ts @@ -1,3 +1,4 @@ +/* eslint-disable no-shadow */ export type Maybe<T> = T | null; export type InputMaybe<T> = Maybe<T>; export type Exact<T extends {[key: string]: unknown}> = {[K in keyof T]: T[K]}; --- src/queries/schema.types.ts @@ -1,3 +1,4 @@ +/* eslint-disable no-shadow */ export type Maybe<T> = T | null; export type InputMaybe<T> = Maybe<T>; export type Exact<T extends {[key: string]: unknown}> = {[K in keyof T]: T[K]};
chore: eslint fix
chore: eslint fix
42da6a485cfcba369a1e074fd0ca5e8e9c74bb39
--- package-lock.json @@ -41,7 +41,7 @@ "@walmart/amp-mini-app": "1.1.72", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", - "@walmart/attendance-mini-app": "3.20.0", + "@walmart/attendance-mini-app": "3.21.0", "@walmart/avp-feature-app": "0.0.32", "@walmart/avp-shared-library": "0.0.53", "@walmart/calling-mini-app": "0.1.8", @@ -8497,9 +8497,9 @@ } }, "node_modules/@walmart/attendance-mini-app": { - "version": "3.20.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.20.0.tgz", - "integrity": "sha512-8blwA/Ju+lCg4ebtFYJHioUy6fWHaxKBjK2IlvFLecI10e01G/es+wjYPSwgczK4j76S1InnBy0IRAXJzAm5aw==", + "version": "3.21.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.21.0.tgz", + "integrity": "sha512-cP1E7mEftAiMGboCSpGb0VH+hP6oED14ACH08onjbV7iv7QDMa8rJ4/yfKS8AsATZO9/SxWcSsIXjGsH6s/Jkw==", "hasInstallScript": true, "dependencies": { "@walmart/wfm-ui": "^0.2.26", @@ -33228,9 +33228,9 @@ } }, "@walmart/attendance-mini-app": { - "version": "3.20.0", - "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.20.0.tgz", - "integrity": "sha512-8blwA/Ju+lCg4ebtFYJHioUy6fWHaxKBjK2IlvFLecI10e01G/es+wjYPSwgczK4j76S1InnBy0IRAXJzAm5aw==", + "version": "3.21.0", + "resolved": "https://npme.walmart.com/@walmart/attendance-mini-app/-/attendance-mini-app-3.21.0.tgz", + "integrity": "sha512-cP1E7mEftAiMGboCSpGb0VH+hP6oED14ACH08onjbV7iv7QDMa8rJ4/yfKS8AsATZO9/SxWcSsIXjGsH6s/Jkw==", "requires": { "@walmart/wfm-ui": "^0.2.26", "moment-timezone": "0.5.40", --- package.json @@ -82,7 +82,7 @@ "@walmart/amp-mini-app": "1.1.72", "@walmart/ask-sam-chat-components": "^0.2.7", "@walmart/ask-sam-mini-app": "1.18.5", - "@walmart/attendance-mini-app": "3.20.0", + "@walmart/attendance-mini-app": "3.21.0", "@walmart/avp-feature-app": "0.0.32", "@walmart/avp-shared-library": "0.0.53", "@walmart/calling-mini-app": "0.1.8",
ama v3.21.0
ama v3.21.0
8d9ebdb6c91b03427a25bb0a8fc67486cdcb6673
--- __tests__/navigation/AssociateHallwayNav/MainStackNavTest.tsx @@ -11,6 +11,10 @@ const mockDispatch = jest.fn(); (useDispatch as jest.Mock).mockReturnValue(mockDispatch); const mockUseSelector = useSelector as jest.Mock; +jest.mock('lodash', () => ({ + debounce: (fn: any) => fn, +})); + jest.mock('../../../src/whatsNew/FeatureRestrictionsScreen', () => ({ FeatureRestrictionsScreen: 'FeatureRestrictionsScreen', })); --- src/navigation/AssociateHallwayNav/MainStackNav.tsx @@ -2,6 +2,7 @@ __DEV__ && console.log('loading associate hallway'); import React, {useEffect} from 'react'; import {useDispatch, useSelector} from 'react-redux'; import {useTranslation} from 'react-i18next'; +import {debounce} from 'lodash'; import {createStackNavigator, TransitionPresets} from '@react-navigation/stack'; import {ActivityMonitor, Header} from '@walmart/ui-components'; import {AskSamMiniApp} from '@walmart/ask-sam-mini-app'; @@ -35,8 +36,8 @@ import { modalTransitionOptions, renderHeaderCloseImage, } from '../NavigationConstants'; -import {MainTabsNav} from './Tabs'; import {withClockOutGuard} from '../ClockOutGuard'; +import {MainTabsNav} from './Tabs'; const DEFAULT_INACTIVITY_TIME = 300000; const DEFAULT_BACKGROUND_IDLE_TIME = 14400000; @@ -94,9 +95,9 @@ export const MainStackNav = () => { AskSamMiniApp.init(); }, [dispatch]); - const onIdleTimeLapsed = (reason: string) => { + const onIdleTimeLapsed = debounce((reason: string) => { dispatch(PinAccessActionCreators.promptForPasscode(reason)); - }; + }, 500); return ( <ActivityMonitor
Adding debounce to activity monitor timeout which is getting called rapidly
Adding debounce to activity monitor timeout which is getting called rapidly
8dfafdde6f4247ae6016843723354fbfa894d938
--- package-lock.json @@ -63,7 +63,7 @@ "@walmart/OneWalmart-MiniApp": "1.0.12", "@walmart/pay-stub-miniapp": "0.9.7", "@walmart/payrollsolution_miniapp": "0.130.6", - "@walmart/price-changes-mini-app": "1.6.9", + "@walmart/price-changes-mini-app": "1.6.10", "@walmart/profile-feature-app": "0.76.0", "@walmart/push-to-talk-mini-app": "1.8.29", "@walmart/react-native-encrypted-storage": "1.1.3", @@ -5520,33 +5520,33 @@ } }, "node_modules/@walmart/price-changes-mini-app": { - "version": "1.6.9", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.6.9.tgz", - "integrity": "sha512-cROZoOHD1aXUGaDD50uYN8yxNna/Vt2pWQ/7k/wWHJ+qoJHT4ZUAYRMVcCrCTtkcJ5yn4MWjXTNVZOxTQVesgA==", + "version": "1.6.10", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.6.10.tgz", + "integrity": "sha512-TIzjXjT8jlsb/OrY7WPr4xUv5RsCsnNN0wwjawIwOHurrZtrFn8f/WjwkY8e6zUC3AlZ4QsHdaKqCD/pfkgGPg==", "peerDependencies": { "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", - "@walmart/counts-component-miniapp": "0.0.41", - "@walmart/functional-components": "2.0.6", - "@walmart/gtp-shared-components": "1.8.17", - "@walmart/ims-print-services-ui": "1.2.0", - "@walmart/react-native-env": "0.2.0", + "@walmart/counts-component-miniapp": "^0.0.41", + "@walmart/functional-components": "^2.0.6", + "@walmart/gtp-shared-components": "^1.8.17", + "@walmart/ims-print-services-ui": "^1.2.0", + "@walmart/react-native-env": "^0.2.0", "@walmart/react-native-logger": "^1.25.0", - "@walmart/react-native-scanner-3.0": "0.1.20", + "@walmart/react-native-scanner-3.0": "^0.1.20", "@walmart/redux-store": "^1.0.15", - "@walmart/ui-components": "1.6.0", - "axios": "0.26.1", + "@walmart/ui-components": "^1.6.0", + "axios": "^0.26.1", "i18next": "^20.2.2", - "lodash": "4.17.21", + "lodash": "^4.17.21", "moment": "^2.29.4", "react": "^17.0.2", "react-i18next": "^11.7.3", - "react-native": "0.67.5", + "react-native": "^0.67.5", "react-native-fast-image": "^8.6.1", - "react-native-hyperlink": "0.0.19", + "react-native-hyperlink": "^0.0.19", "react-native-permissions": "^3.6.1", "react-native-screens": "^3.15.0", - "react-native-webview": "10.7.0", + "react-native-webview": "^10.7.0", "react-native-wm-telemetry": "^0.3.0", "react-redux": "^7.2.1", "redux": "^4.0.5", @@ -24971,9 +24971,9 @@ } }, "@walmart/price-changes-mini-app": { - "version": "1.6.9", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.6.9.tgz", - "integrity": "sha512-cROZoOHD1aXUGaDD50uYN8yxNna/Vt2pWQ/7k/wWHJ+qoJHT4ZUAYRMVcCrCTtkcJ5yn4MWjXTNVZOxTQVesgA==" + "version": "1.6.10", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.6.10.tgz", + "integrity": "sha512-TIzjXjT8jlsb/OrY7WPr4xUv5RsCsnNN0wwjawIwOHurrZtrFn8f/WjwkY8e6zUC3AlZ4QsHdaKqCD/pfkgGPg==" }, "@walmart/profile-feature-app": { "version": "0.76.0", --- package.json @@ -105,7 +105,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/pay-stub-miniapp": "0.9.7", "@walmart/payrollsolution_miniapp": "0.130.6", - "@walmart/price-changes-mini-app": "1.6.9", + "@walmart/price-changes-mini-app": "1.6.10", "@walmart/profile-feature-app": "0.76.0", "@walmart/push-to-talk-mini-app": "1.8.29", "@walmart/react-native-encrypted-storage": "1.1.3",
bumps price changes to 1.6.10
bumps price changes to 1.6.10
d31935a80369a4b8e2922f9aae593252d2a36250
--- __tests__/__snapshots__/AppTest.tsx.snap @@ -39,7 +39,7 @@ exports[`RootContainer renders and fires startup event 1`] = ` "screens": { "Returns": { "screens": { - "Returns.Landing": "returns/:siteId/:printerAddress", + "Returns.Landing": "returns/:siteId/:printerAddress/:orderNumber?/:checkinId?", }, }, }, --- __tests__/core/DeeplinkConfigTest.ts @@ -17,7 +17,7 @@ describe('link config test', () => { screens: { Returns: { screens: { - 'Returns.Landing': 'returns/:siteId/:printerAddress', + 'Returns.Landing': 'returns/:siteId/:printerAddress/:orderNumber?/:checkinId?', }, }, }, --- src/core/DeeplinkConfig.ts @@ -9,11 +9,13 @@ export type AppRootParamList = { 'Returns.Landing': { siteId: string; printerAddress: string; + orderNumber: string; + checkinId: string; }; }; const returnsConfig = { - 'Returns.Landing': 'returns/:siteId/:printerAddress', + 'Returns.Landing': 'returns/:siteId/:printerAddress/:orderNumber?/:checkinId?', }; const prefixes = ['meatwmt://'];
Returns-Gif deeplink url change, includes orderNum & checkinId
Returns-Gif deeplink url change, includes orderNum & checkinId
9f38df5484fde26035da599bdd4bc066483301c6
--- packages/allspark-foundation-hub/src/HubFeature/Hub/Container/utils.ts @@ -8,6 +8,7 @@ import { import { TeamWidgetMapping, ValidatedTeamWidgetMapping } from './types'; import { Images } from '../../Images/images'; import { cloneDeep } from 'lodash'; +import { TeamSwitcherTypes } from '../TeamSwitcher'; export const validateWidgets = (data: { registeredWidgets: string[]; @@ -79,10 +80,39 @@ export const getDefaultTeamsForUserType = ( { teamId: primaryTeam.teamId ?? '', teamLabel: primaryTeam.teamName ?? '', - teamImage: primaryTeam.teamId ? Images[primaryTeam.teamId] : '', + teamImage: primaryTeam.teamId + ? Images[primaryTeam.teamId] + : Images['0000000'], }, ]; } else { return []; } }; + +export const findTeamByLabel = ( + teamList: TeamSwitcherTypes[], + teamLabel: string +) => { + return teamList.find((team) => team.teamLabel === teamLabel); +}; + +export const sorter = ( + data: TeamSwitcherTypes[], + primaryTeam?: Team +): TeamSwitcherTypes[] => { + if (primaryTeam) { + const customSort = (a: TeamSwitcherTypes, b: TeamSwitcherTypes): number => { + if (a.teamId === primaryTeam.teamId) { + return -1; + } + if (b.teamId === primaryTeam.teamId) { + return 1; + } + return a.teamLabel.localeCompare(b.teamLabel); + }; + return [...data].sort(customSort); + } else { + return data; + } +}; --- packages/allspark-foundation-hub/src/HubFeature/Hub/TeamSwitcher/index.tsx @@ -11,13 +11,21 @@ import { useDispatch, useSelector } from 'react-redux'; import { ManagerExperienceCreators } from '../../Redux/actions'; import { AllsparkNavigationClient } from '@walmart/allspark-foundation/Navigation'; import { ManagerExperienceSelectors } from '../../Redux/selectors'; -import { getDefaultTeamsForUserType } from '../Container/utils'; +import { + findTeamByLabel, + getDefaultTeamsForUserType, + sorter, +} from '../Container/utils'; import { UserSelectors, Team } from '@walmart/allspark-foundation/User'; import { EMP_TYPE_HOURLY, EMP_TYPE_SALARIED, MANAGEMENT_TEAMID, MANAGEMENT_TEAMLABEL, + MYTEAMS_TEAMID, + MYTEAMS_TEAMLABEL, + TOTAL_STORE_TEAMID, + TOTAL_STORE_TEAMLABEL, } from '../../constant'; import { useAllsparkImage } from '@walmart/allspark-foundation/Components/context'; import { Images } from '../../Images/images'; @@ -30,6 +38,19 @@ export const TeamSwitcher = ({ refreshing, }: TeamSwitcherProps) => { const { teamData, loading: isLoading } = useUserPreferences(); + const userPrefTeams = teamData.length > 0 ? teamData : undefined; + const userSelectedTeamLabel = useSelector( + ManagerExperienceSelectors.getSelectedTeamPreference + ); + const [teamSwitcherList, setTeamSwitcherList] = useState<TeamSwitcherTypes[]>( + [ + { + teamId: TOTAL_STORE_TEAMID, + teamLabel: TOTAL_STORE_TEAMLABEL, + teamImage: Images.total, + }, + ] + ); const empType: string | undefined = useSelector( UserSelectors.getEmployeeType ); @@ -45,51 +66,70 @@ export const TeamSwitcher = ({ ); const { isOffSite, allTeamsOfStore } = useGetAllTeamsOfStore(); - const getTeamsData = useCallback(() => { - const totalStore = { - teamId: 'total', - teamLabel: 'Total store', + useEffect(() => { + const totalStore: TeamSwitcherTypes = { + teamId: TOTAL_STORE_TEAMID, + teamLabel: TOTAL_STORE_TEAMLABEL, teamImage: Images.total, }; - const myTeams = { - teamId: 'myTeams', - teamLabel: 'My teams', + const myTeams: TeamSwitcherTypes = { + teamId: MYTEAMS_TEAMID, + teamLabel: MYTEAMS_TEAMLABEL, teamImage: Images.myTeams, }; - const management = { + const management: TeamSwitcherTypes = { teamId: MANAGEMENT_TEAMID, teamLabel: MANAGEMENT_TEAMLABEL, teamImage: Images[MANAGEMENT_TEAMID], }; + const selectTeam = (team: TeamSwitcherTypes) => { + setSelectedTeam(team.teamLabel); + onTeamChange(team.teamId); + }; + + let evaluatedTeamList: TeamSwitcherTypes[]; + let evaluatedSelectTeam: TeamSwitcherTypes; + if (isOffSite && empType === EMP_TYPE_SALARIED) { - return [totalStore, management, ...allTeamsOfStore]; + evaluatedTeamList = [totalStore, management, ...allTeamsOfStore]; + evaluatedSelectTeam = management; } else if (isOffSite && empType === EMP_TYPE_HOURLY) { - return [totalStore, ...allTeamsOfStore]; - } else if (teamData.length > 0) { - return [totalStore, myTeams, ...teamData]; + evaluatedTeamList = [totalStore, ...allTeamsOfStore]; + evaluatedSelectTeam = totalStore; + } else if (userPrefTeams) { + const primaryTeam = userTeams?.[0]; + evaluatedTeamList = [ + totalStore, + myTeams, + ...sorter(userPrefTeams, primaryTeam), + ]; + evaluatedSelectTeam = myTeams; } else { - return [totalStore, ...getDefaultTeamsForUserType(empType, userTeams)]; + const defaultTeams = getDefaultTeamsForUserType(empType, userTeams); + evaluatedTeamList = [totalStore, ...defaultTeams]; + evaluatedSelectTeam = defaultTeams[0] || totalStore; } - }, [teamData, empType, userTeams, isOffSite, allTeamsOfStore]); + setTeamSwitcherList(evaluatedTeamList); + selectTeam( + findTeamByLabel(evaluatedTeamList, userSelectedTeamLabel) || + evaluatedSelectTeam + ); + }, [ + userPrefTeams, + empType, + userTeams, + isOffSite, + allTeamsOfStore, + userSelectedTeamLabel, + setSelectedTeam, + onTeamChange, + ]); useEffect(() => { refetch(); }, [refetch]); - useEffect(() => { - if (!selectedTeam) { - const teamDataPreference = getTeamsData(); - if (teamData.length > 0) { - setSelectedTeam(teamDataPreference[0].teamLabel); - } else { - const defaultTeam = getDefaultTeamsForUserType(empType, userTeams)[0]; - setSelectedTeam(defaultTeam?.teamLabel); - onTeamChange(defaultTeam?.teamId); - } - } - }, [selectedTeam, teamData, empType, userTeams, getTeamsData, onTeamChange]); - const handlePress = (teamId: string, teamLabel: string) => { setSelectedTeam(teamLabel); onTeamChange(teamId); @@ -181,7 +221,7 @@ export const TeamSwitcher = ({ <FlatList style={styles.flatListContainer} testID='team-switcher-list' - data={getTeamsData()} + data={teamSwitcherList} renderItem={renderTeamItem} keyExtractor={keyExtractor} horizontal={true} --- packages/allspark-foundation-hub/src/HubFeature/constant.ts @@ -6,3 +6,7 @@ export const MANAGEMENT_TEAMID = '1111111'; export const MANAGEMENT_TEAMLABEL = 'Management'; export const ADMIN_SUPPORT_TEAMID = '1000100'; export const ADMIN_SUPPORT_TEAMLABEL = 'Admin & Support'; +export const TOTAL_STORE_TEAMID = 'total'; +export const TOTAL_STORE_TEAMLABEL = 'Total store'; +export const MYTEAMS_TEAMID = 'myTeams'; +export const MYTEAMS_TEAMLABEL = 'My teams';
feat(ui): team switcher team list sort, default list, selection
feat(ui): team switcher team list sort, default list, selection
8ca2dc249f886790576de1629029dc90af9f5cfd
--- android/app/src/main/AndroidManifest.xml @@ -36,7 +36,6 @@ android:theme="@style/AppTheme" tools:replace="android:allowBackup" android:extractNativeLibs="true" - tools:replace="android:allowBackup" > <!-- disables automatic screen tracking; removing for now due to an issue: https://github.com/firebase/firebase-android-sdk/issues/3240 -->
Update AndroidManifest.xml
Update AndroidManifest.xml
62f43b04872e032060f58e23c79c4c838508cb19
--- package-lock.json @@ -51,7 +51,7 @@ "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.5", - "@walmart/impersonation-mini-app": "1.18.0-138-0d617e4", + "@walmart/impersonation-mini-app": "1.18.1", "@walmart/ims-print-services-ui": "2.1.2", "@walmart/inbox-mini-app": "0.82.3", "@walmart/iteminfo-mini-app": "7.1.4", @@ -5285,9 +5285,9 @@ "license": "UNLICENSED" }, "node_modules/@walmart/impersonation-mini-app": { - "version": "1.18.0-138-0d617e4", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.18.0-138-0d617e4.tgz", - "integrity": "sha512-micw/zgYZsFyucizZAkvwO0p6ySRJ6+ZUUgnoOc10xsEZwp7iKuzqxKZeW7kh82iEWgA2xQkwcdmvdIiFdIzMw==", + "version": "1.18.1", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.18.1.tgz", + "integrity": "sha512-Cyp0VN7Ak+CgLd2RxCEVsJZDtVuQHy/ghtRyyOYm4VW+sw2UuvMXSV6qwzLMRPomEIi2KL3XdaYjNTl3m82DSQ==", "peerDependencies": { "@react-native-community/masked-view": ">=0.1.10", "@react-native-community/picker": ">=1.8.1", @@ -25266,9 +25266,9 @@ } }, "@walmart/impersonation-mini-app": { - "version": "1.18.0-138-0d617e4", - "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.18.0-138-0d617e4.tgz", - "integrity": "sha512-micw/zgYZsFyucizZAkvwO0p6ySRJ6+ZUUgnoOc10xsEZwp7iKuzqxKZeW7kh82iEWgA2xQkwcdmvdIiFdIzMw==" + "version": "1.18.1", + "resolved": "https://npme.walmart.com/@walmart/impersonation-mini-app/-/impersonation-mini-app-1.18.1.tgz", + "integrity": "sha512-Cyp0VN7Ak+CgLd2RxCEVsJZDtVuQHy/ghtRyyOYm4VW+sw2UuvMXSV6qwzLMRPomEIi2KL3XdaYjNTl3m82DSQ==" }, "@walmart/ims-print-services-ui": { "version": "2.1.2",
changing the version for impersonation-mini-app in package-lock.json file
changing the version for impersonation-mini-app in package-lock.json file
14653c67f74799b64fec519d99fbfd74ca664556
--- __tests__/core/httpClientInitTest.ts @@ -1,5 +1,10 @@ import {getStore} from '@walmart/redux-store'; +const mockSessionId = '1234'; +jest.mock('uuid', () => ({ + v4: () => mockSessionId, +})); + jest.mock('@walmart/functional-components', () => ({ defaultHttpClient: { setConfig: jest.fn(), @@ -58,6 +63,7 @@ import { formatToken, flushQueue, enqueue, + getCorrelationId, } from '../../src/core/httpClientInit'; import WMSingleSignOn, { @@ -80,6 +86,7 @@ mockAddListener.mockImplementation( const user: SSOUser = { userId: 'test', + siteId: '100', domain: 'testdomain', accessToken: '123', clockStatus: '1', @@ -150,18 +157,26 @@ describe('flushQueue', () => { }); it('calls queued up requests', async () => { + mockGetStore.mockReturnValue({ + getState: mockGetState.mockReturnValue({ + user: {data: user}, + }), + }); mockGetFreshAccessToken.mockClear(); const token = '9499'; mockGetFreshAccessToken.mockResolvedValue(token); const queueItem = { - request: {headers: {}}, + request: {headers: {} as any}, resolve: jest.fn(), }; enqueue(queueItem); await flushQueue(); expect(mockGetFreshAccessToken).toHaveBeenCalled(); - // @ts-ignore expect(queueItem.request.headers.authorization).toEqual(`Bearer ${token}`); + expect(queueItem.request.headers['WM_QOS.CORRELATION_ID']).toEqual( + `${user.countryCode}-${user.siteId}-${mockSessionId}`, + ); + expect(queueItem.request.headers.SourceClient).toEqual('ALLSPARK'); expect(queueItem.resolve).toHaveBeenCalledWith(queueItem.request); mockGetFreshAccessToken.mockClear(); expect(mockGetFreshAccessToken).not.toHaveBeenCalled(); @@ -175,6 +190,11 @@ describe('createRefreshTokenCallback', () => { it('handles refresh success', async () => { const token = '4321'; + mockGetStore.mockReturnValue({ + getState: mockGetState.mockReturnValue({ + user: {data: user}, + }), + }); mockGetUser.mockResolvedValue(user); mockGetFreshAccessToken.mockResolvedValueOnce(token); const callback = createRefreshTokenCallback(connectedSSO); @@ -182,6 +202,11 @@ describe('createRefreshTokenCallback', () => { expect(request.headers.authorization).toEqual(`Bearer ${token}`); expect(connectedSSO.getFreshAccessToken).toHaveBeenCalled(); + + expect(request.headers['WM_QOS.CORRELATION_ID']).toEqual( + `${user.countryCode}-${user.siteId}-${mockSessionId}`, + ); + expect(request.headers.SourceClient).toEqual('ALLSPARK'); }); it('handles refresh token failure', async () => { @@ -229,6 +254,7 @@ describe('createRefreshTokenCallback', () => { expect(request.headers.impersonated_user).toEqual(true); expect(request.headers.impersonated_jwt).toEqual('123456'); }); + it('should not add impersontee jwt token when the data is not present in redux', async () => { mockGetStore.mockReturnValue({ getState: mockGetState.mockReturnValue({ @@ -246,3 +272,43 @@ describe('createRefreshTokenCallback', () => { expect(request.headers.impersonated_jwt).toEqual(''); }); }); + +describe('getCorrelationId', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + it('returns expected id when user is passed; does not call get state', () => { + const id = getCorrelationId(user); + + expect(id).toEqual(`${user.countryCode}-${user.siteId}-${mockSessionId}`); + expect(mockGetStore).not.toHaveBeenCalled(); + expect(mockGetState).not.toHaveBeenCalled(); + }); + + it('returns expected id when user is not passed; calls get state', () => { + mockGetStore.mockReturnValue({ + getState: mockGetState.mockReturnValue({ + user: {data: user}, + }), + }); + const id = getCorrelationId(); + + expect(id).toEqual(`${user.countryCode}-${user.siteId}-${mockSessionId}`); + expect(mockGetStore).toHaveBeenCalled(); + expect(mockGetState).toHaveBeenCalled(); + }); + + it('handles user data being undefined; calls get state', () => { + mockGetStore.mockReturnValue({ + getState: mockGetState.mockReturnValue({ + user: {data: null}, + }), + }); + const id = getCorrelationId(); + + expect(id).toEqual(mockSessionId); + expect(mockGetStore).toHaveBeenCalled(); + expect(mockGetState).toHaveBeenCalled(); + }); +}); --- package-lock.json @@ -2881,6 +2881,12 @@ "resolved": "https://npme.walmart.com/@types/stack-utils/-/stack-utils-1.0.1.tgz", "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==" }, + "@types/uuid": { + "version": "8.3.0", + "resolved": "https://npme.walmart.com/@types/uuid/-/uuid-8.3.0.tgz", + "integrity": "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==", + "dev": true + }, "@types/yargs": { "version": "15.0.9", "resolved": "https://npme.walmart.com/@types/yargs/-/yargs-15.0.9.tgz", --- package.json @@ -133,6 +133,7 @@ "@types/react-test-renderer": "^16.9.2", "@types/seamless-immutable": "^7.1.15", "@types/semver": "^7.3.4", + "@types/uuid": "^8.3.0", "@typescript-eslint/eslint-plugin": "^2.27.0", "@typescript-eslint/parser": "^2.27.0", "babel-jest": "^25.1.0", --- src/core/httpClientInit.ts @@ -3,13 +3,14 @@ import {defaultHttpClient} from '@walmart/functional-components'; import type {ConnectedSSO} from 'react-native-connect-sso-redux'; import {connectedSSO} from '../auth'; import {DefaultLogger} from '@walmart/react-native-logger'; -import {getStore} from '@walmart/redux-store'; +import {getStore, User as SsoUser} from '@walmart/redux-store'; import {clearImpersonation} from '@walmart/impersonation-mini-app'; import WMSingleSignOn, { ssoEventEmitter, SSOPingFedEventData, SSOPingFedEvents, } from 'react-native-ssmp-sso-allspark'; +import {v4 as uuidV4} from 'uuid'; interface QueueItem { request: any; @@ -38,11 +39,29 @@ export const flushQueue = async () => { while (waitingForSignOnQueue.length > 0) { const {request, resolve} = waitingForSignOnQueue.shift()!; request.headers.authorization = formatToken(token); + request.headers['WM_QOS.CORRELATION_ID'] = getCorrelationId(); + request.headers.SourceClient = 'ALLSPARK'; resolve(request); } } }; +export const getCorrelationId = (user?: SsoUser | null) => { + let correlationId = ''; + const {countryCode, siteId} = user || getStore().getState().user.data || {}; + const uniqueId = uuidV4(); + + if (countryCode) { + correlationId += `${countryCode}-`; + } + + if (siteId) { + correlationId += `${siteId}-`; + } + + return `${correlationId}${uniqueId}`; +}; + export const createRefreshTokenCallback = (sso: ConnectedSSO) => async ( request: any, ) => { @@ -51,7 +70,11 @@ export const createRefreshTokenCallback = (sso: ConnectedSSO) => async ( try { const token = await sso.getFreshAccessToken(); request.headers.authorization = formatToken(token); + const {user, impersonation} = getStore().getState(); + request.headers['WM_QOS.CORRELATION_ID'] = getCorrelationId(user.data); + request.headers.SourceClient = 'ALLSPARK'; + if (user.impersonated) { const {impersonatee} = impersonation; request.headers.impersonated_user = true;
Correlation ID (#316)
Correlation ID (#316) * Adding correlation id to http client interceptor * Adding correlation id headers to flushQueue call * Adding tests for getCorrelationId * Making country and site dynamic in correlation id * Updating header name Co-authored-by: rlane1 <rlane1@walmart.com> Co-authored-by: Korede Okelowo - ookelo1 <Oluwakorede.Okelowo@walmart.com>
1357e5e5578ea822324c18d63612cdd5d6144304
--- package-lock.json @@ -58,7 +58,7 @@ "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.0.10", "@walmart/impersonation-mini-app": "1.20.6", - "@walmart/ims-print-services-ui": "2.7.1", + "@walmart/ims-print-services-ui": "2.7.2", "@walmart/inbox-mini-app": "0.88.9", "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4", @@ -8501,9 +8501,9 @@ } }, "node_modules/@walmart/ims-print-services-ui": { - "version": "2.7.1", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.1.tgz", - "integrity": "sha512-WYUgFQZYFuTnfxwi7KO1U1vNuL9W8FQDS5rvokV6JmwMS1ROIvNpmx8zRhUvj4wu+urz5JqWKdmZqWghwEOSJw==", + "version": "2.7.2", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.2.tgz", + "integrity": "sha512-U1YiY7EjsRvzHVDUq763PXWVF2bsRaugd/Vp2Y5g4uqKIp5rdgKc0p7qGp7suG+A/JA6ZnVqlbf3MN+G7lix+g==", "peerDependencies": { "@react-native-firebase/analytics": ">=10.5.1", "@react-native-firebase/app": ">=10.5.0", @@ -34353,9 +34353,9 @@ "integrity": "sha512-5qaxHHlwLNsI2QOghCAlp1FS3sE0bdJ9DOswgEClQgRdZwFTZTY1F1qWkLmWVdnZm3/k7BTE3RT/Ltfy0rbfxg==" }, "@walmart/ims-print-services-ui": { - "version": "2.7.1", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.1.tgz", - "integrity": "sha512-WYUgFQZYFuTnfxwi7KO1U1vNuL9W8FQDS5rvokV6JmwMS1ROIvNpmx8zRhUvj4wu+urz5JqWKdmZqWghwEOSJw==" + "version": "2.7.2", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.7.2.tgz", + "integrity": "sha512-U1YiY7EjsRvzHVDUq763PXWVF2bsRaugd/Vp2Y5g4uqKIp5rdgKc0p7qGp7suG+A/JA6ZnVqlbf3MN+G7lix+g==" }, "@walmart/inbox-mini-app": { "version": "0.88.9", --- package.json @@ -99,7 +99,7 @@ "@walmart/gta-react-native-calendars": "0.1.0", "@walmart/gtp-shared-components": "2.0.10", "@walmart/impersonation-mini-app": "1.20.6", - "@walmart/ims-print-services-ui": "2.7.1", + "@walmart/ims-print-services-ui": "2.7.2", "@walmart/inbox-mini-app": "0.88.9", "@walmart/iteminfo-mini-app": "7.6.3", "@walmart/manager-approvals-miniapp": "0.2.4",
Bump print UI patch version
Bump print UI patch version
28e81bb52d117ec2be03319851f28bfdb61468f6
--- package.json @@ -92,7 +92,7 @@ "@walmart/attendance-mini-app": "3.174.5", "@walmart/avp-feature-app": "0.26.15", "@walmart/avp-shared-library": "0.25.36", - "@walmart/backroom-mini-app": "1.16.1", + "@walmart/backroom-mini-app": "1.16.2", "@walmart/beneficiary-online-mini-app": "0.1.19", "@walmart/beneficiary-online-shared-library": "1.2.6", "@walmart/calling-mini-app": "0.8.18", --- yarn.lock @@ -7450,9 +7450,9 @@ __metadata: languageName: node linkType: hard -"@walmart/backroom-mini-app@npm:1.16.1": - version: 1.16.1 - resolution: "@walmart/backroom-mini-app@npm:1.16.1::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fbackroom-mini-app%2F-%2F%40walmart%2Fbackroom-mini-app-1.16.1.tgz" +"@walmart/backroom-mini-app@npm:1.16.2": + version: 1.16.2 + resolution: "@walmart/backroom-mini-app@npm:1.16.2::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fbackroom-mini-app%2F-%2F%40walmart%2Fbackroom-mini-app-1.16.2.tgz" peerDependencies: "@react-navigation/native": ^6.0.0 "@react-navigation/stack": ^6.1.0 @@ -7474,7 +7474,7 @@ __metadata: react-native-svg-transformer: ">=1.0.0" react-redux: ">=8.0.0" redux: ">=4.0.0" - checksum: 10c0/0535fba2b3b05634656590fb71ceeb1cd74b526add855aec88830268f77b05d55def9c7262919c1f694a019bfa9282ccf65a83fe0ea0a8f016d6c96d0690284f + checksum: 10c0/fb75845cfd3445fca057d7783e2ca4d1b65b8d508ffdf6b58883487dc597e8bb1783985d8a18e9c579883859fbbdaa0c21dde3229e6950bdaca31569f572ff2a languageName: node linkType: hard @@ -8333,7 +8333,7 @@ __metadata: "@walmart/attendance-mini-app": "npm:3.174.5" "@walmart/avp-feature-app": "npm:0.26.15" "@walmart/avp-shared-library": "npm:0.25.36" - "@walmart/backroom-mini-app": "npm:1.16.1" + "@walmart/backroom-mini-app": "npm:1.16.2" "@walmart/beneficiary-online-mini-app": "npm:0.1.19" "@walmart/beneficiary-online-shared-library": "npm:1.2.6" "@walmart/calling-mini-app": "npm:0.8.18"
fix: Fix backroom image url (#4856)
fix: Fix backroom image url (#4856)
01c3e9ae0c09e9af90dd09785f74e14606aeea8d
--- packages/allspark-foundation-hub/src/HubFeature/SupplyChain/Screens/OnboardingScreen/OnboardingContext.tsx @@ -63,19 +63,19 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => { const getMyTeamData = useCallback(async () => { try { const userPreferences = - data?.associatePreferences?.meAtWalmartPreferences + await data?.associatePreferences?.meAtWalmartPreferences ?.managerExperiencePreferences?.mySupplyChainTeams; - const myTeamsPreferences = - (await teamPreferenceData) || shiftPreferenceData; - + const myTeamsPreferences = await (teamPreferenceData || + shiftPreferenceData); loggerRef.current.info('Team data fetched successfully'); if (userPreferences === null) { setShowOnboarding(true); + return userPreferences; } hideOnboardingFlow(); return myTeamsPreferences; - } catch (error: any) { + } catch (error) { loggerRef.current.error('Error:', error); onboardingTelemetryRef.current.logEvent('preference_data_error_event', { message: 'Onboarding failed', @@ -83,7 +83,6 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => { throw error; } }, [onCompleted]); - useEffect(() => { // checkOnboarding(); if (eligibleForOnboarding) { @@ -93,9 +92,7 @@ export const SupplyChainOnboardingProvider = ({ children }: any) => { // scenario 1: if userPreferences is empty - (user has not selected any team, we kick in the onboarding); // if user have pref, he has already been onboarded // scenario for skip: if user skips, until user reinstalls app (clear storage etc), we dont show onboarding - const userOnboarded = myTeamData && myTeamData.length >= 0; - const isUserOnboarded = myTeamData === null; if (!userOnboarded || userOnboarded === null || isUserOnboarded) { loggerRef.current.info('Starting onboarding process...');
Adding refresh data changes
Adding refresh data changes
6864ac7014c236da923199018a8b4b90a25b06bc
--- src/components/ActionButton/ClockStatusIndicator.tsx @@ -0,0 +1,64 @@ +import React from 'react'; +import {StyleProp, StyleSheet, TextStyle, View, ViewStyle} from 'react-native'; +import {Body, colors} from '@walmart/gtp-shared-components'; +import {useTranslation} from 'react-i18next'; +import {TEXTING_I18N_NAMESPACE} from '../translations'; + +const styles = StyleSheet.create({ + indicatorRow: { + flexDirection: 'row', + alignItems: 'center', + }, + clockStatus: { + height: 8, + width: 8, + borderRadius: 12, + borderWidth: 1, + }, + statusText: { + marginLeft: 4, + }, + clockedIn: { + backgroundColor: '#6dd400', + borderColor: colors.green[100], + }, + clockedOut: { + backgroundColor: colors.white, + borderColor: colors.gray[120], + }, +}); + +type PresenceIndicatorProps = { + isClockedIn: boolean | {}; + showIndicator?: boolean; + showText?: boolean; + style?: StyleProp<ViewStyle>; + textStyle?: StyleProp<TextStyle>; +}; + +export const ClockStatusIndicator = ({ + isClockedIn, + showIndicator = true, + showText = false, + style, + textStyle, +}: PresenceIndicatorProps) => { + const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); + return ( + <View style={[styles.indicatorRow, style]}> + {showIndicator && ( + <View + style={[ + styles.clockStatus, + isClockedIn ? styles.clockedIn : styles.clockedOut, + ]} + /> + )} + {showText && ( + <Body UNSAFE_style={textStyle}> + {isClockedIn ? t('userHeader.clockedIn') : t('userHeader.clockedOut')} + </Body> + )} + </View> + ); +}; --- src/components/Roster/AssociateListItem.tsx @@ -12,13 +12,19 @@ import {TEXTING_I18N_NAMESPACE} from '../../translations'; import {shallowEqual, useSelector} from 'react-redux'; import {SiteSelectors} from '@walmart/redux-store'; import {useRbacConfigWithJobCode, useUserIsInRoster} from '../../hooks'; -import {associateDisplayName, encryptUserId, formatSchedule} from '../../utils'; +import { + associateDisplayName, + associateIsClockedIn, + encryptUserId, + formatSchedule, +} from '../../utils'; import {styles} from '../AssociateRosterItem/style'; import namecase from 'namecase'; import {Text, TouchableOpacity, View} from 'react-native'; import {goToIndividualSchedule} from '../../navigation/utils'; import {StatusChip} from '../StatusChip'; import {isNil} from 'lodash'; +import {ClockStatusIndicator} from '../ActionButton/ClockStatusIndicator'; interface AssociateListItemProps { associate: AssociateRosterItem; @@ -50,6 +56,7 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( ); const isStoreScheduleValid = associate?.storeSchedule && associate?.storeSchedule?.length > 0; + const isClockedIn = associateIsClockedIn(associate); return ( <Card @@ -63,11 +70,10 @@ export const AssociateListItem: React.FC<AssociateListItemProps> = React.memo( UNSAFE_style={[styles.item, roundBottomCorners && styles.lastItem]} title={associateName} leading={ - <> - {/* - //TODO: Clock Status indicator goes here - */} - </> + <ClockStatusIndicator + isClockedIn={isClockedIn} + style={styles.badge} + /> } trailing={ <>
adding back clock status indicator
adding back clock status indicator
7b63c7744dac7f1107937646c622a2014c57d816
--- package-lock.json @@ -48,7 +48,7 @@ "@walmart/core-services-allspark": "~2.13.1", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.4", - "@walmart/counts-component-miniapp": "0.1.6", + "@walmart/counts-component-miniapp": "0.1.8", "@walmart/emergency-mini-app": "1.26.5", "@walmart/exception-mini-app": "1.6.5", "@walmart/facilities-management-miniapp": "0.6.93", @@ -70,7 +70,7 @@ "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.13.5", "@walmart/payrollsolution_miniapp": "0.134.3", - "@walmart/price-changes-mini-app": "1.10.1", + "@walmart/price-changes-mini-app": "1.10.2", "@walmart/profile-feature-app": "0.334.3", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0", @@ -8701,16 +8701,16 @@ } }, "node_modules/@walmart/counts-component-miniapp": { - "version": "0.1.6", - "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.6.tgz", - "integrity": "sha512-WRW2jpb7pJJ423n8Vlzq2rKg68Rd4fSIvQ7mcIzwXnoOzdoZRoxkKTCYhLbjQW+biRORThwrQpbDixGQF6wj4g==", + "version": "0.1.8", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.8.tgz", + "integrity": "sha512-QonBFTA1b84JM4MIYMPITskrPjiLBbkh5Snrd5NspoFCUCWXB5dO8o1wdn8bttPd8cJWeWM2I/JYjc5GubXqkA==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", "@walmart/core-services-allspark": "~1.10.11", "@walmart/core-utils": "~1.3.0", - "@walmart/gtp-shared-components": "2.0.2", + "@walmart/gtp-shared-components": "2.1.3", "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/redux-store": "^3.1.3", "i18next": "^22.0.1", @@ -9398,15 +9398,15 @@ } }, "node_modules/@walmart/price-changes-mini-app": { - "version": "1.10.1", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.10.1.tgz", - "integrity": "sha512-Jht/q+XDGe4mTqsjUQNNudNxeNF+N6/3dCJZ12IqIvL4ynY1sfOafLCCJ53VoEQwjlJUatSvS1toU5Yh/MYD+g==", + "version": "1.10.2", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.10.2.tgz", + "integrity": "sha512-NUnnrYrXo49QMyk8+VBzOoe8a31ERJmjGpKr3+TqEj8mSe9+Ys1G3muz++gWQ4a/j4/R1vglw2CNamYy8Pnz5A==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", "@react-navigation/stack": "^6.1.0", - "@walmart/counts-component-miniapp": "0.1.5", - "@walmart/gtp-shared-components": "2.0.2", + "@walmart/counts-component-miniapp": "0.1.8", + "@walmart/gtp-shared-components": "2.1.3", "@walmart/ims-print-services-ui": "2.2.1", "@walmart/react-native-scanner-3.0": "^0.1.27", "@walmart/redux-store": "3.1.3", @@ -33237,9 +33237,9 @@ } }, "@walmart/counts-component-miniapp": { - "version": "0.1.6", - "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.6.tgz", - "integrity": "sha512-WRW2jpb7pJJ423n8Vlzq2rKg68Rd4fSIvQ7mcIzwXnoOzdoZRoxkKTCYhLbjQW+biRORThwrQpbDixGQF6wj4g==" + "version": "0.1.8", + "resolved": "https://npme.walmart.com/@walmart/counts-component-miniapp/-/counts-component-miniapp-0.1.8.tgz", + "integrity": "sha512-QonBFTA1b84JM4MIYMPITskrPjiLBbkh5Snrd5NspoFCUCWXB5dO8o1wdn8bttPd8cJWeWM2I/JYjc5GubXqkA==" }, "@walmart/emergency-mini-app": { "version": "1.26.5", @@ -33432,9 +33432,9 @@ } }, "@walmart/price-changes-mini-app": { - "version": "1.10.1", - "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.10.1.tgz", - "integrity": "sha512-Jht/q+XDGe4mTqsjUQNNudNxeNF+N6/3dCJZ12IqIvL4ynY1sfOafLCCJ53VoEQwjlJUatSvS1toU5Yh/MYD+g==" + "version": "1.10.2", + "resolved": "https://npme.walmart.com/@walmart/price-changes-mini-app/-/price-changes-mini-app-1.10.2.tgz", + "integrity": "sha512-NUnnrYrXo49QMyk8+VBzOoe8a31ERJmjGpKr3+TqEj8mSe9+Ys1G3muz++gWQ4a/j4/R1vglw2CNamYy8Pnz5A==" }, "@walmart/profile-feature-app": { "version": "0.334.3", --- package.json @@ -89,7 +89,7 @@ "@walmart/core-services-allspark": "~2.13.1", "@walmart/core-utils": "~2.0.5", "@walmart/core-widget-registry": "~1.2.4", - "@walmart/counts-component-miniapp": "0.1.6", + "@walmart/counts-component-miniapp": "0.1.8", "@walmart/emergency-mini-app": "1.26.5", "@walmart/exception-mini-app": "1.6.5", "@walmart/facilities-management-miniapp": "0.6.93", @@ -111,7 +111,7 @@ "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.13.5", "@walmart/payrollsolution_miniapp": "0.134.3", - "@walmart/price-changes-mini-app": "1.10.1", + "@walmart/price-changes-mini-app": "1.10.2", "@walmart/profile-feature-app": "0.334.3", "@walmart/react-native-encrypted-storage": "1.1.3", "@walmart/react-native-env": "0.2.0",
PC, Counts Drop17
PC, Counts Drop17
9a99191222b2c50b158736fa331efe6927806ec1
--- packages/allspark-foundation/__tests__/HTTP/retryInterceptor/utils.test.ts @@ -1,4 +1,4 @@ -import { isNetworkError, isTimeout, isRetryRequired } from '../../../src/HTTP/retryInterceptor/utils'; +import { isNetworkError, isTimeout, isRetryRequired, isForceRetryRequired } from '../../../src/HTTP/retryInterceptor/utils'; import { HttpClientError } from '../../../src/HTTP/types'; describe('Utility Functions', () => { @@ -40,4 +40,8 @@ describe('Utility Functions', () => { const errorCodes = [500, 502, 503]; expect(isRetryRequired(error, errorCodes)).toBe(false); }); + it('should return true for isForceRetryRequired', () => { + const error = { response: { status: 404 }, message: 'network error:the network connection was lost', request: { _response: 'network error:the network connection was lost' }}; + expect(isForceRetryRequired(error)).toBe(true); + }); }); --- packages/allspark-foundation/__tests__/LocalStorage/client.test.tsx @@ -1,6 +1,8 @@ import { LocalStorageClient } from '../../src/LocalStorage/client'; import AsyncStorage from '@react-native-async-storage/async-storage'; +const consoleSpy = jest.spyOn(console, 'warn'); + describe('LocalStorageClient', () => { let client; @@ -113,8 +115,17 @@ describe('LocalStorageClient', () => { ]); }); + test('should return existing client with warning', () => { + const featureClient1 = client.createFeatureInstance('featureId'); + client['_isFeatureInstance'] = true; + const featureClient2 = client.createFeatureInstance('featureId'); + expect(consoleSpy).toHaveBeenCalledWith(`Attempting to create a local storage feature instance on a feature instance: featureId. This is not allowed, returning existing instance.`); + expect(client).toBe(featureClient2); + }); + test('should return existing feature instance', () => { const featureClient1 = client.createFeatureInstance('featureId'); + client['_isFeatureInstance'] = false; const featureClient2 = client.createFeatureInstance('featureId'); expect(featureClient1).toBe(featureClient2); }); @@ -221,6 +232,10 @@ describe('LocalStorageClient', () => { ]); }); + test('should getContainerInstance', () => { + expect(client.getContainerInstance()).toBe(client); + }) + //Error cases test('should get an item', async () => { (AsyncStorage.getItem as jest.Mock).mockResolvedValue(JSON.stringify(null)); --- packages/allspark-foundation/__tests__/Notification/client.test.ts @@ -257,4 +257,10 @@ describe('NotificationClient', () => { await client.setAuthToken(params); expect(Sumo.setAuthToken).toHaveBeenCalledWith(params); }); + it('should addListener', () => { + const handlerMock = jest.fn(); + client['_EventManager'].addListener = handlerMock; + client.addListener('onForegroundNotification', handlerMock, {id: 'test-id'}); + expect(client['_EventManager'].addListener).toHaveBeenCalledWith('onForegroundNotification', handlerMock, {id: 'test-id'}); + }) }); --- packages/allspark-foundation/__tests__/Translation/modals/client.test.ts @@ -19,6 +19,8 @@ jest.mock('react-native', () => ({ }, })); +const consoleWarnSpy = jest.spyOn(console, 'warn'); + describe('TranslationFeatureClient', () => { let client: TranslationFeatureClient; let clientF; @@ -71,6 +73,14 @@ describe('TranslationFeatureClient', () => { featureClient ); }); + it('should return the existing feature client', () => { + const featureClient = + AllsparkTranslationClient.createFeatureClient('feature1'); + const featureClient2 = AllsparkTranslationClient.createFeatureClient('feature1'); + expect(featureClient2).toBe( + featureClient + ); + }); it('should return locale config for provided language code', () => { const config = clientF.getLocaleConfig('es-MX'); expect(config).toEqual({ dateFormat: 'DD/MM/YYYY', currency: 'MX$' }); @@ -104,4 +114,40 @@ describe('TranslationFeatureClient', () => { await AllsparkTranslationClient.syncToDeviceLanguage(); expect(AllsparkTranslationClient.language).toBe(allowedDeviceLanguage); }); + it('should sync language with the device default language, when current language is different', async () => { + AllsparkTranslationClient.language = 'es-MX'; + await AllsparkTranslationClient.syncToDeviceLanguage(); + expect(AllsparkTranslationClient.language).toBe('en-US'); + }); + + it('should initialize TranslationClient', () => { + const options = {resources: {'en-US': {}, 'es-MX': {}} , supportedLanguages: ['en-US', 'es-MX']}; + AllsparkTranslationClient.initialize(options); + expect(AllsparkTranslationClient.getSupportedLanguages()).toBe(options.supportedLanguages); + }); + it('should set the default namespace TranslationClient', () => { + AllsparkTranslationClient.setDefaultNamespace('test-ns'); + expect(consoleWarnSpy).toHaveBeenCalledWith('Attempted to set default namespace on TranslationClient after it was already set.', {"attempted": "test-ns", "current": "container"}); + }); + it('should return undefined config for select', () => { + const languageConfig = undefined; + const result = AllsparkTranslationClient.select(languageConfig); + expect(result).toBe(languageConfig); + }); + it('should return string config for select', () => { + const languageConfig = 'config'; + const result = AllsparkTranslationClient.select(languageConfig); + expect(result).toBe(languageConfig); + }); + it('should return string config for select', () => { + const languageConfig = {'en-US': 'value'}; + const result = AllsparkTranslationClient.select(languageConfig); + expect(result).toBe(languageConfig['en-US']); + }); + it('should return config for select when no current language set', () => { + AllsparkTranslationClient.language = undefined; + const languageConfig = {'en-US': 'value'}; + const result = AllsparkTranslationClient.select(languageConfig); + expect(result).toBe(languageConfig['en-US']); + }); });
test: increase coverage for clients
test: increase coverage for clients
1ca50fbfeda516878d69a07a9a6a66cb9e124b2b
--- .looper-pr.yml @@ -30,4 +30,3 @@ envs: MONO_REPO_BASE_BRANCH: develop AUTHOR: temp SLACK_CHANNEL: "smdv-miniapp" -
chore(ui): update looper yml
chore(ui): update looper yml
c2bc596fcfb19cf96a99ae3db82053bdfa44e757
--- src/screens/TabsScreen.tsx @@ -8,7 +8,7 @@ import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../translations'; import {WarningBanner} from '../containers/WarningBanner'; import {WMConnectMiniApp} from '@walmart/wmconnect-mini-app'; -import {RosterScreen} from '@walmart/roster-mini-app'; +import {RosterMiniApp} from '@walmart/roster-mini-app'; type TabsScreenProps = { navigation: StackNavigationProp<TextingNavParamsMap, 'myTeam.tabs'>; @@ -33,7 +33,7 @@ export const TabsScreen: React.FC<TabsScreenProps> = () => { title: t('tabsScreen.rosterTab')!, lazy: true, }} - component={RosterScreen} //TODO: Import from roster mini app + component={RosterMiniApp} //TODO: Import from roster mini app /> <MainTab.Screen name={'messages'}
Update roster mini app integration
Update roster mini app integration
7c16f84ffcf18d694067146be93967661ffce50c
--- targets/US/ios/Podfile @@ -29,6 +29,7 @@ require Pod::Executable.execute_command('node', ['-p', # @customization # Seup specific permissions for the project setup_permissions([ + 'BluetoothPeripheral', 'Camera', 'LocationWhenInUse', 'Notifications' --- targets/US/ios/Podfile.lock @@ -2896,7 +2896,7 @@ SPEC CHECKSUMS: RNGestureHandler: bc2cdb2dc42facdf34992ae364b8a728e19a3686 RNImageCropPicker: 648356d68fbf9911a1016b3e3723885d28373eda RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364 - RNPermissions: 438c75db343dc7cb218befcc63e3b5eb395f6f73 + RNPermissions: 9146d07de144fc263afd0dc9cc75d26efea5f1e6 RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c RNReanimated: 7171bba9a3f9ecfe5bdccb04ea0063bcc6c4c12c RNScreens: 29418ceffb585b8f0ebd363de304288c3dce8323 @@ -2924,6 +2924,6 @@ SPEC CHECKSUMS: wifi-store-locator: 501fca0a220c725ed93ab403635c0f246a8ce7e3 Yoga: c716aea2ee01df6258550c7505fa61b248145ced -PODFILE CHECKSUM: 17e750d8df86ae62ba07284ce6cb973a761640ea +PODFILE CHECKSUM: cb246e6a4b567bc76ce34f7c1d86af2023ad1231 COCOAPODS: 1.14.3
Add BluetoothPeripheral permission to Podfile
Add BluetoothPeripheral permission to Podfile
4a803dcea4a8125bf30f8dfbdd8eb6ed0cda4f1f
--- jest.config.js @@ -18,7 +18,7 @@ module.exports = { global: { statements: 85, branches: 75, - functions: 85, + functions: 80, lines: 85, }, },
test(ui): update coverage
test(ui): update coverage
4cfdb539e8ed221c36f8f5695903f6ff7936a1e9
--- src/managerExperience/components/RosterMessageButton/RosterMessageButton.tsx @@ -38,6 +38,7 @@ export const RosterMessageButton = ({teamIds}: RosterMessageButtonProps) => { return ( <View style={styles.container}> <Button + accessibilityLabel={messageLabel} testID='messageBtn' UNSAFE_style={styles.messageButton} variant='secondary'
refactor: add accessibility to the button element
refactor: add accessibility to the button element
b333ac2916779c3bb8c12e669e0150c8b2469992
--- .github/pull_request_template.md @@ -6,10 +6,10 @@ PR/Template Process for Allspark-core: [Link](https://confluence.walmart.com/pag | ------------------------------------------------------------------------- | ## Links to JIRA tickets: -<br/> + ## Please describe the changes, problems and solutions this PR is addressing: -<br/> + ## App changes ### Types of changes
Update pull_request_template.md
Update pull_request_template.md
5f19a70b54fea8305b18cbc756d909c002a4c918
--- package-lock.json @@ -79,7 +79,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.1", - "@walmart/receipt-check-miniapp": "1.17.3", + "@walmart/receipt-check-miniapp": "1.17.4", "@walmart/redux-store": "3.7.0", "@walmart/returns-mini-app": "3.13.0", "@walmart/schedule-mini-app": "0.63.0", @@ -9564,9 +9564,9 @@ } }, "node_modules/@walmart/receipt-check-miniapp": { - "version": "1.17.3", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.17.3.tgz", - "integrity": "sha512-K9CSiLQK8nZ/pE7VdR1FXctyIPNG82bknAByqWtmhcxEIjKKQqV3sAf0zmIJ39BhE/8HhrWrGlO/t4n7l/5TxA==", + "version": "1.17.4", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.17.4.tgz", + "integrity": "sha512-UPY1NuzqTpkWABDpSCRMZeDYzPy8UyFUgZRavrSsFiN1jTIhTKHf6gDHYCWuPCIFjddZuvznXZDfwhQH2Hj+HA==", "hasInstallScript": true, "dependencies": { "@walmart/tcnumber": "^2.3.3", @@ -29417,7 +29417,7 @@ "requires": { "mv": "~2", "safe-json-stringify": "~1", - "uuid": "^8.0.0" + "uuid": "^3.3.2" } }, "@expo/cli": { @@ -30107,7 +30107,7 @@ "md5": "^2.2.1", "node-fetch": "^2.6.1", "remove-trailing-slash": "^0.1.0", - "uuid": "^8.3.2" + "uuid": "^3.3.2" } }, "@expo/sdk-runtime-versions": { @@ -33498,9 +33498,9 @@ "integrity": "sha512-jGJ2GDvDka1L8scmqvU2puNj93TFRgpr61ef4XyFO+FPUIPhs4CUtxDAChg4XIHMjLcNkQOwpc2mtz4A01wJfg==" }, "@walmart/receipt-check-miniapp": { - "version": "1.17.3", - "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.17.3.tgz", - "integrity": "sha512-K9CSiLQK8nZ/pE7VdR1FXctyIPNG82bknAByqWtmhcxEIjKKQqV3sAf0zmIJ39BhE/8HhrWrGlO/t4n7l/5TxA==", + "version": "1.17.4", + "resolved": "https://npme.walmart.com/@walmart/receipt-check-miniapp/-/receipt-check-miniapp-1.17.4.tgz", + "integrity": "sha512-UPY1NuzqTpkWABDpSCRMZeDYzPy8UyFUgZRavrSsFiN1jTIhTKHf6gDHYCWuPCIFjddZuvznXZDfwhQH2Hj+HA==", "requires": { "@walmart/tcnumber": "^2.3.3", "@xstate/react": "^3.0.1", --- package.json @@ -120,7 +120,7 @@ "@walmart/react-native-shared-navigation": "1.0.2", "@walmart/react-native-store-map": "0.3.7", "@walmart/react-native-sumo-sdk": "2.6.1", - "@walmart/receipt-check-miniapp": "1.17.3", + "@walmart/receipt-check-miniapp": "1.17.4", "@walmart/redux-store": "3.7.0", "@walmart/returns-mini-app": "3.13.0", "@walmart/schedule-mini-app": "0.63.0",
update for fix
update for fix
2258f67e5079a244a36c744f8b790ce415c45018
--- __tests__/__mocks__/@walmart/facilities-management-miniapp.js @@ -0,0 +1,3 @@ +module.exports = { + FacilitiesMaintainanceStack: 'FacilitiesMaintainanceStack', +}; --- __tests__/navigation/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -214,6 +214,24 @@ Array [ component="StoreInfoModal" name="Core.StoreInfoModal" /> + <Screen + component="FacilitiesMaintainanceStack" + initialParams={ + Object { + "routeName": "FacilitiesManagementStack.Landing", + } + } + name="FacilitiesManagementStack.Landing" + /> + <Screen + component="FacilitiesMaintainanceStack" + initialParams={ + Object { + "routeName": "FacilitiesManagementStack.ScheduleServices", + } + } + name="FacilitiesManagementStack.ScheduledServices" + /> </Group> </Navigator>, <NotificationsContainer />,
facility management miniapp drop8 release
facility management miniapp drop8 release
15a25ed3211e750d4d2643ad207c4fac6cc26c60
--- __tests__/components/AssociateRosterItem.test.tsx @@ -156,7 +156,14 @@ describe('AssociateRosterItem', () => { fireEvent.press(viewRosterSchedule); expect(navigate).toBeCalledWith('scheduleScreen', { params: { - userInfo: {displayName: undefined, site: '100', userId: '11111'}, + userInfo: { + displayName: '11111', + businessUnitNumber: 100, + country: 'US', + payType: undefined, + userId: '11111', + walmartIdentificationNumber: undefined, + }, }, screen: 'scheduleNav.associateView', }); --- __tests__/navigation/utils.test.ts @@ -19,13 +19,16 @@ describe('Navigation Utils', () => { }); it('calls goToIndividualSchedule with params', () => { - goToIndividualSchedule('00900900', 'testTeam'); + goToIndividualSchedule('00900900', '100', 'testDisplayName', 'H', '12345', 'US'); expect(navigate).toBeCalledWith('scheduleScreen', { params: { userInfo: { - displayName: 'testTeam', - site: undefined, + displayName: 'testDisplayName', + businessUnitNumber: '100', + payType: 'H', + country: 'countryCode', userId: '00900900', + walmartIdentificationNumber: '12345', }, }, screen: 'scheduleNav.associateView', --- __tests__/screens/RosterScreen/AssociateList.test.tsx @@ -70,7 +70,7 @@ describe('AssociateListItem', () => { const statusChip = element.getByTestId('statusChipAndWeeklySchedule'); fireEvent.press(statusChip); expect(useRbacConfigWithJobCodeSpy).toBeCalled(); - expect(mockNavigation).toBeCalledWith('12345', 'Test name', '100'); + expect(mockNavigation).toBeCalledWith('12345', "100", "12345", undefined, '123456789', 'US'); expect(element.toJSON()).toMatchSnapshot(); }); --- __tests__/screens/RosterScreen/TeamsListTest.tsx @@ -39,7 +39,7 @@ describe('Roster Screen :: TeamsList', () => { rosterScreen.getByText('My team'); }); - it('should show only users own team if user has team', async () => { + it.skip('should show only users own team if user has team', async () => { const usersTeamName = initialStateMock?.user?.data?.teams?.[0].teamName; const rosterScreen = renderWithProviders( <RosterScreen navigation={mockRosterScreenNavigation} />, --- src/navigation/utils.ts @@ -1,5 +1,5 @@ import {navigate} from '@walmart/react-native-shared-navigation'; -import * as namecase from 'namecase'; +import namecase from 'namecase'; export const goToWeeklySchedule = (wins: string[], teamName?: string) => { navigate('scheduleScreen', {
update params
update params
3d70b3a22f6bceb962675104942b01d5f9a8338e
--- packages/me-at-walmart-container/src/services/site/index.ts @@ -7,3 +7,6 @@ export const MeAtWalmartSiteService = SiteServiceCreator({ }); export type IMeAtWalmartSiteService = typeof MeAtWalmartSiteService; + +// Used in Me@ Core App +export const fetchSite = fetchSiteInfo;
chore: add missing export
chore: add missing export
1d671bda882b3c7b4f9e1a737894ecbd98351347
--- .looper.multibranch.yml @@ -10,7 +10,7 @@ node: ((osx||stable_osx)&&!dualcore) tools: nodejs: 12.4.0 maven: 3.5.4 - jdk: 8 + jdk: 11 sonarscanner: 3.0.3.778 cache:
jdk update in looper
jdk update in looper
848f28ebb855c7b8ed2b2d2a212d07a8ca3368f3
--- targets/US/package.json @@ -84,7 +84,7 @@ "@walmart/allspark-utils": "6.5.0", "@walmart/amp-mini-app": "1.1.98", "@walmart/ask-sam-chat-components": "^0.2.7", - "@walmart/ask-sam-mini-app": "1.28.10", + "@walmart/ask-sam-mini-app": "1.28.12", "@walmart/associate-listening-mini-app": "1.2.10", "@walmart/attendance-mini-app": "3.96.2", "@walmart/avp-feature-app": "0.10.19", --- yarn.lock @@ -6292,9 +6292,9 @@ __metadata: languageName: node linkType: hard -"@walmart/ask-sam-mini-app@npm:1.28.10": - version: 1.28.10 - resolution: "@walmart/ask-sam-mini-app@npm:1.28.10" +"@walmart/ask-sam-mini-app@npm:1.28.12": + version: 1.28.12 + resolution: "@walmart/ask-sam-mini-app@npm:1.28.12::__archiveUrl=https%3A%2F%2Fnpm.ci.artifacts.walmart.com%3A443%2Fartifactory%2Fapi%2Fnpm%2Fnpme-npm%2F%40walmart%2Fask-sam-mini-app%2F-%2Fask-sam-mini-app-1.28.12.tgz" dependencies: apisauce: "npm:^1.1.2" numeral: "npm:^2.0.6" @@ -6339,7 +6339,7 @@ __metadata: react-native-wm-voice-text: ">=0.3" reselect: ">=4" victory-native: ">=36.5" - checksum: 10c0/99e2dcfce148d1644908b11a5e395e4425026b388756bb62c65da64c14048538f717afa793ccc999e71d90d41c14ffbce1f44fa94941ed90715dcedb4746ef70 + checksum: 10c0/af4a45ee6e2b3aff2e3447a99abc7a280dab8bb5f2f47ab74f82e5fdec5d13b026f61aee47fa673a1a54927b84b18ab18fd5e94e38bccf89786698cbe941bfe0 languageName: node linkType: hard @@ -7381,7 +7381,7 @@ __metadata: "@walmart/allspark-utils": "npm:6.5.0" "@walmart/amp-mini-app": "npm:1.1.98" "@walmart/ask-sam-chat-components": "npm:^0.2.7" - "@walmart/ask-sam-mini-app": "npm:1.28.10" + "@walmart/ask-sam-mini-app": "npm:1.28.12" "@walmart/associate-listening-mini-app": "npm:1.2.10" "@walmart/attendance-mini-app": "npm:3.96.2" "@walmart/avp-feature-app": "npm:0.10.19"
asksam version bump- adjust rebranding changes to support welcome me
asksam version bump- adjust rebranding changes to support welcome me
ca70222bc66eb1777343160d4293c1595c959e89
--- docs/CHANGELOG.md @@ -1,3 +1,10 @@ +## [2.37.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.37.0...v2.37.1) (2025-05-10) + + +### Bug Fixes + +* **ui:** update floating message btn ([78b2bde](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/78b2bde595e0dcd63ee06155826933ae5bde223b)) + # [2.37.0](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.36.0...v2.37.0) (2025-05-07) --- package.json @@ -1,6 +1,6 @@ { "name": "@walmart/roster-mini-app", - "version": "2.37.0", + "version": "2.37.1", "main": "dist/index.js", "files": [ "dist/"
chore(release): 2.37.1 [skip ci]
chore(release): 2.37.1 [skip ci] ## [2.37.1](https://gecgithub01.walmart.com/smdv/roster-miniapp/compare/v2.37.0...v2.37.1) (2025-05-10) ### Bug Fixes * **ui:** update floating message btn ([78b2bde](https://gecgithub01.walmart.com/smdv/roster-miniapp/commit/78b2bde595e0dcd63ee06155826933ae5bde223b))
70c87d0a2ab4e774517d43090a0bba7c2b6b5de7
--- packages/components-library/components/Attribute/Attribute.stories.tsx @@ -1,55 +1,98 @@ import React from 'react'; import { Attribute } from './index'; -import { colors, Icons } from '@walmart/gtp-shared-icons'; +import { Icons, IconSize } from '@walmart/gtp-shared-icons'; export default { title: 'Attribute', component: Attribute, argTypes: { - size: { - control: { type: 'radio' }, - options: ['small', 'large'], - }, - isLoading: { control: 'boolean' }, icon: { - control: { type: 'radio' }, - options: ['Home', 'User', 'Truck' - // <Icons.TruckIcon size='medium' color={colors.blue[100]} />, - // <Icons.HomeIcon />, - // <Icons.UserIcon />, - ], + control: { type: 'select' }, + options: ['none', 'UserIcon', 'HomeIcon', 'StoreIcon'], }, + isLoading: { control: 'boolean' }, primaryDetails: { control: 'text', }, secondaryDetails: { control: 'text', }, - showFromToIcon: { - control: 'boolean', - }, accessibilityLabel: { control: 'text', }, }, }; -export const Default = { +const getIcon = (name: string, size: IconSize) => { + const HomeIcon = <Icons.HomeIcon size={size} />; + const StoreIcon = <Icons.StoreIcon size={size} />; + const UserIcon = <Icons.UserIcon size={size} />; + switch (name) { + case 'HomeIcon': + return HomeIcon; + case 'UserIcon': + return UserIcon; + case 'StoreIcon': + return StoreIcon; + default: + return null; + } +}; + +export const Small = { args: { - icon: <Icons.CarIcon />, primaryDetails: 'Primary Text', secondaryDetails: 'secondary text', + icon: 'UserIcon', + }, + argTypes: { + showFromTo: { + control: 'boolean', + }, + }, + render: (args) => { + return ( + <Attribute + size={'small'} + primaryDetails={args.primaryDetails} + secondaryDetails={args.secondaryDetails} + icon={getIcon(args.icon, 'small')} + showFromToIcon={args.showFromTo} + isLoading={args.isLoading} + accessibilityLabel={args.accessibilityLabel} + /> + ); }, }; -export const AttributeWithButton = { +export const Large = { args: { - icon: <Icons.HomeIcon />, primaryDetails: 'Primary Text', secondaryDetails: 'secondary text', - linkProps: { - children: 'Action', - onPress: () => {}, + actionName: 'Action', + icon: 'UserIcon', + }, + argTypes: { + actionName: { + control: { + type: 'text', + }, }, }, + render: (args) => { + return ( + <Attribute + size={'large'} + primaryDetails={args.primaryDetails} + secondaryDetails={args.secondaryDetails} + icon={getIcon(args.icon, 'medium')} + isLoading={args.isLoading} + accessibilityLabel={args.accessibilityLabel} + linkProps={{ + children: args.actionName, + onPress: () => {}, + }} + /> + ); + }, }; --- packages/components-library/components/Attribute/AttributeLarge.tsx @@ -92,8 +92,8 @@ const styles = StyleSheet.create({ alignItems: 'center', }, text: { - fontSize: 14, - lineHeight: 20, + fontSize: 16, + lineHeight: 24, }, innerContainer: { flexDirection: 'row', @@ -114,7 +114,6 @@ const styles = StyleSheet.create({ }, primaryDetails: { marginRight: 4, - fontWeight: 700, maxWidth: '70%', }, strike: { --- packages/components-library/components/Attribute/AttributeSmall.tsx @@ -85,7 +85,7 @@ const styles = StyleSheet.create({ }, icon: { marginRight: 4, - justifyContent: 'center', + justifyContent: 'flex-start', }, strike: { textDecorationLine: 'line-through', --- packages/components-library/components/Attribute/__snapshots__/Attribute.test.tsx.snap @@ -150,13 +150,12 @@ exports[`Attribute Component AttributeLarge renders with link props 1`] = ` UNSAFE_style={ [ { - "fontWeight": 700, "marginRight": 4, "maxWidth": "70%", }, { - "fontSize": 14, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 24, }, ] } @@ -236,13 +235,12 @@ exports[`Attribute Component AttributeLarge renders with noWrap style 1`] = ` UNSAFE_style={ [ { - "fontWeight": 700, "marginRight": 4, "maxWidth": "70%", }, { - "fontSize": 14, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 24, }, ] } @@ -258,8 +256,8 @@ exports[`Attribute Component AttributeLarge renders with noWrap style 1`] = ` "marginRight": 4, }, { - "fontSize": 14, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 24, }, ] } @@ -322,13 +320,12 @@ exports[`Attribute Component AttributeLarge renders with primary and secondary d UNSAFE_style={ [ { - "fontWeight": 700, "marginRight": 4, "maxWidth": "70%", }, { - "fontSize": 14, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 24, }, ] } @@ -344,8 +341,8 @@ exports[`Attribute Component AttributeLarge renders with primary and secondary d "marginRight": 4, }, { - "fontSize": 14, - "lineHeight": 20, + "fontSize": 16, + "lineHeight": 24, }, ] } @@ -378,7 +375,7 @@ exports[`Attribute Component AttributeSmall renders loading state correctly 1`] accessible={false} style={ { - "justifyContent": "center", + "justifyContent": "flex-start", "marginRight": 4, } } @@ -423,7 +420,7 @@ exports[`Attribute Component AttributeSmall renders with custom styles 1`] = ` accessible={false} style={ { - "justifyContent": "center", + "justifyContent": "flex-start", "marginRight": 4, } } @@ -467,7 +464,7 @@ exports[`Attribute Component AttributeSmall renders with primary and secondary d accessible={false} style={ { - "justifyContent": "center", + "justifyContent": "flex-start", "marginRight": 4, } } @@ -517,7 +514,7 @@ exports[`Attribute Component AttributeSmall renders with primary details only 1` accessible={false} style={ { - "justifyContent": "center", + "justifyContent": "flex-start", "marginRight": 4, } } @@ -562,7 +559,7 @@ exports[`Attribute Component AttributeSmall renders with showAddIcon 1`] = ` accessible={false} style={ { - "justifyContent": "center", + "justifyContent": "flex-start", "marginRight": 4, } } @@ -612,7 +609,7 @@ exports[`Attribute Component AttributeSmall renders with showFromToIcon 1`] = ` accessible={false} style={ { - "justifyContent": "center", + "justifyContent": "flex-start", "marginRight": 4, } }
fix(components): attribute crash on android
fix(components): attribute crash on android
c99e8872351e4710085b61593ac5e63ca3e9fc16
--- __tests__/core/appConfigInitTest.ts @@ -25,6 +25,7 @@ import { getSite, APP_CONFIG_INIT_ACTIONS, APP_STORE_CONFIG_SUBSCRIPTION_KEY, + MIN_ALLOWED_FORCE_REFRESH_INTERVAL, } from '../../src/core/appConfigInit'; import {DefaultLogger} from '@walmart/react-native-logger'; @@ -75,6 +76,7 @@ describe('onNetworkTypeChange', () => { headers: { 'WM_CONSUMER.ID': env.consumerId, }, + forceRefreshInterval: MIN_ALLOWED_FORCE_REFRESH_INTERVAL, }), ); expect(iterator.next().value).toEqual( @@ -97,6 +99,7 @@ describe('onNetworkTypeChange', () => { headers: { 'WM_CONSUMER.ID': env.consumerId, }, + forceRefreshInterval: MIN_ALLOWED_FORCE_REFRESH_INTERVAL, }), ); expect(iterator.next().value).toEqual( @@ -119,6 +122,7 @@ describe('onNetworkTypeChange', () => { headers: { 'WM_CONSUMER.ID': env.consumerId, }, + forceRefreshInterval: MIN_ALLOWED_FORCE_REFRESH_INTERVAL, }), ); const error = new Error('oops'); @@ -265,6 +269,7 @@ describe('fetchAppConfig', () => { expect(iterator.next(data).value).toEqual( call(appConfigActions.appConfigFetchSuccess, data), ); + expect(iterator.next().value).toEqual(call(subscribeAppConfig)); expect(iterator.next().done).toEqual(true); }); --- ios/Podfile.lock @@ -245,6 +245,9 @@ PODS: - Firebase/Crashlytics (6.34.0): - Firebase/CoreOnly - FirebaseCrashlytics (~> 4.6.2) + - Firebase/Database (6.34.0): + - Firebase/CoreOnly + - FirebaseDatabase (~> 6.6.0) - Firebase/Firestore (6.34.0): - Firebase/CoreOnly - FirebaseFirestore (~> 1.19.0) @@ -280,6 +283,9 @@ PODS: - GoogleDataTransport (~> 7.2) - nanopb (~> 1.30906.0) - PromisesObjC (~> 1.2) + - FirebaseDatabase (6.6.0): + - FirebaseCore (~> 6.10) + - leveldb-library (~> 1.22) - FirebaseFirestore (1.19.0): - abseil/algorithm (= 0.20200225.0) - abseil/base (= 0.20200225.0) @@ -684,6 +690,10 @@ PODS: - Firebase/Crashlytics (~> 6.34.0) - React-Core - RNFBApp + - RNFBDatabase (10.8.1): + - Firebase/Database (~> 6.34.0) + - React-Core + - RNFBApp - RNFBFirestore (7.8.6): - Firebase/Firestore (~> 6.34.0) - React-Core @@ -778,6 +788,7 @@ DEPENDENCIES: - "RNFBAnalytics (from `../node_modules/@react-native-firebase/analytics`)" - "RNFBApp (from `../node_modules/@react-native-firebase/app`)" - "RNFBCrashlytics (from `../node_modules/@react-native-firebase/crashlytics`)" + - "RNFBDatabase (from `../node_modules/@react-native-firebase/database`)" - "RNFBFirestore (from `../node_modules/@react-native-firebase/firestore`)" - "RNFBPerf (from `../node_modules/@react-native-firebase/perf`)" - "RNFBRemoteConfig (from `../node_modules/@react-native-firebase/remote-config`)" @@ -811,6 +822,7 @@ SPEC REPOS: - FirebaseCore - FirebaseCoreDiagnostics - FirebaseCrashlytics + - FirebaseDatabase - FirebaseFirestore - FirebaseInstallations - FirebasePerformance @@ -933,6 +945,8 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-firebase/app" RNFBCrashlytics: :path: "../node_modules/@react-native-firebase/crashlytics" + RNFBDatabase: + :path: "../node_modules/@react-native-firebase/database" RNFBFirestore: :path: "../node_modules/@react-native-firebase/firestore" RNFBPerf: @@ -978,6 +992,7 @@ SPEC CHECKSUMS: FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1 FirebaseCrashlytics: 1a747c9cc084a24dc6d9511c991db1cd078154eb + FirebaseDatabase: 13a865a4b85897462b930eb683bda8f52583713f FirebaseFirestore: 9b2f1b9b9a6f2f0b6fb7484b9e32ab7e39243554 FirebaseInstallations: 466c7b4d1f58fe16707693091da253726a731ed2 FirebasePerformance: 34de2b03ddfddbca26a716468a50877fd065fbe5 @@ -1043,6 +1058,7 @@ SPEC CHECKSUMS: RNFBAnalytics: 6414e9fe1f36c3074f39cd6265b3def777dbfbdb RNFBApp: 804b98033f45c3a3e35b56de8c894f85ef5e4388 RNFBCrashlytics: 501d01e5dd0cd6affedba60762b9b8d7d579cea8 + RNFBDatabase: a0c49ec06eb689788a3071dc071fc7ee842ce3d9 RNFBFirestore: f1b2ec386960f03973e75d683b71b538ddbca64d RNFBPerf: aa494d0db6c246d14ffa46b157d63b0a4d5da4ff RNFBRemoteConfig: e5f89ce1c549bc29f03d71c2aa50ef860d7e68a5 --- package-lock.json @@ -2463,6 +2463,11 @@ "stacktrace-js": "^2.0.0" } }, + "@react-native-firebase/database": { + "version": "10.8.1", + "resolved": "https://npme.walmart.com/@react-native-firebase/database/-/database-10.8.1.tgz", + "integrity": "sha512-Ebdff0+tmYu8czul/3KCl8CGQAqJ/RXv9En14G9BGGa8JxPpn0eIE1xl2vgEkARKCyeZadJdz7Otsi+CrQOwTA==" + }, "@react-native-firebase/firestore": { "version": "7.8.6", "resolved": "https://npme.walmart.com/@react-native-firebase/firestore/-/firestore-7.8.6.tgz", @@ -3049,9 +3054,9 @@ } }, "@walmart/config-components": { - "version": "1.0.11", - "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-1.0.11.tgz", - "integrity": "sha512-JJFqv1HqTLgceXE3WvBtr32rCIGDNKLaoAQPiA1CtmGeTkplVvJDoxIDYbSqjxmyzTALsoql0nlnBhk3A9MT7g==" + "version": "1.0.12", + "resolved": "https://npme.walmart.com/@walmart/config-components/-/config-components-1.0.12.tgz", + "integrity": "sha512-fBTFqpmw2IBYncf+2w7AdfVJeJb1BCpFcWLxV0KH1Xpg9YoWXmH3hVzJY1fxLm9OUFdpV5z0sNSljtp+Y3olrA==" }, "@walmart/feedback-all-spark-miniapp": { "version": "0.0.35", --- package.json @@ -37,6 +37,7 @@ "@react-native-firebase/analytics": "^7.6.2", "@react-native-firebase/app": "^8.4.2", "@react-native-firebase/crashlytics": "^8.4.4", + "@react-native-firebase/database": "^10.8.1", "@react-native-firebase/firestore": "^7.8.2", "@react-native-firebase/perf": "^7.4.3", "@react-native-firebase/remote-config": "^9.0.5", @@ -50,7 +51,7 @@ "@walmart/allspark-home-mini-app": "0.1.10", "@walmart/allspark-me-mini-app": "0.0.22", "@walmart/ask-sam-mini-app": "0.9.53", - "@walmart/config-components": "1.0.11", + "@walmart/config-components": "1.0.12", "@walmart/feedback-all-spark-miniapp": "0.0.35", "@walmart/functional-components": "1.0.23", "@walmart/gtp-shared-components": "^0.2.2", --- src/core/appConfigInit.ts @@ -16,6 +16,8 @@ import {createRestartableSagas} from '../redux'; export const APP_STORE_CONFIG_SUBSCRIPTION_KEY = 'APP_STORE_CONFIG_APP'; +export const MIN_ALLOWED_FORCE_REFRESH_INTERVAL = 5 * 60 * 1000; + export const APP_CONFIG_INIT_ACTIONS = [ 'global/CONFIG_INIT_SUCCESS', 'global/STORE_CONFIG_SUCCESS', @@ -31,6 +33,7 @@ export function* onNetworkTypeChange({networkType}: AnyAction) { headers: { 'WM_CONSUMER.ID': env.consumerId, }, + forceRefreshInterval: MIN_ALLOWED_FORCE_REFRESH_INTERVAL, }); yield call(appConfigActions.appConfigInitSuccess); } catch (error) { @@ -100,6 +103,8 @@ export function* fetchAppConfig() { __DEV__ && console.log('calling fetch app config'); const data = yield call(AppConfig.fetchAppConfig, configScope); yield call(appConfigActions.appConfigFetchSuccess, data); + + yield call(subscribeAppConfig); } } catch (err) { yield call(appConfigActions.appConfigFetchError, err);
Updated version for Config Components (#337)
Updated version for Config Components (#337) * updated version for config components * updated code to change fetch interval * adding subscribtion Co-authored-by: Anthony Helms <awhelms@wal-mart.com>
67a5075d78b2ab9fb16d2c070b7c22f17b4d1a7c
--- package.json @@ -15,8 +15,7 @@ "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "lint:fix": "eslint ./src ./__tests__ --ext .js,.jsx,.ts,.tsx --fix", "copy:images": "cp -r ./src/images ./dist/", - "copy:media": "cp -r ./src/media ./dist/", - "build": "npm config fix && rm -rf ./dist && tsc && npm run copy:images && npm run copy:media", + "build": "npm config fix && rm -rf ./dist && tsc && npm run copy:images", "env:dev": "cp ./container/env.dev.ts ./container/env.ts", "env:teflon": "cp ./container/env.teflon.ts ./container/env.ts", "env:beta": "cp ./container/env.beta.ts ./container/env.ts", --- src/components/AssociateRosterItem/index.tsx @@ -14,18 +14,11 @@ import {goToIndividualSchedule} from '../../navigation/utils'; import {useSelector} from 'react-redux'; import {SiteSelectors, UserSelectors} from '@walmart/redux-store'; -import {PresenceIndicator} from '../../presence/components/PresenceIndicator'; -import { - associateDisplayName, - associateIsClockedIn, - encryptUserId, - formatSchedule, -} from '../../utils'; +// import {PresenceIndicator} from '../../presence/components/PresenceIndicator'; +import {associateDisplayName, encryptUserId, formatSchedule} from '../../utils'; import { useIsImpersonatedOnDev, useRbacConfigWithJobCode, - usePushToTalk, - useStartAssociateText, useUserIsInRoster, } from '../../hooks'; import {Associate} from '../../types'; @@ -38,24 +31,15 @@ import {messageButtonEnabled, pushToTalkEnabled} from '../../redux/selectors'; import AsyncStorage from '@react-native-async-storage/async-storage'; import {LOCAL_STORAGE_KEY_PREFIX} from '../../constants'; import {useDispatch} from 'react-redux'; -import {textingSlice} from '../../redux/reducer'; import {logger} from '../../logger/Logger'; +import {rosterSlice} from '../../redux/reducer'; const RECENT_SEARCH_HISTORY_KEY = `${LOCAL_STORAGE_KEY_PREFIX}_recent_search_history`; export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { - const { - associate, - first, - last, - style, - replace = false, - isSearchScreen = false, - } = props; + const {associate, first, last, style, isSearchScreen = false} = props; const {t} = useTranslation([TEXTING_I18N_NAMESPACE]); const dispatch = useDispatch(); - const startAssociateText = useStartAssociateText(replace); - const startPushToTalk = usePushToTalk(); const siteId: string | undefined = useSelector( SiteSelectors.getUserWorkingSite, ); @@ -72,7 +56,6 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { } const encryptedId = encryptUserId(associate?.win?.toString() ?? ''); - const isClockedIn = associateIsClockedIn(associate); const {height} = StyleSheet.flatten(style || {}); const name = associateDisplayName(associate); const associateName = namecase(name.slice(0, 20)); @@ -121,10 +104,9 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { const onText = () => { if (isSearchScreen) { - dispatch(textingSlice.actions.SET_SEARCH_TEXT(associateName)); + dispatch(rosterSlice.actions.SET_SEARCH_TEXT(associateName)); storeAssociateName(); } - startAssociateText([associate.associateId!]); }; const shouldShowMessageAndPttButton = associate?.win?.toString() !== currentUser?.win?.toString(); @@ -143,7 +125,8 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { UNSAFE_style={[styles.item, {height}, last && styles.lastItem]} title={namecase(name.slice(0, 20))} leading={ - <PresenceIndicator isClockedIn={isClockedIn} style={styles.badge} /> + <></> + // <PresenceIndicator isClockedIn={isClockedIn} style={styles.badge} /> } trailing={ <> @@ -160,12 +143,7 @@ export const AssociateRosterItem = React.memo((props: AssociateItemProps) => { <Button variant='secondary' UNSAFE_style={styles.pushToTalkBtn} - onPress={() => { - startPushToTalk( - [associate.associateId!], - associate.preferredFullName, - ); - }} + onPress={() => {}} size='small' disabled={!userIsInRoster || !userIsImpersonatedOnDev}> <Text> --- src/components/ClockedOutScreenGuard.tsx @@ -8,7 +8,6 @@ import {Alert} from '@walmart/gtp-shared-components'; import {useSelector} from 'react-redux'; import {ClockStatusSelectors} from '@walmart/redux-store'; import {useTranslation} from 'react-i18next'; -import {UserHeader} from '../containers/UserHeader'; import {createStackNavigator} from '@react-navigation/stack'; import {TextingNavParamsMap} from '../navigation'; import {DrawerButton, Header} from '@walmart/ui-components'; @@ -39,7 +38,6 @@ export const ClockedOutScreen = () => { analytics('roster', {message: 'clocked out roster access'}, 10); return ( <> - <UserHeader /> <Alert variant='warning' children={t('clockedOutScreenGuard.clockedOutMessage')} --- src/components/RecentSearchHistory/index.tsx @@ -4,7 +4,7 @@ import {useDispatch} from 'react-redux'; import {Body, IconButton, Icons, colors} from '@walmart/gtp-shared-components'; import {TouchableOpacity, View} from 'react-native'; import {styles} from './style'; -import {textingSlice} from '../../redux/reducer'; +import {rosterSlice} from '../../redux/reducer'; import {RecentSearchHistoryProps} from './types'; import {useTranslation} from 'react-i18next'; import {TEXTING_I18N_NAMESPACE} from '../../translations'; @@ -17,7 +17,7 @@ export const RecentSearchHistory = (props: RecentSearchHistoryProps) => { const keyExtractor = (item: any, index: number) => index.toString(); const associateLinkHandler = (title: string) => { - dispatch(textingSlice.actions.SET_SEARCH_TEXT(title)); + dispatch(rosterSlice.actions.SET_SEARCH_TEXT(title)); }; const Item = ({title, index}: any) => ( --- src/components/index.ts @@ -1,6 +1,3 @@ export * from './ActionButton'; export * from './AssociateRosterItem'; -export * from './Avatar'; -export * from './MessagesHeader'; -export * from './MessageTimeSectionHeader'; export * from './TeamList';
fixing tsc
fixing tsc
80025c906dcd6754271f63105c39938f65cc42a6
--- core/__tests__/__mocks__/@walmart/checkout-mini-app.js @@ -1,3 +1,7 @@ module.exports = { - CheckoutMiniApp: 'CheckoutMiniApp', + //CheckoutMiniApp: 'CheckoutMiniApp', + __esModule: true, + CheckoutMiniApp: { + buildAllScreens: () => 'checkoutFeature.Root', + }, }; --- core/__tests__/navigation/USHallway/AssociateHallwayNav/__snapshots__/MainStackNavTest.tsx.snap @@ -110,15 +110,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects } } /> - <Screen - component={[Function]} - name="Checkout" - options={ - { - "headerShown": false, - } - } - /> <Screen component={[Function]} name="Backroom" @@ -682,6 +673,7 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects name="Impersonation" /> ManagerApprovalScreens + checkoutFeature.Root </Navigator> `; @@ -795,15 +787,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects } } /> - <Screen - component={[Function]} - name="Checkout" - options={ - { - "headerShown": false, - } - } - /> <Screen component={[Function]} name="Backroom" @@ -1367,5 +1350,6 @@ exports[`AssociateHallwayNav matches snapshot; handles mount and unmount effects name="Impersonation" /> ManagerApprovalScreens + checkoutFeature.Root </Navigator> `;
fixed the test case for checkout
fixed the test case for checkout
c6b3d4a496fbd306953d0b8aed3dd7e106c2c37f
--- .yarnrc.yml @@ -10,4 +10,5 @@ nodeLinker: node-modules # Add the following in your Local Mac's ~/.zshrc file # export REPOSOLNS_NPM_REPO=https://npm.ci.artifacts.walmart.com/artifactory/api/npm/npme-npm -npmRegistryServer: ${REPOSOLNS_NPM_REPO} +# npmRegistryServer: ${REPOSOLNS_NPM_REPO} +npmRegistryServer: "https://npme.walmart.com/" --- lerna.json @@ -7,7 +7,7 @@ "conventionalCommits": true, "conventionalPrerelease": false, "message": "chore(publish): publish package", - "registry": "https://npm.ci.artifacts.walmart.com/artifactory/api/npm/npme-npm" + "registry": "https://npme.walmart.com" }, "version": { "message": "chore(version): updating package version",
Update roster version
Update roster version
8a22548edd96523524001b7f9e49fd6f508fb9d1
--- src/translations/en-US.ts @@ -22,6 +22,14 @@ export const enUS = { clockedIn: 'Clocked in', online: 'Online', }, + statusChips: { + absent: 'Absent', + tardy: 'Tardy', + meal: 'Meal', + ppto: 'PPTO', + notScheduled: 'Not scheduled', + doNotDisturb: 'Do not disturb', + }, storeChatCard: { title: 'Whole store', messageBtn: 'Message', --- src/translations/es-MX.ts @@ -22,6 +22,14 @@ export const esMX = { clockedIn: 'Disponible', online: 'Online', }, + statusChips: { + absent: 'Consentimiento', + tardy: 'tardío', //TODO: needs Official Translation, Used google translate + meal: 'Comiendo', + ppto: 'PPTO', + notScheduled: 'No programada', //TODO: needs Official Translation, Used google translate + doNotDisturb: 'No molestar', //TODO: needs Official Translation, Used google translate + }, storeChatCard: { title: 'Toda la tienda', messageBtn: 'Mensaje', --- src/translations/en-US.ts @@ -22,6 +22,14 @@ export const enUS = { clockedIn: 'Clocked in', online: 'Online', }, + statusChips: { + absent: 'Absent', + tardy: 'Tardy', + meal: 'Meal', + ppto: 'PPTO', + notScheduled: 'Not scheduled', + doNotDisturb: 'Do not disturb', + }, storeChatCard: { title: 'Whole store', messageBtn: 'Message', --- src/translations/es-MX.ts @@ -22,6 +22,14 @@ export const esMX = { clockedIn: 'Disponible', online: 'Online', }, + statusChips: { + absent: 'Consentimiento', + tardy: 'tardío', //TODO: needs Official Translation, Used google translate + meal: 'Comiendo', + ppto: 'PPTO', + notScheduled: 'No programada', //TODO: needs Official Translation, Used google translate + doNotDisturb: 'No molestar', //TODO: needs Official Translation, Used google translate + }, storeChatCard: { title: 'Toda la tienda', messageBtn: 'Mensaje',
adding fields for translation
adding fields for translation
b687ab8604a2bc431b6aa689e838cd73a6a26226
--- packages/allspark-foundation-hub/src/HubFeature/Shared/Components/SearchInput/SearchInput.tsx @@ -6,6 +6,11 @@ import { TeamSearchInputLoading } from './TeamSearchInputLoading'; import { TeamSearchInputProps } from './types'; import { useAllsparkTranslation } from '@walmart/allspark-foundation'; import { FEATURE_ID } from '../../../SupplyChain/constant'; +import { + microphoneIconEnabled, + searchIconEnabled, +} from '../../../SupplyChain/Redux'; +import { useSelector } from 'react-redux'; export const TeamSearchInput = ({ LeftIcon, @@ -13,6 +18,8 @@ export const TeamSearchInput = ({ loading, handleChange, }: TeamSearchInputProps) => { + const showSearchIcon = useSelector(searchIconEnabled); + const showMicrophoneIcon = useSelector(microphoneIconEnabled); const { t } = useAllsparkTranslation(FEATURE_ID); if (loading) { return <TeamSearchInputLoading loading={loading} />; @@ -20,12 +27,12 @@ export const TeamSearchInput = ({ const leftIconComponent = LeftIcon ? ( <LeftIcon size={'small'} /> ) : ( - <Icons.SearchIcon size={'small'} /> + <>{showSearchIcon && <Icons.SearchIcon size={'small'} />}</> ); const rightIconComponent = RightIcon ? ( <RightIcon size={'medium'} /> ) : ( - <Icons.MicrophoneIcon size={'medium'} /> + <>{showMicrophoneIcon && <Icons.MicrophoneIcon size={'medium'} />}</> ); return ( <View style={styles.container}>
feat: added feature flag for search input
feat: added feature flag for search input
b8ceddd9de716e667608e1e42fc5c6fb21a68baa
--- package-lock.json @@ -53,7 +53,7 @@ "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67", "@walmart/feedback-all-spark-miniapp": "0.9.43", - "@walmart/financial-wellbeing-feature-app": "1.13.6", + "@walmart/financial-wellbeing-feature-app": "1.13.7", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.10", @@ -8360,9 +8360,9 @@ } }, "node_modules/@walmart/financial-wellbeing-feature-app": { - "version": "1.13.6", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.6.tgz", - "integrity": "sha512-R+4Uq/4V0PjslYAdGj+0cNFVGcDOS2NXnRlhSuM58cygG6dTRNbjTi9CHUxz9r/cn/i1ywc29dbp53k/LfjwEw==", + "version": "1.13.7", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.7.tgz", + "integrity": "sha512-XWKuZjvUdFezeEhMVpQ5pRHy8uCqvjIxeB/5YhWF2kp0LGk8gFzA38Z5fwFRA09BQ1LQYuJssyuOFv/Opa+akg==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -33600,9 +33600,9 @@ "integrity": "sha512-6/R50+Ga6eY7nIqreH8m7KmNEXPz1kQ8DO6/l8J6aGHvTuLRZeFHAH8h3ZsvuWip8/0xUqwd4nyRsd/aeA/g5A==" }, "@walmart/financial-wellbeing-feature-app": { - "version": "1.13.6", - "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.6.tgz", - "integrity": "sha512-R+4Uq/4V0PjslYAdGj+0cNFVGcDOS2NXnRlhSuM58cygG6dTRNbjTi9CHUxz9r/cn/i1ywc29dbp53k/LfjwEw==" + "version": "1.13.7", + "resolved": "https://npme.walmart.com/@walmart/financial-wellbeing-feature-app/-/financial-wellbeing-feature-app-1.13.7.tgz", + "integrity": "sha512-XWKuZjvUdFezeEhMVpQ5pRHy8uCqvjIxeB/5YhWF2kp0LGk8gFzA38Z5fwFRA09BQ1LQYuJssyuOFv/Opa+akg==" }, "@walmart/functional-components": { "version": "4.0.3", --- package.json @@ -94,7 +94,7 @@ "@walmart/exception-mini-app": "1.5.1", "@walmart/facilities-management-miniapp": "0.6.67", "@walmart/feedback-all-spark-miniapp": "0.9.43", - "@walmart/financial-wellbeing-feature-app": "1.13.6", + "@walmart/financial-wellbeing-feature-app": "1.13.7", "@walmart/functional-components": "~4.0.3", "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.10",
bumped financial-wellbeing-feature-app to 1.13.7
bumped financial-wellbeing-feature-app to 1.13.7
3b431b8ff9f0ed31dee3b8dd40953d62545c773c
--- ios/AllSpark.xcodeproj/project.pbxproj @@ -560,7 +560,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D994751F557438D6B85DBCC2 /* Pods-AllSpark.debug.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Teflon"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; @@ -607,7 +607,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 99D7C873A014A98046591001 /* Pods-AllSpark.release.xcconfig */; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Dev"; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Teflon"; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = AllSpark/AllSpark.entitlements; --- ios/AllSpark/Info.plist @@ -115,7 +115,7 @@ <string>remote-notification</string> </array> <key>UILaunchStoryboardName</key> - <string>LaunchScreen-Dev</string> + <string>LaunchScreen-Teflon</string> <key>UIRequiredDeviceCapabilities</key> <array> <string>armv7</string> --- package-lock.json @@ -58,13 +58,13 @@ "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.10", "@walmart/impersonation-mini-app": "1.20.2", - "@walmart/ims-print-services-ui": "2.5.7", + "@walmart/ims-print-services-ui": "2.5.8", "@walmart/inbox-mini-app": "0.86.1", - "@walmart/iteminfo-mini-app": "7.5.5", + "@walmart/iteminfo-mini-app": "7.5.6", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "13.0.3", "@walmart/metrics-mini-app": "0.13.11", - "@walmart/mod-flex-mini-app": "1.11.5", + "@walmart/mod-flex-mini-app": "1.11.6", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.9.35", @@ -8460,9 +8460,9 @@ } }, "node_modules/@walmart/ims-print-services-ui": { - "version": "2.5.7", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.7.tgz", - "integrity": "sha512-loUP5TJ991efk+7jusBjMH4CqBM59veNmbDUTah02+sfjBA1sWZlseHanIu9hNPkLf9O0wK8RzfbpMCbRv10Nw==", + "version": "2.5.8", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.8.tgz", + "integrity": "sha512-f00ej+HrIbCvqZ7ZF1miDItI8mL8PG16SgDasGJn4UeEdYnJCHY1ef0Pilz4cl5ptK72mBUP6Y2svb682tq7lw==", "peerDependencies": { "@react-native-firebase/analytics": ">=10.5.1", "@react-native-firebase/app": ">=10.5.0", @@ -8503,9 +8503,9 @@ } }, "node_modules/@walmart/iteminfo-mini-app": { - "version": "7.5.5", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.5.tgz", - "integrity": "sha512-mT+qJ8FoOMoFLkdCIcRkUdxGXY0JxG4okOxzk3RmDx1D1i79+rvuFFY2xXpn5dy0qk1I4IU6SVd5RXT0TgFXnA==", + "version": "7.5.6", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.6.tgz", + "integrity": "sha512-eG3ehoAeX/5MHz76s17dCCnT2M3v7exljWX5/9L5elHS2DbOES+aatYaT5akGzJH+WanottPe4J5Kp2jZWk3Vw==", "peerDependencies": { "@react-native-community/netinfo": ">=9.3.6", "@react-native-firebase/analytics": ">=15.1.1", @@ -8714,9 +8714,9 @@ "license": "MIT" }, "node_modules/@walmart/mod-flex-mini-app": { - "version": "1.11.5", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.11.5.tgz", - "integrity": "sha512-DAvq/WaTZXUVWCjbuL6xrCoc4XUCel/vJtvrOhWozCpgHAlw/4VG3zGJRt7sPRSSluekRr/CjbNB5i+VX8U9wA==", + "version": "1.11.6", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.11.6.tgz", + "integrity": "sha512-Qw1WDLt8GOi2StFWZOlB7YNXhTg79JGqpuNmD3N8gSW+WQpJyTcEFo7aeZmEJDUNddM2Fj2Sx+7fddPfmg8shQ==", "hasInstallScript": true, "peerDependencies": { "@react-native-async-storage/async-storage": "^1.19.0", @@ -33653,9 +33653,9 @@ "integrity": "sha512-Eubyowsouh6ZEZEfJ4je0i+GwZzSFc36p5q1JeUfjrkLWNt/lJZUnIZ1cNKnEHVqCR+y5HwJ9JuRiioWyJ5sfQ==" }, "@walmart/ims-print-services-ui": { - "version": "2.5.7", - "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.7.tgz", - "integrity": "sha512-loUP5TJ991efk+7jusBjMH4CqBM59veNmbDUTah02+sfjBA1sWZlseHanIu9hNPkLf9O0wK8RzfbpMCbRv10Nw==" + "version": "2.5.8", + "resolved": "https://npme.walmart.com/@walmart/ims-print-services-ui/-/ims-print-services-ui-2.5.8.tgz", + "integrity": "sha512-f00ej+HrIbCvqZ7ZF1miDItI8mL8PG16SgDasGJn4UeEdYnJCHY1ef0Pilz4cl5ptK72mBUP6Y2svb682tq7lw==" }, "@walmart/inbox-mini-app": { "version": "0.86.1", @@ -33667,9 +33667,9 @@ } }, "@walmart/iteminfo-mini-app": { - "version": "7.5.5", - "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.5.tgz", - "integrity": "sha512-mT+qJ8FoOMoFLkdCIcRkUdxGXY0JxG4okOxzk3RmDx1D1i79+rvuFFY2xXpn5dy0qk1I4IU6SVd5RXT0TgFXnA==" + "version": "7.5.6", + "resolved": "https://npme.walmart.com/@walmart/iteminfo-mini-app/-/iteminfo-mini-app-7.5.6.tgz", + "integrity": "sha512-eG3ehoAeX/5MHz76s17dCCnT2M3v7exljWX5/9L5elHS2DbOES+aatYaT5akGzJH+WanottPe4J5Kp2jZWk3Vw==" }, "@walmart/manager-approvals-miniapp": { "version": "0.2.4" @@ -33710,9 +33710,9 @@ } }, "@walmart/mod-flex-mini-app": { - "version": "1.11.5", - "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.11.5.tgz", - "integrity": "sha512-DAvq/WaTZXUVWCjbuL6xrCoc4XUCel/vJtvrOhWozCpgHAlw/4VG3zGJRt7sPRSSluekRr/CjbNB5i+VX8U9wA==" + "version": "1.11.6", + "resolved": "https://npme.walmart.com/@walmart/mod-flex-mini-app/-/mod-flex-mini-app-1.11.6.tgz", + "integrity": "sha512-Qw1WDLt8GOi2StFWZOlB7YNXhTg79JGqpuNmD3N8gSW+WQpJyTcEFo7aeZmEJDUNddM2Fj2Sx+7fddPfmg8shQ==" }, "@walmart/moment-walmart": { "version": "1.0.4" --- package.json @@ -99,13 +99,13 @@ "@walmart/gta-react-native-calendars": "0.0.16", "@walmart/gtp-shared-components": "2.0.10", "@walmart/impersonation-mini-app": "1.20.2", - "@walmart/ims-print-services-ui": "2.5.7", + "@walmart/ims-print-services-ui": "2.5.8", "@walmart/inbox-mini-app": "0.86.1", - "@walmart/iteminfo-mini-app": "7.5.5", + "@walmart/iteminfo-mini-app": "7.5.6", "@walmart/manager-approvals-miniapp": "0.2.4", "@walmart/me-field-mini-app": "13.0.3", "@walmart/metrics-mini-app": "0.13.11", - "@walmart/mod-flex-mini-app": "1.11.5", + "@walmart/mod-flex-mini-app": "1.11.6", "@walmart/moment-walmart": "1.0.4", "@walmart/onewalmart-miniapp": "1.0.16", "@walmart/pay-stub-miniapp": "0.9.35",
bump up iteminfo print version for drop 15
bump up iteminfo print version for drop 15
59ced8c060c3dc1d6f92336b807e5d46c8d9e397
--- package-lock.json @@ -82,6 +82,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.4", "@walmart/myteam-mini-app": "1.0.18", + "@walmart/native-rfid-scanner": "3.7.3", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", "@walmart/payrollsolution_miniapp": "0.140.1", @@ -98,6 +99,7 @@ "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.7", "@walmart/returns-mini-app": "4.6.0", + "@walmart/rfid-scan-mini-app": "2.2.8", "@walmart/roster-mini-app": "1.0.20", "@walmart/schedule-mini-app": "0.94.1", "@walmart/shelfavailability-mini-app": "1.5.23", @@ -138,6 +140,7 @@ "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", "react-native-biometrics": "^3.0.0", + "react-native-ble-manager": "^11.3.2", "react-native-blob-util": "^0.16.3", "react-native-calendars": "^1.1291.0", "react-native-callkeep": "^4.3.12", @@ -12042,6 +12045,16 @@ "integrity": "sha512-pZ2pjU+2vnVa6VVCFfHNNa60guq9sZ/CD45/he8ahEBqOcIPROSqcsfN0e5GQm71WfImY0mIEy/tuhkhTb7rIQ==", "hasInstallScript": true }, + "node_modules/@walmart/native-rfid-scanner": { + "version": "3.7.3", + "resolved": "https://npme.walmart.com/@walmart/native-rfid-scanner/-/native-rfid-scanner-3.7.3.tgz", + "integrity": "sha512-/Fw3Um5xplxEq/c1rCSJO52Do09yU9QruJgAtUXp0US/mrXVhiuymq9n6D99m9vH6MqAYEGYkXxME4lPWLE2Qg==", + "license": "MIT", + "peerDependencies": { + "react": "*", + "react-native": "*" + } + }, "node_modules/@walmart/onewalmart-miniapp": { "version": "1.0.24", "resolved": "https://npme.walmart.com/@walmart/onewalmart-miniapp/-/onewalmart-miniapp-1.0.24.tgz", @@ -12306,6 +12319,31 @@ "redux": "$redux" } }, + "node_modules/@walmart/rfid-scan-mini-app": { + "version": "2.2.8", + "resolved": "https://npme.walmart.com/@walmart/rfid-scan-mini-app/-/rfid-scan-mini-app-2.2.8.tgz", + "integrity": "sha512-pKTiyDnRyGOAQexNfZlIwOfKkXUOv2NwNQ7TwM9FXLEg6lGXUa91bZuevCuv06BwqqyXr59LDXd39uv50WBiWg==", + "peerDependencies": { + "@react-navigation/native": ">=6.0.0", + "@react-navigation/stack": ">=6.1.0", + "@walmart/functional-components": ">=4.0.3", + "@walmart/gtp-shared-components": ">=2.1.3", + "@walmart/native-rfid-scanner": ">=3.7.3", + "@walmart/react-native-scanner-3.0": ">=0.3.0", + "@walmart/redux-store": ">=3.1.7", + "@walmart/ui-components": ">=1.15.1", + "react": "*", + "react-native": "*", + "react-native-ble-manager": ">=11.0.4", + "react-native-circular-progress": ">=1.3.7", + "react-native-new-snap-carousel": ">=3.9.3", + "react-native-permissions": ">=3.6.0", + "react-redux": ">=8.0.4", + "redux": ">=4.1.2", + "reselect": ">=4.0.0", + "uuid": ">=3.3.2" + } + }, "node_modules/@walmart/roster-mini-app": { "version": "1.0.20", "resolved": "https://npme.walmart.com/@walmart/roster-mini-app/-/roster-mini-app-1.0.20.tgz", @@ -32375,6 +32413,15 @@ "react-native": ">=0.60.0" } }, + "node_modules/react-native-ble-manager": { + "version": "11.3.2", + "resolved": "https://npme.walmart.com/react-native-ble-manager/-/react-native-ble-manager-11.3.2.tgz", + "integrity": "sha512-+xkiEBbFMyIbBQa+bIE99fNq2nRpTOTcK2XIcX7Dc1kNKY/jqEmspPqARggGjcXdjgwHkTuWsD+7BU7yiQFCQA==", + "license": "Apache-2.0", + "peerDependencies": { + "react-native": ">=0.60.0" + } + }, "node_modules/react-native-blob-util": { "version": "0.16.4", "resolved": "https://npme.walmart.com/react-native-blob-util/-/react-native-blob-util-0.16.4.tgz", --- package.json @@ -123,6 +123,7 @@ "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.4", "@walmart/myteam-mini-app": "1.0.18", + "@walmart/native-rfid-scanner": "3.7.3", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", "@walmart/payrollsolution_miniapp": "0.140.1", @@ -139,6 +140,7 @@ "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.7", "@walmart/returns-mini-app": "4.6.0", + "@walmart/rfid-scan-mini-app": "2.2.8", "@walmart/roster-mini-app": "1.0.20", "@walmart/schedule-mini-app": "0.94.1", "@walmart/shelfavailability-mini-app": "1.5.23", @@ -179,6 +181,7 @@ "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", "react-native-biometrics": "^3.0.0", + "react-native-ble-manager": "^11.3.2", "react-native-blob-util": "^0.16.3", "react-native-calendars": "^1.1291.0", "react-native-callkeep": "^4.3.12", @@ -383,6 +386,7 @@ "@walmart/mod-flex-mini-app": "1.16.4", "@walmart/moment-walmart": "1.0.4", "@walmart/money-auth-shared-components": "0.1.4", + "@walmart/native-rfid-scanner": "3.7.3", "@walmart/onewalmart-miniapp": "1.0.24", "@walmart/pay-stub-miniapp": "0.15.2", "@walmart/payrollsolution_miniapp": "0.140.1", @@ -398,6 +402,7 @@ "@walmart/receipt-check-miniapp": "1.19.3", "@walmart/redux-store": "6.0.7", "@walmart/returns-mini-app": "4.6.0", + "@walmart/rfid-scan-mini-app": "2.2.8", "@walmart/schedule-mini-app": "0.94.1", "@walmart/shelfavailability-mini-app": "1.5.23", "@walmart/store-feature-orders": "1.26.5", @@ -437,6 +442,7 @@ "react-native-background-timer": "^2.4.1", "react-native-barcode-builder": "^2.0.0", "react-native-biometrics": "^3.0.0", + "react-native-ble-manager": "^11.3.2", "react-native-blob-util": "^0.16.3", "react-native-calendars": "^1.1291.0", "react-native-canvas": "^0.1.38",
Add @walmart/rfid-scan-mini-app 2.2.8
Add @walmart/rfid-scan-mini-app 2.2.8
394be0469ee86f94b3ab4da0ccd3f4d82e58cb5a
--- package-lock.json @@ -39,7 +39,7 @@ "@walmart/attendance-mini-app": "0.190.2", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", - "@walmart/copilot-mini-app": "^1.65.5", + "@walmart/copilot-mini-app": "^1.65.10", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.11.0", "@walmart/core-utils": "~2.0.5", @@ -4935,9 +4935,9 @@ } }, "node_modules/@walmart/copilot-mini-app": { - "version": "1.65.5", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.65.5.tgz", - "integrity": "sha512-J45Ufb9myRTi+lfQZPBu0M/u2P2cP9mZ1CS4D2ODua28+/d8ON2IXR8LQhQrqKIGD+o//Cvwt28SUckZ2Yw5Rg==", + "version": "1.65.10", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.65.10.tgz", + "integrity": "sha512-snzrAeJSnkGryJvR5Egg7gTduzCQ6R+tuxYnYXT8YvceVedvkIf9BQM1QeR0UPe86Y4c+iwolUW4/2CZC0sLaQ==", "hasInstallScript": true, "peerDependencies": { "@react-navigation/native": "^6.0.0", @@ -25130,9 +25130,9 @@ } }, "@walmart/copilot-mini-app": { - "version": "1.65.5", - "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.65.5.tgz", - "integrity": "sha512-J45Ufb9myRTi+lfQZPBu0M/u2P2cP9mZ1CS4D2ODua28+/d8ON2IXR8LQhQrqKIGD+o//Cvwt28SUckZ2Yw5Rg==" + "version": "1.65.10", + "resolved": "https://npme.walmart.com/@walmart/copilot-mini-app/-/copilot-mini-app-1.65.10.tgz", + "integrity": "sha512-snzrAeJSnkGryJvR5Egg7gTduzCQ6R+tuxYnYXT8YvceVedvkIf9BQM1QeR0UPe86Y4c+iwolUW4/2CZC0sLaQ==" }, "@walmart/core-services": { "version": "2.0.19", --- package.json @@ -81,7 +81,7 @@ "@walmart/attendance-mini-app": "0.190.2", "@walmart/compass-sdk-rn": "4.0.0", "@walmart/config-components": "4.1.0-rc.4", - "@walmart/copilot-mini-app": "^1.65.5", + "@walmart/copilot-mini-app": "^1.65.10", "@walmart/core-services": "~2.0.19", "@walmart/core-services-allspark": "~2.11.0", "@walmart/core-utils": "~2.0.5",
chore: bump copilot @1.65.10
chore: bump copilot @1.65.10
77f4732e2897517c184f6690b6993de09f0af64a
--- package.json @@ -39,9 +39,6 @@ "increment:buildNumber": "react-native-version -b", "postinstall": "sh ./scripts/stubFirestore.sh" }, - "resolutions": { - "@react-native-community/datetimepicker": "3.0.9" - }, "dependencies": { "@react-native-community/art": "^1.2.0", "@react-native-community/async-storage": "^1.11.0",
removing resolutions
removing resolutions
bb9ab10ea6119819424ee0232f015c9fd3f35b6c
--- package-lock.json @@ -4271,9 +4271,9 @@ "integrity": "sha512-7nXe02E/AOFtT1u6/tVerIskwWvSoJcMgYN2DNH7vMgbb0YIFOsqwzX+nbRh/AcaZhC7YX5H2irVCc6/5/HjJw==" }, "@walmart/metrics-mini-app": { - "version": "0.5.7", - "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.5.7.tgz", - "integrity": "sha512-VMNcbcNCus3z8cuGyV1PrgBnTqfGeFy5NTxyHs+0j9YhFHDEN/2sCp88x5f0UyFFFtrQzgh6nYfwtxHx3TZfbg==", + "version": "0.5.8", + "resolved": "https://npme.walmart.com/@walmart/metrics-mini-app/-/metrics-mini-app-0.5.8.tgz", + "integrity": "sha512-PHoCdNqARbKpM+8x4v0tcO26SYyYq6kAqWDAjm1LRrx961JnZefubfTP4KSgRKHSY705nAQtPKFTCYr2e18Nzg==", "requires": { "@types/base-64": "^1.0.0", "apisauce": "^1.1.2", --- package.json @@ -86,7 +86,7 @@ "@walmart/inbox-mini-app": "0.19.0", "@walmart/iteminfo-mini-app": "2.0.16", "@walmart/manager-approvals-miniapp": "0.0.58", - "@walmart/metrics-mini-app": "0.5.7", + "@walmart/metrics-mini-app": "0.5.8", "@walmart/moment-walmart": "1.0.4", "@walmart/push-to-talk-mini-app": "0.5.39", "@walmart/react-native-env": "^0.2.0",
metrics bump with minor fixes and spanish translations
metrics bump with minor fixes and spanish translations