task-me
/
application-old-0.63
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

FIX | fix scrolling to end button (chats/comments)

merge-requests/292/head
Yevhen Romanenko 3 years ago
parent
6799ae0dbd
commit
8ee0e51650
5 changed files with 36 additions and 458 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      ios/Podfile.lock
  2. 453
      package-lock.json
  3. 8
      src/modules/comments/screens/comments.screen.tsx
  4. 14
      src/shared/components/plugins/chat/chat-messages.component.tsx
  5. 8
      yarn.lock

11
ios/Podfile.lock
Unescape View File

@ -602,7 +602,7 @@ SPEC CHECKSUMS: @@ -602,7 +602,7 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: c71c5917ec0ad2de41d5d06a5855f6d5eda06971
FBReactNativeSpec: db3c5050c0e55e54339535438f466df9603f4a12
FBReactNativeSpec: 1d8cb9b6fe4b85899f49b6e1f28f24709b90197e
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
OneSignal: 29b555f5991109dc717f75d4440c565cab92511c
@ -623,11 +623,13 @@ SPEC CHECKSUMS: @@ -623,11 +623,13 @@ SPEC CHECKSUMS:
react-native-clear-cache: 28bce59b33cd809e0afe903786787b4409d1c1fb
react-native-date-picker: 201b481c94dcb7678f4712477ad026dd7793305b
react-native-document-picker: 429972f7ece4463aa5bcdd789622b3a674a3c5d1
react-native-html-to-pdf: 4c5c6e26819fe202971061594058877aa9b25265
react-native-image-picker: 5fe0a96bef4935bbdfb02f59b910bf40d5526109
react-native-netinfo: 3d3769f0d65de15c83a9bf1346f8be71de5a24bf
react-native-onesignal: 7643517fe655b94cfda8e697ec16f9b9135648b8
react-native-orientation-locker: 998c0744e26624407dac068c04c605b4af7304a2
react-native-pager-view: 5ab4d0b4b44d89f77310cb3eb8129745f274ce55
react-native-print: 1ae7a4ce4bf673b975f2ec9c4e00ad0c9b60e8aa
react-native-restart: 45c8dca02491980f2958595333cbccd6877cb57e
react-native-safe-area-context: 61c8c484a3a9e7d1fda19f7b1794b35bbfd2262a
react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
@ -645,7 +647,10 @@ SPEC CHECKSUMS: @@ -645,7 +647,10 @@ SPEC CHECKSUMS:
React-runtimeexecutor: 493d9abb8b23c3f84e19ae221eeba92cadcb70dc
ReactCommon: 8fea6422328e2fc093e25c9fac67adbcf0f04fb4
ReactNativeExceptionHandler: b11ff67c78802b2f62eed0e10e75cb1ef7947c60
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNAudioRecorderPlayer: 001f01049754e978c43af97162452c8563d5794a
RNCAsyncStorage: e8b8d6320a0dd90eb610fb0d0b1ef90596697c69
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
RNCPicker: c3a3d481bec16624ed84a3c2a64c92fdc5515960
RNCPushNotificationIOS: 87b8d16d3ede4532745e05b03c42cff33a36cc45
RNDeviceInfo: cc7de0772378f85d8f36ae439df20f05c590a651
@ -656,7 +661,7 @@ SPEC CHECKSUMS: @@ -656,7 +661,7 @@ SPEC CHECKSUMS:
RNPermissions: f7ebe52db07c00901127966ca080b4ec6a6ceb0a
RNReanimated: 58e7b950e0172235ff8296dd39ec145f9577e301
RNScreens: eb0dfb2d6b21d2d7f980ad46b14eb306d2f1062e
RNSoundLevel: a02f3bfbb81aeec256de4e41d7fc967b32e3faf1
RNSoundLevel: 3dd5d2f6431e47f806233600936deb636a0d9800
RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
RNVectorIcons: f67a1abce2ec73e62fe4606e8110e95a832bc859
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
@ -666,4 +671,4 @@ SPEC CHECKSUMS: @@ -666,4 +671,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 08b7d007885579803f4a8533ea82622e0abf9ea0
COCOAPODS: 1.11.3
COCOAPODS: 1.11.2

453
package-lock.json generated
Unescape View File

@ -11,7 +11,9 @@ @@ -11,7 +11,9 @@
"@bitalikrty/redux-create-reducer": "^1.0.0",
"@expo/react-native-action-sheet": "^3.13.0",
"@gorhom/bottom-sheet": "^4.1.5",
"@miblanchard/react-native-slider": "^2.1.0",
"@react-native-async-storage/async-storage": "^1.15.8",
"@react-native-community/clipboard": "^1.5.1",
"@react-native-community/netinfo": "^6.2.1",
"@react-native-community/push-notification-ios": "^1.10.1",
"@react-native-picker/picker": "^1.16.6",
@ -31,7 +33,10 @@ @@ -31,7 +33,10 @@
"react": "17.0.1",
"react-native": "^0.64.3",
"react-native-app-badge": "^0.1.5",
"react-native-audio-recorder-player": "^3.4.0",
"react-native-autolink": "^4.0.0",
"react-native-calendars": "^1.1274.0",
"react-native-controlled-mentions": "^2.2.5",
"react-native-date-picker": "^3.4.3",
"react-native-device-info": "^8.3.3",
"react-native-document-picker": "^8.0.0",
@ -40,8 +45,10 @@ @@ -40,8 +45,10 @@
"react-native-exception-handler": "^2.10.10",
"react-native-expire-storage": "0.0.3",
"react-native-fast-image": "^8.5.11",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "^1.10.3",
"react-native-gifted-chat": "^0.16.3",
"react-native-html-to-pdf": "^0.12.0",
"react-native-image-crop-picker": "^0.37.2",
"react-native-image-picker": "^4.7.1",
"react-native-keyboard-accessory": "^0.1.16",
@ -2756,7 +2763,6 @@ @@ -2756,7 +2763,6 @@
"node": ">= 10.14.2"
}
},
<<<<<<< HEAD
"node_modules/@miblanchard/react-native-slider": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/@miblanchard/react-native-slider/-/react-native-slider-2.1.0.tgz",
@ -2766,8 +2772,6 @@ @@ -2766,8 +2772,6 @@
"react-native": ">=0.59"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/@react-native-async-storage/async-storage": {
"version": "1.15.8",
"resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.15.8.tgz",
@ -2948,7 +2952,6 @@ @@ -2948,7 +2952,6 @@
"ora": "^3.4.0"
}
},
<<<<<<< HEAD
"node_modules/@react-native-community/clipboard": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/@react-native-community/clipboard/-/clipboard-1.5.1.tgz",
@ -2958,8 +2961,6 @@ @@ -2958,8 +2961,6 @@
"react-native": ">=0.57.0"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/@react-native-community/eslint-config": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/@react-native-community/eslint-config/-/eslint-config-2.0.0.tgz",
@ -3227,7 +3228,6 @@ @@ -3227,7 +3228,6 @@
"@sinonjs/commons": "^1.7.0"
}
},
<<<<<<< HEAD
"node_modules/@socket.io/base64-arraybuffer": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
@ -3241,8 +3241,6 @@ @@ -3241,8 +3241,6 @@
"resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
"integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/@svgr/babel-plugin-add-jsx-attribute": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
@ -3916,14 +3914,6 @@ @@ -3916,14 +3914,6 @@
"node": ">=0.4.0"
}
},
<<<<<<< HEAD
=======
"node_modules/after": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
"integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@ -4173,14 +4163,6 @@ @@ -4173,14 +4163,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
<<<<<<< HEAD
=======
"node_modules/arraybuffer.slice": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
"integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/asap": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
@ -4261,7 +4243,6 @@ @@ -4261,7 +4243,6 @@
"node": ">= 4.5.0"
}
},
<<<<<<< HEAD
"node_modules/autolinker": {
"version": "3.15.0",
"resolved": "https://registry.npmjs.org/autolinker/-/autolinker-3.15.0.tgz",
@ -4270,8 +4251,6 @@ @@ -4270,8 +4251,6 @@
"tslib": "^2.3.0"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@ -4533,14 +4512,6 @@ @@ -4533,14 +4512,6 @@
"@babel/core": "^7.0.0"
}
},
<<<<<<< HEAD
=======
"node_modules/backo2": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
"integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@ -4563,14 +4534,11 @@ @@ -4563,14 +4534,11 @@
"node": ">=0.10.0"
}
},
<<<<<<< HEAD
"node_modules/base-64": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
"integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs="
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/base/node_modules/define-property": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
@ -4617,17 +4585,6 @@ @@ -4617,17 +4585,6 @@
"node": ">=0.10.0"
}
},
<<<<<<< HEAD
=======
"node_modules/base64-arraybuffer": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
"engines": {
"node": ">= 0.6.0"
}
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/base64-js": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@ -4656,20 +4613,6 @@ @@ -4656,20 +4613,6 @@
"tweetnacl": "^0.14.3"
}
},
<<<<<<< HEAD
=======
"node_modules/better-assert": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
"integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
"dependencies": {
"callsite": "1.0.0"
},
"engines": {
"node": "*"
}
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/big-integer": {
"version": "1.6.51",
"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
@ -4703,14 +4646,6 @@ @@ -4703,14 +4646,6 @@
"node": ">= 6"
}
},
<<<<<<< HEAD
=======
"node_modules/blob": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
"integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/boolbase": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@ -4891,17 +4826,6 @@ @@ -4891,17 +4826,6 @@
"node": ">=4"
}
},
<<<<<<< HEAD
=======
"node_modules/callsite": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
"integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
"engines": {
"node": "*"
}
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/callsites": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
@ -5276,27 +5200,11 @@ @@ -5276,27 +5200,11 @@
"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
},
<<<<<<< HEAD
=======
"node_modules/component-bind": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/component-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
"integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
},
<<<<<<< HEAD
=======
"node_modules/component-inherit": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/compressible": {
"version": "2.0.18",
"resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@ -5800,7 +5708,6 @@ @@ -5800,7 +5708,6 @@
"node": ">=8"
}
},
<<<<<<< HEAD
"node_modules/diff": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
@ -5809,8 +5716,6 @@ @@ -5809,8 +5716,6 @@
"node": ">=0.3.1"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/diff-sequences": {
"version": "26.6.2",
"resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
@ -5887,7 +5792,6 @@ @@ -5887,7 +5792,6 @@
"domelementtype": "1"
}
},
<<<<<<< HEAD
"node_modules/dooboolab-welcome": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/dooboolab-welcome/-/dooboolab-welcome-1.3.2.tgz",
@ -5897,8 +5801,6 @@ @@ -5897,8 +5801,6 @@
"dooboolab-welcome": "bin/hello.js"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/ecc-jsbn": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@ -5958,7 +5860,6 @@ @@ -5958,7 +5860,6 @@
}
},
"node_modules/engine.io-client": {
<<<<<<< HEAD
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.1.tgz",
"integrity": "sha512-5cu7xubVxEwoB6O9hJ6Zfu990yBVjXfyMlE1ZvfO5L8if3Kvc9bgDNEapV0C5pMp+5Om1UZFnljxoOuFm6dBKA==",
@ -6020,74 +5921,6 @@ @@ -6020,74 +5921,6 @@
},
"engines": {
"node": ">=10.0.0"
=======
"version": "3.4.4",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.4.tgz",
"integrity": "sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==",
"dependencies": {
"component-emitter": "~1.3.0",
"component-inherit": "0.0.3",
"debug": "~3.1.0",
"engine.io-parser": "~2.2.0",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"parseqs": "0.0.6",
"parseuri": "0.0.6",
"ws": "~6.1.0",
"xmlhttprequest-ssl": "~1.5.4",
"yeast": "0.1.2"
}
},
"node_modules/engine.io-client/node_modules/debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/engine.io-client/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node_modules/engine.io-client/node_modules/parseqs": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz",
"integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="
},
"node_modules/engine.io-client/node_modules/parseuri": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz",
"integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
},
"node_modules/engine.io-client/node_modules/ws": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
"integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
"dependencies": {
"async-limiter": "~1.0.0"
}
},
"node_modules/engine.io-parser": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz",
"integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==",
"dependencies": {
"after": "0.8.2",
"arraybuffer.slice": "~0.0.7",
"base64-arraybuffer": "0.1.4",
"blob": "0.0.5",
"has-binary2": "~1.0.2"
}
},
"node_modules/engine.io-parser/node_modules/base64-arraybuffer": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
"integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=",
"engines": {
"node": ">= 0.6.0"
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
}
},
"node_modules/enquirer": {
@ -6158,10 +5991,6 @@ @@ -6158,10 +5991,6 @@
"version": "1.19.1",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz",
"integrity": "sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1",
@ -6195,10 +6024,6 @@ @@ -6195,10 +6024,6 @@
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"is-callable": "^1.1.4",
"is-date-object": "^1.0.1",
@ -7569,10 +7394,6 @@ @@ -7569,10 +7394,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
"integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.2",
"get-intrinsic": "^1.1.1"
@ -7718,35 +7539,10 @@ @@ -7718,35 +7539,10 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
<<<<<<< HEAD
=======
"node_modules/has-binary2": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
"dependencies": {
"isarray": "2.0.1"
}
},
"node_modules/has-binary2/node_modules/isarray": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
},
"node_modules/has-cors": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@ -7770,10 +7566,6 @@ @@ -7770,10 +7566,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"has-symbols": "^1.0.2"
},
@ -8203,14 +7995,6 @@ @@ -8203,14 +7995,6 @@
"node": ">=0.8.19"
}
},
<<<<<<< HEAD
=======
"node_modules/indexof": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@ -8235,10 +8019,6 @@ @@ -8235,10 +8019,6 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"get-intrinsic": "^1.1.0",
"has": "^1.0.3",
@ -8300,10 +8080,6 @@ @@ -8300,10 +8080,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
"integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"has-bigints": "^1.0.1"
},
@ -8315,10 +8091,6 @@ @@ -8315,10 +8091,6 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
"integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.2",
"has-tostringtag": "^1.0.0"
@ -8339,10 +8111,6 @@ @@ -8339,10 +8111,6 @@
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"engines": {
"node": ">= 0.4"
},
@ -8398,10 +8166,6 @@ @@ -8398,10 +8166,6 @@
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"has-tostringtag": "^1.0.0"
},
@ -8507,10 +8271,6 @@ @@ -8507,10 +8271,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"engines": {
"node": ">= 0.4"
},
@ -8530,10 +8290,6 @@ @@ -8530,10 +8290,6 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
"integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"has-tostringtag": "^1.0.0"
},
@ -8581,10 +8337,6 @@ @@ -8581,10 +8337,6 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.2",
"has-tostringtag": "^1.0.0"
@ -8600,10 +8352,6 @@ @@ -8600,10 +8352,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz",
"integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@ -8620,10 +8368,6 @@ @@ -8620,10 +8368,6 @@
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
"integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"has-tostringtag": "^1.0.0"
},
@ -8644,10 +8388,6 @@ @@ -8644,10 +8388,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
"integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"has-symbols": "^1.0.2"
},
@ -8668,10 +8408,6 @@ @@ -8668,10 +8408,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz",
"integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.0"
},
@ -10864,12 +10600,8 @@ @@ -10864,12 +10600,8 @@
"node_modules/ms": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
<<<<<<< HEAD
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true
=======
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
},
"node_modules/nanoid": {
"version": "3.1.25",
@ -11215,14 +10947,6 @@ @@ -11215,14 +10947,6 @@
"node": ">=0.10.0"
}
},
<<<<<<< HEAD
=======
"node_modules/object-component": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
"integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/object-copy": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
@ -11270,10 +10994,6 @@ @@ -11270,10 +10994,6 @@
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
"integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
@ -11637,25 +11357,6 @@ @@ -11637,25 +11357,6 @@
"integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
"dev": true
},
<<<<<<< HEAD
=======
"node_modules/parseqs": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"dependencies": {
"better-assert": "~1.0.0"
}
},
"node_modules/parseuri": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"dependencies": {
"better-assert": "~1.0.0"
}
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/parseurl": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@ -12228,7 +11929,6 @@ @@ -12228,7 +11929,6 @@
"react-native": ">=0.50.0"
}
},
<<<<<<< HEAD
"node_modules/react-native-audio-recorder-player": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/react-native-audio-recorder-player/-/react-native-audio-recorder-player-3.4.0.tgz",
@ -12253,8 +11953,6 @@ @@ -12253,8 +11953,6 @@
"react-native": ">=0.25.0"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/react-native-calendars": {
"version": "1.1274.0",
"resolved": "https://registry.npmjs.org/react-native-calendars/-/react-native-calendars-1.1274.0.tgz",
@ -12287,7 +11985,6 @@ @@ -12287,7 +11985,6 @@
"resolved": "https://registry.npmjs.org/react-native-communications/-/react-native-communications-2.2.1.tgz",
"integrity": "sha1-eIO1ayCgAu63kMET+GFuqGksp5U="
},
<<<<<<< HEAD
"node_modules/react-native-controlled-mentions": {
"version": "2.2.5",
"resolved": "https://registry.npmjs.org/react-native-controlled-mentions/-/react-native-controlled-mentions-2.2.5.tgz",
@ -12318,8 +12015,6 @@ @@ -12318,8 +12015,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/react-native-date-picker": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/react-native-date-picker/-/react-native-date-picker-3.4.3.tgz",
@ -12401,7 +12096,6 @@ @@ -12401,7 +12096,6 @@
"react-native": "^0.62.0"
}
},
<<<<<<< HEAD
"node_modules/react-native-fs": {
"version": "2.20.0",
"resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz",
@ -12420,8 +12114,6 @@ @@ -12420,8 +12114,6 @@
}
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/react-native-gesture-handler": {
"version": "1.10.3",
"resolved": "https://registry.npmjs.org/react-native-gesture-handler/-/react-native-gesture-handler-1.10.3.tgz",
@ -12477,14 +12169,11 @@ @@ -12477,14 +12169,11 @@
"react-native": "*"
}
},
<<<<<<< HEAD
"node_modules/react-native-html-to-pdf": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/react-native-html-to-pdf/-/react-native-html-to-pdf-0.12.0.tgz",
"integrity": "sha512-Yb5WO9SfF86s5Yv9PqXQ7fZDr9zZOJ+6jtweT9zFLraPNHWX7pSxe2dSkeg3cGiNrib65ZXGN6ksHymfYLFSSg=="
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/react-native-image-crop-picker": {
"version": "0.37.2",
"resolved": "https://registry.npmjs.org/react-native-image-crop-picker/-/react-native-image-crop-picker-0.37.2.tgz",
@ -12635,7 +12324,6 @@ @@ -12635,7 +12324,6 @@
}
}
},
<<<<<<< HEAD
"node_modules/react-native-print": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/react-native-print/-/react-native-print-0.10.0.tgz",
@ -12645,8 +12333,6 @@ @@ -12645,8 +12333,6 @@
"react-native-windows": ">=0.62"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/react-native-raw-bottom-sheet": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/react-native-raw-bottom-sheet/-/react-native-raw-bottom-sheet-2.2.0.tgz",
@ -12747,14 +12433,11 @@ @@ -12747,14 +12433,11 @@
"react-native-svg": "*"
}
},
<<<<<<< HEAD
"node_modules/react-native-sound-level": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/react-native-sound-level/-/react-native-sound-level-1.1.5.tgz",
"integrity": "sha512-H4dVYbif/PfzMOp9IpNjJUtbODYXeHk8tI0d9mWcJcBEB/ITcP4jSvDtAOH8B/Vcu4h4Owrvsuz/Y+UfS0biuw=="
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/react-native-splash-screen": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz",
@ -13339,10 +13022,6 @@ @@ -13339,10 +13022,6 @@
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
"integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.3"
@ -13592,7 +13271,6 @@ @@ -13592,7 +13271,6 @@
"rimraf": "bin.js"
}
},
<<<<<<< HEAD
"node_modules/rn-fetch-blob": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/rn-fetch-blob/-/rn-fetch-blob-0.12.0.tgz",
@ -13618,8 +13296,6 @@ @@ -13618,8 +13296,6 @@
"node": "*"
}
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/rn-host-detect": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/rn-host-detect/-/rn-host-detect-1.2.0.tgz",
@ -14046,10 +13722,6 @@ @@ -14046,10 +13722,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.0",
"get-intrinsic": "^1.0.2",
@ -14280,7 +13952,6 @@ @@ -14280,7 +13952,6 @@
}
},
"node_modules/socket.io-client": {
<<<<<<< HEAD
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.0.tgz",
"integrity": "sha512-HW61c1G7OrYGxaI79WRn17+b03iBCdvhBj4iqyXHBoL5M8w2MSO/vChsjA93knG4GYEai1/vbXWJna9dzxXtSg==",
@ -14347,69 +14018,6 @@ @@ -14347,69 +14018,6 @@
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
=======
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz",
"integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==",
"dependencies": {
"backo2": "1.0.2",
"base64-arraybuffer": "0.1.5",
"component-bind": "1.0.0",
"component-emitter": "1.2.1",
"debug": "~4.1.0",
"engine.io-client": "~3.4.0",
"has-binary2": "~1.0.2",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"object-component": "0.0.3",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
"socket.io-parser": "~3.3.0",
"to-array": "0.1.4"
}
},
"node_modules/socket.io-client/node_modules/component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
},
"node_modules/socket.io-client/node_modules/debug": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
"dependencies": {
"ms": "^2.1.1"
}
},
"node_modules/socket.io-parser": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz",
"integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==",
"dependencies": {
"component-emitter": "~1.3.0",
"debug": "~3.1.0",
"isarray": "2.0.1"
}
},
"node_modules/socket.io-parser/node_modules/debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dependencies": {
"ms": "2.0.0"
}
},
"node_modules/socket.io-parser/node_modules/isarray": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
},
"node_modules/socket.io-parser/node_modules/ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
},
"node_modules/source-map": {
"version": "0.7.3",
@ -14736,10 +14344,6 @@ @@ -14736,10 +14344,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
"integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.3"
@ -14752,10 +14356,6 @@ @@ -14752,10 +14356,6 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
"integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.3"
@ -15164,14 +14764,6 @@ @@ -15164,14 +14764,6 @@
"resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
"integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
},
<<<<<<< HEAD
=======
"node_modules/to-array": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
},
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/to-fast-properties": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@ -15425,10 +15017,6 @@ @@ -15425,10 +15017,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
"integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"function-bind": "^1.1.1",
"has-bigints": "^1.0.1",
@ -15609,14 +15197,11 @@ @@ -15609,14 +15197,11 @@
"react": "^16.8.0 || ^17.0.0"
}
},
<<<<<<< HEAD
"node_modules/utf8": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
"integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="
},
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"node_modules/util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@ -15821,10 +15406,6 @@ @@ -15821,10 +15406,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
<<<<<<< HEAD
=======
"dev": true,
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"dependencies": {
"is-bigint": "^1.0.1",
"is-boolean-object": "^1.1.0",
@ -16015,15 +15596,9 @@ @@ -16015,15 +15596,9 @@
}
},
"node_modules/xmlhttprequest-ssl": {
<<<<<<< HEAD
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
"integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
=======
"version": "1.5.5",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
"integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"engines": {
"node": ">=0.4.0"
}
@ -16079,14 +15654,6 @@ @@ -16079,14 +15654,6 @@
"engines": {
"node": ">=6"
}
<<<<<<< HEAD
=======
},
"node_modules/yeast": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
"integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
}
},
"dependencies": {
@ -25282,7 +24849,6 @@ @@ -25282,7 +24849,6 @@
"integrity": "sha512-48wgm29HJTOlZ0DibBsvXueEOY0EPIVL0wWKbwRfgrk86+luSEuLW3aZC50oJa95zSFb9qYShTV/6dWqh4Jamg==",
"optional": true,
"requires": {}
<<<<<<< HEAD
},
"react-native-fs": {
"version": "2.20.0",
@ -25292,8 +24858,6 @@ @@ -25292,8 +24858,6 @@
"base-64": "^0.1.0",
"utf8": "^3.0.0"
}
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
},
"react-native-gesture-handler": {
"version": "1.10.3",
@ -25450,15 +25014,12 @@ @@ -25450,15 +25014,12 @@
"resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-3.2.0.tgz",
"integrity": "sha512-UPXxf2twjYL9vPI4HP2kT15AOTY489MhsNuyAgp+wJM2IRkkSVW6rO3k4WuSRL9ZmPhwkWb9bYjf8EEwRzZcXg==",
"requires": {}
<<<<<<< HEAD
},
"react-native-print": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/react-native-print/-/react-native-print-0.10.0.tgz",
"integrity": "sha512-jXFIeTLiQeC9rTduRjMGXWzGEaslx69U64tsw851+v2fbfNwn4SP53uEIhCCc0ly3VxGCFxseafrZjfuMyVXNg==",
"requires": {}
=======
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
},
"react-native-raw-bottom-sheet": {
"version": "2.2.0",

8
src/modules/comments/screens/comments.screen.tsx
Unescape View File

@ -43,7 +43,13 @@ export const Comments: FC<IProps> = ({ navigation, route }) => { @@ -43,7 +43,13 @@ export const Comments: FC<IProps> = ({ navigation, route }) => {
return (
<CommentsLayout title="Коментарі" goBack={navigation.goBack}>
<View style={{ flex: 1 }}>
<ChatMessages items={comments} userId={accountId} />
<ChatMessages
items={comments}
userId={accountId}
loadPrev={() => {}}
loadNext={() => {}}
lastMessageLoaded={true}
/>
</View>
<ChatBar
message={commentText}

14
src/shared/components/plugins/chat/chat-messages.component.tsx
Unescape View File

@ -319,6 +319,7 @@ export const ChatMessages: FC<ChatMessagesProps> = ({ items, ...props }) => { @@ -319,6 +319,7 @@ export const ChatMessages: FC<ChatMessagesProps> = ({ items, ...props }) => {
if (!props.lastMessageLoaded && swipeDirection === 'up') {
lastIdRef.current = messagesGroups[0]?.id
props.loadNext(3)
}
}}
@ -363,6 +364,19 @@ export const ChatMessages: FC<ChatMessagesProps> = ({ items, ...props }) => { @@ -363,6 +364,19 @@ export const ChatMessages: FC<ChatMessagesProps> = ({ items, ...props }) => {
/>
)}
{lastOffset > 50 && !_.isEmpty(items) && (
<ChatDownButton
onPress={() => {
listRef.current.scrollToIndex({
animated: true,
index: 0,
viewPosition: 0,
})
setOffset(0)
}}
/>
)}
{!props.lastMessageLoaded && !_.isEmpty(items) && (
<ChatDownButton onPress={props.onRefresh} />
)}

8
yarn.lock
Unescape View File

@ -7280,11 +7280,7 @@ @@ -7280,11 +7280,7 @@
dependencies:
"moment" "^2.19.1"
<<<<<<< HEAD
"react-native@*", "react-native@^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0", "react-native@^0.62.0", "react-native@^0.63.4", "react-native@^0.64.3", "react-native@>= 0.46", "react-native@>=0.25.0", "react-native@>=0.40.0", "react-native@>=0.42.0", "react-native@>=0.45.0", "react-native@>=0.46.0", "react-native@>=0.48.4", "react-native@>=0.50.0", "react-native@>=0.57", "react-native@>=0.57.0", "react-native@>=0.58.4", "react-native@>=0.59", "react-native@>=0.59.0-rc.0 <1.0.x", "react-native@>=0.60", "react-native@>=0.60.0", "react-native@>=0.63.3", "react-native@>=0.64.0-rc.0 || 0.0.0-*", "react-native@>=0.65.0", "react-native@>=0.8.0 || 0.8.0-rc || 0.8.0-rc.2 || 0.9.0-rc || 0.10.1", "react-native@0.63.2":
=======
"react-native@*", "react-native@^0.0.0-0 || ^0.60.6 || ^0.61.5 || ^0.62.2 || ^0.63.2 || ^0.64.0 || ^0.65.0 || 1000.0.0", "react-native@^0.62.0", "react-native@^0.63.4", "react-native@^0.64.3", "react-native@>= 0.46", "react-native@>=0.40.0", "react-native@>=0.42.0", "react-native@>=0.45.0", "react-native@>=0.46.0", "react-native@>=0.48.4", "react-native@>=0.50.0", "react-native@>=0.57", "react-native@>=0.57.0", "react-native@>=0.58.4", "react-native@>=0.59", "react-native@>=0.59.0-rc.0 <1.0.x", "react-native@>=0.60", "react-native@>=0.60.0", "react-native@>=0.63.3", "react-native@>=0.64.0-rc.0 || 0.0.0-*", "react-native@>=0.65.0", "react-native@0.63.2":
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"integrity" "sha512-2OEU74U0Ek1/WeBzPbg6XDsCfjF/9fhrNX/5TFgEiBKd5mNc9LOZ/OlMmkb7iues/ZZ/oc51SbEfLRQdcW0fVw=="
"resolved" "https://registry.npmjs.org/react-native/-/react-native-0.64.3.tgz"
"version" "0.64.3"
@ -7357,11 +7353,7 @@ @@ -7357,11 +7353,7 @@
"react-shallow-renderer" "^16.13.1"
"scheduler" "^0.20.1"
<<<<<<< HEAD
"react@*", "react@^16.0.0 || ^17.0.0", "react@^16.8", "react@^16.8.0 || ^17.0.0", "react@^16.8.1", "react@^16.8.3 || ^17", "react@^16.8.6 || ^17.0.0", "react@>= 16", "react@>=16.0", "react@>=16.13.1", "react@>=16.3.0", "react@>=16.6.3", "react@>=16.8", "react@>16.8.0", "react@16 || 17", "react@16.13.1", "react@17.0.1":
=======
"react@*", "react@^16.0.0 || ^17.0.0", "react@^16.8", "react@^16.8.0 || ^17.0.0", "react@^16.8.1", "react@^16.8.3 || ^17", "react@^16.8.6 || ^17.0.0", "react@>= 16", "react@>=16.13.1", "react@>=16.3.0", "react@>=16.6.3", "react@16 || 17", "react@16.13.1", "react@17.0.1":
>>>>>>> df34727d7708b797abd640254db43715037d2ee5
"integrity" "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w=="
"resolved" "https://registry.npmjs.org/react/-/react-17.0.1.tgz"
"version" "17.0.1"

Write Preview
Loading…
Cancel
Save