diff --git a/android/.gradle/7.5.1/checksums/checksums.lock b/android/.gradle/7.5.1/checksums/checksums.lock index 94c68516..75268b85 100644 Binary files a/android/.gradle/7.5.1/checksums/checksums.lock and b/android/.gradle/7.5.1/checksums/checksums.lock differ diff --git a/android/.gradle/7.5.1/checksums/md5-checksums.bin b/android/.gradle/7.5.1/checksums/md5-checksums.bin index c5cffd85..0493eecc 100644 Binary files a/android/.gradle/7.5.1/checksums/md5-checksums.bin and b/android/.gradle/7.5.1/checksums/md5-checksums.bin differ diff --git a/android/.gradle/7.5.1/checksums/sha1-checksums.bin b/android/.gradle/7.5.1/checksums/sha1-checksums.bin index 0686815a..d90354dd 100644 Binary files a/android/.gradle/7.5.1/checksums/sha1-checksums.bin and b/android/.gradle/7.5.1/checksums/sha1-checksums.bin differ diff --git a/android/.gradle/7.5.1/executionHistory/executionHistory.bin b/android/.gradle/7.5.1/executionHistory/executionHistory.bin index c9997928..9b2a2880 100644 Binary files a/android/.gradle/7.5.1/executionHistory/executionHistory.bin and b/android/.gradle/7.5.1/executionHistory/executionHistory.bin differ diff --git a/android/.gradle/7.5.1/executionHistory/executionHistory.lock b/android/.gradle/7.5.1/executionHistory/executionHistory.lock index 9cc61569..28822c9b 100644 Binary files a/android/.gradle/7.5.1/executionHistory/executionHistory.lock and b/android/.gradle/7.5.1/executionHistory/executionHistory.lock differ diff --git a/android/.gradle/7.5.1/fileHashes/fileHashes.bin b/android/.gradle/7.5.1/fileHashes/fileHashes.bin index 8ff438bf..b009f899 100644 Binary files a/android/.gradle/7.5.1/fileHashes/fileHashes.bin and b/android/.gradle/7.5.1/fileHashes/fileHashes.bin differ diff --git a/android/.gradle/7.5.1/fileHashes/fileHashes.lock b/android/.gradle/7.5.1/fileHashes/fileHashes.lock index 9fe11580..cacdf7f8 100644 Binary files a/android/.gradle/7.5.1/fileHashes/fileHashes.lock and b/android/.gradle/7.5.1/fileHashes/fileHashes.lock differ diff --git a/android/.gradle/7.5/checksums/checksums.lock b/android/.gradle/7.5/checksums/checksums.lock deleted file mode 100644 index e1ee5207..00000000 Binary files a/android/.gradle/7.5/checksums/checksums.lock and /dev/null differ diff --git a/android/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock b/android/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index d2c9f453..00000000 Binary files a/android/.gradle/7.5/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/android/.gradle/7.5/dependencies-accessors/gc.properties b/android/.gradle/7.5/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/android/.gradle/7.5/fileChanges/last-build.bin b/android/.gradle/7.5/fileChanges/last-build.bin deleted file mode 100644 index f76dd238..00000000 Binary files a/android/.gradle/7.5/fileChanges/last-build.bin and /dev/null differ diff --git a/android/.gradle/7.5/fileHashes/fileHashes.lock b/android/.gradle/7.5/fileHashes/fileHashes.lock deleted file mode 100644 index 46a85f1f..00000000 Binary files a/android/.gradle/7.5/fileHashes/fileHashes.lock and /dev/null differ diff --git a/android/.gradle/7.5/gc.properties b/android/.gradle/7.5/gc.properties deleted file mode 100644 index e69de29b..00000000 diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 2bf2e09a..42655328 100644 Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin index e4dc9ac0..c0a2568a 100644 Binary files a/android/.gradle/buildOutputCleanup/outputFiles.bin and b/android/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/android/.gradle/file-system.probe b/android/.gradle/file-system.probe index 673d0c65..85000b7b 100644 Binary files a/android/.gradle/file-system.probe and b/android/.gradle/file-system.probe differ diff --git a/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ= b/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ= index 6fd33e2e..73808e09 100644 Binary files a/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ= and b/android/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NDLijDKD7QtJwkHY7mvcct+I6eQ= differ diff --git a/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 75b5ecce..c252d487 100644 --- a/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/android/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Thu Apr 10 14:29:56 SGT 2025 +#Fri Apr 11 14:01:10 SGT 2025 com.project.yondu.unioilloyaltyapp-main-49\:/mipmap-xxxhdpi/ic_launcher_round.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat com.project.yondu.unioilloyaltyapp-main-49\:/mipmap-hdpi/ic_launcher_foreground.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat com.project.yondu.unioilloyaltyapp-main-49\:/mipmap-hdpi/ic_launcher.png=C\:\\Users\\lenovo\\unioil-loyalty-rn-app-ios-and-android\\android\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat diff --git a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt index 6534cfe7..c5fd7b6a 100644 --- a/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ b/android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt @@ -1,4 +1,4 @@ -#Thu Apr 10 14:41:30 SGT 2025 +#Fri Apr 11 14:13:48 SGT 2025 path.4=15/classes.dex path.3=14/classes.dex path.2=0/classes.dex diff --git a/app/App.js b/app/App.js index 6bfc10bc..9cdf79c0 100644 --- a/app/App.js +++ b/app/App.js @@ -1,10 +1,4 @@ -import { TextEncoder } from 'fast-text-encoding'; - -if (typeof global.TextEncoder === 'undefined') { - global.TextEncoder = TextEncoder; -} - import 'react-native-gesture-handler'; import * as React from 'react'; import { Platform, AppState, Text, TextInput, Alert, LogBox } from 'react-native'; diff --git a/app/components/elements.js b/app/components/elements.js index db64c998..0f752337 100644 --- a/app/components/elements.js +++ b/app/components/elements.js @@ -1020,7 +1020,7 @@ const ActionOption = (props) => { {props.buttons.map(item => ( - + {item.name} ))} diff --git a/app/screens/myprofile/profile/edit.js b/app/screens/myprofile/profile/edit.js index c1ab58ca..69d796c5 100644 --- a/app/screens/myprofile/profile/edit.js +++ b/app/screens/myprofile/profile/edit.js @@ -654,11 +654,13 @@ class EditProfile extends React.PureComponent { buttons={[ { name: 'Edit Photo', - onPress: () => this.onEditPhoto() + onPress: () => this.onEditPhoto(), + key: 'edit_photo' }, { name: 'Delete Photo', - onPress: () => this.onDeletePhoto() + onPress: () => this.onDeletePhoto(), + key: 'delete_photo' } ]} /> diff --git a/app/screens/myprofile/transaction/transaction.js b/app/screens/myprofile/transaction/transaction.js index 0d60a6de..e46035ed 100644 --- a/app/screens/myprofile/transaction/transaction.js +++ b/app/screens/myprofile/transaction/transaction.js @@ -70,7 +70,8 @@ class MyTransactions extends React.Component { const disabled = ["MOBILE APP SIGN UP BONUS", "SIGN UP BONUS"].includes(data.entry_type_desc); return ( - + this.init()}) } - }} - key={index} /> + }} /> ) }); diff --git a/index.js b/index.js index e37751b6..20425b2c 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,8 @@ /** * @format */ +import './polyfills.js'; + import 'react-native-gesture-handler'; import 'react-native-reanimated'; diff --git a/package.json b/package.json index 8ae4eea9..3a3b56b6 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "card-validator": "^8.1.1", "crypto-js": "4.1.1", "deprecated-react-native-prop-types": "^5.0.0", - "fast-text-encoding": "^1.0.6", "lodash": "^4.17.21", "lottie-react-native": "6.4.1", "moment": "2.29.4", @@ -86,7 +85,8 @@ "redux-thunk": "2.4.2", "rn-sliding-up-panel": "2.4.6", "styled-components": "5.3.11", - "styled-system": "^5.1.5" + "styled-system": "^5.1.5", + "text-encoding": "^0.7.0" }, "devDependencies": { "@babel/core": "^7.9.0", diff --git a/polyfills.js b/polyfills.js new file mode 100644 index 00000000..f56dea73 --- /dev/null +++ b/polyfills.js @@ -0,0 +1,10 @@ +// Polyfill code +import { TextEncoder, TextDecoder } from 'text-encoding'; + +if (typeof globalThis.TextEncoder === 'undefined') { + globalThis.TextEncoder = TextEncoder; +} + +if (typeof globalThis.TextDecoder === 'undefined') { + globalThis.TextDecoder = TextDecoder; +} diff --git a/yarn.lock b/yarn.lock index 96e52f20..c1cefc92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4297,9 +4297,9 @@ domutils@^3.0.1: domhandler "^5.0.3" dotenv@^16.4.5: - version "16.4.7" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.7.tgz#0e20c5b82950140aa99be360a8a5f52335f53c26" - integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ== + version "16.5.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.5.0.tgz#092b49f25f808f020050051d1ff258e404c78692" + integrity sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg== dunder-proto@^1.0.0, dunder-proto@^1.0.1: version "1.0.1" @@ -4321,9 +4321,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.5.73: - version "1.5.135" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.135.tgz#6d835020fa0c7f02f30d7608c2f3c0a764236699" - integrity sha512-8gXUdEmvb+WCaYUhA0Svr08uSeRjM2w3x5uHOc1QbaEVzJXB8rgm5eptieXzyKoVEtinLvW6MtTcurA65PeS1Q== + version "1.5.136" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.136.tgz#854b45e6a892137762cb026ed6ec77391fc5c07b" + integrity sha512-kL4+wUTD7RSA5FHx5YwWtjDnEEkIIikFgWHR4P6fqjw1PPLlqYkxeOb++wAauAssat0YClCy8Y3C5SxgSkjibQ== emittery@^0.13.1: version "0.13.1" @@ -4802,11 +4802,6 @@ fast-loops@^1.1.3: resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.4.tgz#61bc77d518c0af5073a638c6d9d5c7683f069ce2" integrity sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg== -fast-text-encoding@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" - integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== - fast-xml-parser@^4.0.12: version "4.5.3" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz#c54d6b35aa0f23dc1ea60b6c884340c006dc6efb" @@ -9059,6 +9054,11 @@ test-exclude@^6.0.0: glob "^7.1.4" minimatch "^3.0.4" +text-encoding@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643" + integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA== + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"