diff --git a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java index c76deaa400..e239de7286 100644 --- a/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java @@ -1307,8 +1307,10 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL @ReactMethod public void convertToKeycardAccount(final String keyUID, final String accountData, final String options, final String password, final String newPassword, final Callback callback) throws JSONException { final String keyStoreDir = this.getKeyStorePath(keyUID); - // Temporary fix for broken status-go compatibilty - executeRunnableStatusGoMethod(() -> Statusgo.convertToKeycardAccount(accountData, options, password, newPassword), callback); + executeRunnableStatusGoMethod(() -> { + Statusgo.initKeystore(keyStoreDir); + return Statusgo.convertToKeycardAccount(accountData, options, password, newPassword); + }, callback); } } diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.m b/modules/react-native-status/ios/RCTStatus/RCTStatus.m index 3de2c8fbb3..7487b37326 100644 --- a/modules/react-native-status/ios/RCTStatus/RCTStatus.m +++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.m @@ -694,6 +694,7 @@ RCT_EXPORT_METHOD(convertToKeycardAccount:(NSString *)keyUID NSLog(@"convertToKeycardAccount() method called"); #endif NSURL *multiaccountKeystoreDir = [self getKeyStoreDir:keyUID]; + StatusgoInitKeystore(multiaccountKeystoreDir.path); NSString *result = StatusgoConvertToKeycardAccount(accountData, settings, currentPassword, newPassword); callback(@[result]); } diff --git a/src/status_im/keycard/common.cljs b/src/status_im/keycard/common.cljs index 8d5c5d9443..e64d99cb5d 100644 --- a/src/status_im/keycard/common.cljs +++ b/src/status_im/keycard/common.cljs @@ -26,7 +26,7 @@ (rf/defn dispatch-event [_ event] - {:dispatch [event]}) + {:dispatch-n [[event]]}) (defn vector->string "Converts numbers stored in vector into string, diff --git a/src/status_im/keycard/onboarding.cljs b/src/status_im/keycard/onboarding.cljs index 38c3860b7c..698511a43b 100644 --- a/src/status_im/keycard/onboarding.cljs +++ b/src/status_im/keycard/onboarding.cljs @@ -276,12 +276,11 @@ (common/vector->string (get-in db [:keycard :pin :current])))] - (rf/merge cofx - {:keycard/generate-and-load-key - {:mnemonic mnemonic - :pin pin' - :key-uid (:key-uid multiaccount) - :delete-multiaccount? (get-in db [:keycard :delete-account?])}}))) + {:keycard/generate-and-load-key + {:mnemonic mnemonic + :pin pin' + :key-uid (:key-uid multiaccount) + :delete-multiaccount? (get-in db [:keycard :delete-account?])}})) (rf/defn factory-reset-card-toggle {:events [:keycard.onboarding.intro.ui/factory-reset-card-toggle]} diff --git a/src/status_im2/common/bottom_sheet/events.cljs b/src/status_im2/common/bottom_sheet/events.cljs index 4ad022edae..8760f6da1d 100644 --- a/src/status_im2/common/bottom_sheet/events.cljs +++ b/src/status_im2/common/bottom_sheet/events.cljs @@ -3,7 +3,7 @@ (rf/defn show-bottom-sheet [{:keys [db]} {:keys [view options]}] - {:dispatch [:dismiss-keyboard] + {:dispatch-n [[:dismiss-keyboard]] :show-bottom-sheet-overlay nil :db (assoc db :bottom-sheet/show? true diff --git a/status-go-version.json b/status-go-version.json index 4c74afc64c..a639d64644 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v0.128.0", - "commit-sha1": "82596b2b67f82ae6329ad88e34be6240d08c8ff1", - "src-sha256": "17n461i2cglvs66rpqxdxpka4k9ld9ds2ha6scdli2nrfg9jb4q3" + "version": "v0.128.1", + "commit-sha1": "551715f493130f436a1f0c1b42efe84720f7e55c", + "src-sha256": "1p546m1qghay1j3yawgiadgcim95ld9qafxs3rarvr4xjppj0qgn" }