WLT-1736 (#7)

* feat: bump android native version and bridge version * WLT-1736: fix example ui --------- Co-authored-by: valeriaFireblocks <[email protected]>
fireblocks · Nov 14, 2024 · 6349dd5 · 6349dd5
1 parent 758daa4
commit 6349dd5
Show file tree

Hide file tree

Showing 11 changed files with 14,109 additions and 11,255 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -119,7 +119,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "com.fireblocks.sdk:ncw:2.5.0"
+  implementation "com.fireblocks.sdk:ncw:2.9.2"
 }
 
 if (isNewArchitectureEnabled()) {

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -121,7 +121,7 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("com.facebook.react:flipper-integration")
-    implementation("com.fireblocks.sdk:ncw:2.5.0")
+    implementation("com.fireblocks.sdk:ncw:2.9.2")
 
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -63,7 +63,7 @@ PODS:
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
-  - fireblocks-react-native-ncw-sdk (1.0.0):
+  - fireblocks-react-native-ncw-sdk (1.0.2):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1545,7 +1545,7 @@ SPEC CHECKSUMS:
   FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6
   FirebaseCoreInternal: bca337352024b18424a61e478460547d46c4c753
   FirebaseInstallations: 763814908793c0da14c18b3dcffdec71e29ed55e
-  fireblocks-react-native-ncw-sdk: 867882b558c0a3ef1c7a79d2e21af7db40a5a88e
+  fireblocks-react-native-ncw-sdk: 049d245e206189c1b411de132ff6052a8ba32914
   Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
   Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
   Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
@@ -1622,7 +1622,7 @@ SPEC CHECKSUMS:
   RNSVG: 50cf2c7018e57cf5d3522d98d0a3a4dd6bf9d093
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   VisionCamera: 36c460338692788a0d377dce7d32f8ba049fb4f2
-  Yoga: 805bf71192903b20fc14babe48080582fee65a80
+  Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61
 
 PODFILE CHECKSUM: 39734b197bfc91ffdfa5baa43576530a5725c6dd
 

diff --git a/example/src/AppStore.ts b/example/src/AppStore.ts
@@ -7,12 +7,13 @@ import { ApiService, type ITransactionData, type IWalletAsset, type TPassphraseL
 import { PasswordEncryptedLocalStorage } from "./services/PasswordEncryptedLocalStorage";
 import type { IAuthManager } from "./auth/IAuthManager";
 import { FirebaseAuthManager } from "./auth/FirebaseAuthManager";
-import { decode, version } from "js-base64";
+import { decode } from "js-base64";
 import type { IEventsHandler, IFireblocksNCW, IJoinWalletEvent, IKeyBackupEvent, IKeyDescriptor, IKeyRecoveryEvent, IMessagesHandler } from "@fireblocks/react-native-ncw-sdk";
 import type { TEvent, TMPCAlgorithm, TEnv } from "@fireblocks/react-native-ncw-sdk";
 import { FireblocksNCWFactory } from "@fireblocks/react-native-ncw-sdk";
 import { ACCESSIBLE, ACCESS_CONTROL, type Options, getGenericPassword, setGenericPassword } from "react-native-keychain";
 import { randomPassPhrase } from "./services/randomPassPhrase";
+import packageJson from '../../package.json';
 
 export type TAsyncActionStatus = "not_started" | "started" | "success" | "failed";
 export type TFireblocksNCWStatus = "sdk_not_ready" | "initializing_sdk" | "sdk_available" | "sdk_initialization_failed";
@@ -38,7 +39,7 @@ export const useAppStore = create<IAppState>()((set, get) => {
   };
 
   return {
-    fireblocksNCWSdkVersion: version,
+    fireblocksNCWSdkVersion: packageJson.version,
     automateInitialization: ENV_CONFIG.AUTOMATE_INITIALIZATION,
     joinExistingWalletMode: false,
     loggedUser: authManager.loggedUser,
@@ -529,7 +530,7 @@ export const useAppStore = create<IAppState>()((set, get) => {
       }
       // TODO: consolidate
       // const ALGORITHMS = new Set<TMPCAlgorithm>(["MPC_CMP_ECDSA_SECP256K1"]);
-      const ALGORITHMS = new Set<TMPCAlgorithm>(["MPC_ECDSA_SECP256K1"]);
+      const ALGORITHMS = new Set<TMPCAlgorithm>(["MPC_ECDSA_SECP256K1","MPC_EDDSA_ED25519"]);
       await fireblocksNCW.generateMPCKeys(ALGORITHMS);
     },
     stopMpcDeviceSetup: async () => {

diff --git a/example/src/components/AssetRow.tsx b/example/src/components/AssetRow.tsx
diff --git a/example/src/components/Assets.tsx b/example/src/components/Assets.tsx
@@ -1,13 +1,13 @@
 import React, { useRef } from "react";
 import { useAppStore } from "../AppStore";
-import { AssetRow } from "./AssetRow";
 // import { Autocomplete } from "./ui/Autocomplete";
 import { Card } from "./ui/Card";
 import { IActionButtonProps } from "./ui/ActionButton";
 import { Row, Table } from "react-native-reanimated-table";
 import { Button, Text, View } from "react-native";
 import { AutocompleteDropdown, AutocompleteDropdownRef } from "react-native-autocomplete-dropdown";
 import { SvgUri } from "react-native-svg";
+import { Copyable } from "./ui/Copyable";
 
 export const Assets: React.FC = () => {
   const { accounts, refreshAccounts, addAsset, refreshSupportedAssets, supportedAssets } = useAppStore();
@@ -67,17 +67,23 @@ export const Assets: React.FC = () => {
       {hasAccounts &&
         accounts.map((account, index) => (
           <View key={`asset_account_${index}`}>
-            <Table key={`account${index}`}>
+          <Table key={`account${index}`}>
               <Row data={[
                 "Asset",
                 "Name",
-                "Type",
                 "Address",
                 "Balance"
               ]} />
-              {Object.entries(account).map(([assetId, assetInfo]) =>
-                <Row key={`asset_account_row_${index}_${assetId}`} data={[assetId, assetInfo.asset.name, assetInfo.asset.type, assetInfo.address?.address, assetInfo.balance?.total]} />
-              )}
+              {Object.entries(account).map(([assetId, assetInfo]) => (
+                <React.Fragment key={`asset_account_row_${index}_${assetId}`}>
+                  <Row data={[
+                  assetId,
+                  assetInfo.asset.name,
+                  <Copyable value={assetInfo.address?.address ?? ""} />,
+                  <Text style={{ textAlign: 'center' }}>{assetInfo.balance?.total}</Text>
+                  ]} />
+                </React.Fragment>
+              ))}
             </Table>
             <View style={{
               justifyContent: "space-between",

diff --git a/example/src/components/DeriveAssetsList.tsx b/example/src/components/DeriveAssetsList.tsx
@@ -61,7 +61,10 @@ export const DeriveAssetsList: React.FC<IProps> = ({ privateKey }) => {
     <Table>
       <Row data={["Asset", "Name", "Derrived Key"]}></Row>
         {assetsListItems.map((assetListItem) => (
-          <Row key={`derrived_${assetListItem.id}`} data={[assetListItem.assetId, assetListItem.name, assetListItem.derivedAssetKey]} />
+          <Row key={`derrived_${assetListItem.id}`} data={[
+            assetListItem.assetId,
+            assetListItem.name,
+            <Copyable value={assetListItem.derivedAssetKey} />]} />
           // <tr key={assetListItem.id}>
           //   <td className="flex items-center gap-2">
           //     {assetListItem.iconUrl ? <img src={assetListItem.iconUrl} className="w-8 h-8"></img> : missingIcon}

diff --git a/example/src/components/GenerateMPCKeys.tsx b/example/src/components/GenerateMPCKeys.tsx
@@ -60,6 +60,8 @@ export const GenerateMPCKeys: React.FC = () => {
   };
 
   const secP256K1Status = keysStatus?.MPC_ECDSA_SECP256K1?.keyStatus ?? null;
+  const ed25519Status = keysStatus?.MPC_EDDSA_ED25519?.keyStatus ?? null;
+
   const statusToProgress = (status: TKeyStatus | null) => {
     switch (status) {
       case "INITIATED":
@@ -76,12 +78,13 @@ export const GenerateMPCKeys: React.FC = () => {
         return 0;
     }
   };
-  const secP256K1Ready = secP256K1Status === "READY";
 
+  const secP256K1Ready = secP256K1Status === "READY";
+  const ed25519Ready = ed25519Status === "READY";
   const generateAction: IActionButtonProps = {
     label: "Generate MPC Keys",
     action: doGenerateMPCKeys,
-    isDisabled: isGenerateInProgress || secP256K1Ready,
+    isDisabled: isGenerateInProgress || (secP256K1Ready && ed25519Ready),
     isInProgress: isGenerateInProgress,
   };
 
@@ -95,7 +98,7 @@ export const GenerateMPCKeys: React.FC = () => {
   const approveJoinWalletAction: IActionButtonProps = {
     label: "Approve Join Wallet",
     action: () => setShowScanQr(true),
-    isDisabled: (isStopInProgress || isGenerateInProgress) && secP256K1Ready,
+    isDisabled: (isStopInProgress || isGenerateInProgress) && (secP256K1Ready || ed25519Ready),
   };
   const stopApproveWalletAction: IActionButtonProps = {
     label: "Stop Approve Join Wallet",
@@ -119,13 +122,23 @@ export const GenerateMPCKeys: React.FC = () => {
             "ECDSA SECP256K1",
             secP256K1Status ?? "N/A",
            ]}/>
+          <Row data={[
+            "EDDSA_ED25519",
+            ed25519Status ?? "N/A",
+           ]}/>
         </Table>
       </View>
       { secP256K1Status && (
         <View>
           <Bar progress={statusToProgress(secP256K1Status)/100} width={null} />
         </View>
       )}
+      <View style={{ height: 10 }} />
+      { ed25519Status && (
+        <View>
+          <Bar progress={statusToProgress(ed25519Status)/100} width={null} />
+        </View>
+      )}
       { generateMPCKeysResult && (
         <View>
           <Text>Result: {generateMPCKeysResult}</Text>

diff --git a/example/src/components/ui/Copyable.tsx b/example/src/components/ui/Copyable.tsx
@@ -2,6 +2,8 @@ import React from "react";
 import { StyleSheet, Text, View } from "react-native";
 import Clipboard from '@react-native-clipboard/clipboard';
 import Svg, { Path } from "react-native-svg";
+import { Alert } from "react-native";
+import { Platform } from "react-native";
 
 function writeToClipboard(value: string) {
   Clipboard.setString(value);
@@ -31,6 +33,9 @@ const styles = StyleSheet.create({
 export const Copyable: React.FC<{ value: string }> = ({ value }) => {
   const doCopy = () => {
     writeToClipboard(value);
+    if (Platform.OS === 'ios') {
+      Alert.alert("Copied to Clipboard", "The text has been copied to your clipboard.");
+    }
   };
 
   const clipboardIcon = (

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fireblocks/react-native-ncw-sdk",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "NCW SDK Native bridge",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",