diff --git a/app/services/reactotron/reactotron.ts b/app/services/reactotron/reactotron.ts index 75805c873..1dacbba26 100644 --- a/app/services/reactotron/reactotron.ts +++ b/app/services/reactotron/reactotron.ts @@ -1,6 +1,6 @@ import { NativeModules } from "react-native" import Tron from "reactotron-react-native" -import AsyncStorage from "@react-native-community/async-storage" +import AsyncStorage from "@react-native-async-storage/async-storage" import { RootStore } from "../../models/root-store/root-store" import { onSnapshot } from "mobx-state-tree" import { ReactotronConfig, DEFAULT_REACTOTRON_CONFIG } from "./reactotron-config" diff --git a/app/utils/storage/storage.test.ts b/app/utils/storage/storage.test.ts index 7c374ab06..94fb27e68 100644 --- a/app/utils/storage/storage.test.ts +++ b/app/utils/storage/storage.test.ts @@ -1,4 +1,4 @@ -import AsyncStorage from "@react-native-community/async-storage" +import AsyncStorage from "@react-native-async-storage/async-storage" import { load, loadString, save, saveString, clear, remove } from "./storage" // fixtures diff --git a/app/utils/storage/storage.ts b/app/utils/storage/storage.ts index 70fb6271e..05c098a82 100644 --- a/app/utils/storage/storage.ts +++ b/app/utils/storage/storage.ts @@ -1,4 +1,4 @@ -import AsyncStorage from "@react-native-community/async-storage" +import AsyncStorage from "@react-native-async-storage/async-storage" /** * Loads a string from storage. diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 4a58627c9..ef56681b4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -505,8 +505,8 @@ PODS: - React-perflogger (= 0.66.5) - ReactNativeShareExtension (2.0.0): - React - - RNCAsyncStorage (1.6.1): - - React + - RNCAsyncStorage (1.18.2): + - React-Core - RNCMaskedView (0.1.11): - React - RNDeviceInfo (5.6.1): @@ -667,7 +667,7 @@ DEPENDENCIES: - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - ReactNativeShareExtension (from `../node_modules/react-native-share-extension`) - - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)" + - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" - RNDeviceInfo (from `../node_modules/react-native-device-info`) - RNExitApp (from `../node_modules/react-native-exit-app`) @@ -816,7 +816,7 @@ EXTERNAL SOURCES: ReactNativeShareExtension: :path: "../node_modules/react-native-share-extension" RNCAsyncStorage: - :path: "../node_modules/@react-native-community/async-storage" + :path: "../node_modules/@react-native-async-storage/async-storage" RNCMaskedView: :path: "../node_modules/@react-native-community/masked-view" RNDeviceInfo: @@ -933,7 +933,7 @@ SPEC CHECKSUMS: React-runtimeexecutor: 09041c28ce04143a113eac2d357a6b06bd64b607 ReactCommon: 8a7a138ae43c04bb8dd760935589f326ca810484 ReactNativeShareExtension: 589ed96a7823b475e630d7987a0958bff9804ee6 - RNCAsyncStorage: 2e2e3feb9bdadc752a026703d8c4065ca912e75a + RNCAsyncStorage: ddc4ee162bfd41b0d2c68bf2d95acd81dd7f1f93 RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 RNDeviceInfo: b6e650fbd234732c759544218657d549b4339038 RNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3 diff --git a/package.json b/package.json index 514309836..0c3d33b6e 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@cosmjs/stargate": "^0.25.5", "@likecoin/authcore-js": "^0.3.0-like.0", "@likecoin/secretd-js": "^0.4.3", - "@react-native-community/async-storage": "^1.5.1", + "@react-native-async-storage/async-storage": "^1.18.2", "@react-native-community/masked-view": "^0.1.11", "@react-native-cookies/cookies": "^6.2.1", "@react-native-firebase/analytics": "11.5.0", diff --git a/storybook/storybook.tsx b/storybook/storybook.tsx index 8b930ee48..d83b91025 100644 --- a/storybook/storybook.tsx +++ b/storybook/storybook.tsx @@ -10,7 +10,7 @@ configure(() => { const StorybookUI = getStorybookUI({ port: 9001, host: "localhost", onDeviceUI: true, - asyncStorage: require('@react-native-community/async-storage').default + asyncStorage: require('@react-native-async-storage/async-storage').default }) // RN hot module must be in a class for HMR diff --git a/test/mock-async-storage.ts b/test/mock-async-storage.ts index e80202d74..a4da056df 100644 --- a/test/mock-async-storage.ts +++ b/test/mock-async-storage.ts @@ -1,3 +1,3 @@ -import mockAsyncStorage from "@react-native-community/async-storage/jest/async-storage-mock" +import mockAsyncStorage from "@react-native-async-storage/async-storage/jest/async-storage-mock" -jest.mock("@react-native-community/async-storage", () => mockAsyncStorage) +jest.mock("@react-native-async-storage/async-storage", () => mockAsyncStorage) diff --git a/yarn.lock b/yarn.lock index b9633b712..e231b6f1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2903,10 +2903,12 @@ prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" -"@react-native-community/async-storage@^1.5.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@react-native-community/async-storage/-/async-storage-1.6.1.tgz#19be07fc1d65c77bdeb20f46108ba12076aad1c5" - integrity sha512-1WA28xfdhG+unkTEk/lXnqI2izv6belo0CYw7UdvaeHm8TIYT6eTmIIdGR7oiCa2xSKEnaPQqRMH6h7gyLNbww== +"@react-native-async-storage/async-storage@^1.18.2": + version "1.18.2" + resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.18.2.tgz#ec8fd487a0b6c9500b43ece4b8779d1561f12e91" + integrity sha512-dM8AfdoeIxlh+zqgr0o5+vCTPQ0Ru1mrPzONZMsr7ufp5h+6WgNxQNza7t0r5qQ6b04AJqTlBNixTWZxqP649Q== + dependencies: + merge-options "^3.0.4" "@react-native-community/cli-debugger-ui@^6.0.0-rc.0": version "6.0.0" @@ -10202,6 +10204,11 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-plain-obj@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -11740,6 +11747,13 @@ merge-descriptors@1.0.1: resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= +merge-options@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" + integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== + dependencies: + is-plain-obj "^2.1.0" + merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"