Merge pull request #80 from waves-exchange/dexw-4721-update-node-api-js

Dexw 4721 update node api js
waves-exchange · Oct 1, 2021 · 759cafd · 759cafd
2 parents c1b4803 + e69b760
commit 759cafd
Show file tree

Hide file tree

Showing 13 changed files with 64 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .idea/
+.vscode/
 node_modules/
 coverage/
 dist/
diff --git a/main.tsx b/main.tsx
@@ -145,7 +145,7 @@ function TestApp(): React.ReactElement {
             </div>
 
             <div>
-                <h2>Transfer 1 Waves to Merry</h2>
+                <h2>Transfer 0.1 Tether USD Waves to Merry</h2>
                 <div>
                     <button
                         onClick={() => {
@@ -171,7 +171,7 @@ function TestApp(): React.ReactElement {
                                     amount: 10000000,
                                     recipient: 'merry',
                                     feeAssetId:
-                                        'DWgwcZTMhSvnyYCoWLRUXXSH1RSkzThXLJhww9gwkqdn',
+                                        'WAVES',
                                     attachment: null,
                                 })
                                 .broadcast();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,5 +43,8 @@
     "typescript": "^4.1.3",
     "vite": "^2.0.0-beta.62"
   },
-  "version": "1.0.5"
+  "version": "1.0.5",
+  "dependencies": {
+    "@waves/node-api-js": "^1.2.4"
+  }
 }
diff --git a/packages/provider-web-ui/package-lock.json b/packages/provider-web-ui/package-lock.json
diff --git a/packages/provider-web-ui/package.json b/packages/provider-web-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@waves.exchange/provider-web-ui",
   "private": true,
-  "version": "1.1.1",
+  "version": "1.1.5",
   "license": "MIT",
   "scripts": {
     "test": "jest",
@@ -17,7 +17,7 @@
     "@styled-system/should-forward-prop": "^5.1.4",
     "@waves.exchange/react-uikit": "^0.5.21",
     "@waves/bignumber": "^1.1.1",
-    "@waves/node-api-js": "^1.2.0",
+    "@waves/node-api-js": "^1.2.1",
     "@waves/signer": "^1.0.1",
     "@waves/ts-types": "^1.0.2",
     "@waves/waves-browser-bus": "0.2.5",

diff --git a/packages/provider-web-ui/src/components/FeeSelect/helpers.ts b/packages/provider-web-ui/src/components/FeeSelect/helpers.ts
@@ -20,6 +20,8 @@ const isFeeAssetId = (
     feeAssetId: string | null | undefined
 ): feeAssetId is string | null => typeof feeAssetId !== 'undefined';
 
+const isWaves = (feeId: string | null | undefined) => feeId === 'WAVES';
+
 const isNonDefaultFeeAssetId = (
     feeAssetId: string | null | undefined
 ): feeAssetId is string => typeof feeAssetId === 'string';
@@ -53,7 +55,10 @@ export const getFeeOptions: GetFeeOptions = ({
     let defaultFeeOption: FeeOption;
     let feeAsset: DetailsWithLogo;
 
-    if (isFeeAssetId(paramsFeeAssetId) || hasParamsFee(txParamsFee)) {
+    if (
+        !isWaves(paramsFeeAssetId) &&
+        (isFeeAssetId(paramsFeeAssetId) || hasParamsFee(txParamsFee))
+    ) {
         if (isNonDefaultFeeAssetId(paramsFeeAssetId)) {
             // case feeAssetId - some asset, but not Waves, fee is not provided
             feeAsset = txMeta.assets[paramsFeeAssetId];

diff --git a/packages/provider-web-ui/src/constants.ts b/packages/provider-web-ui/src/constants.ts
@@ -17,6 +17,7 @@ export const WAVES = {
     quantity: BigNumber.toBigNumber(100000000).mul(Math.pow(10, 8)).toFixed(),
     issuer: 'WAVES',
     minSponsoredAssetFee: null,
+    logo: '',
 };
 
 export const NAME_MAP = {

diff --git a/...s/CreateViaExchange/CreateViaExchange.tsx → .../CreateViaSeed/CreateViaSeedComponent.tsx b/...s/CreateViaExchange/CreateViaExchange.tsx → .../CreateViaSeed/CreateViaSeedComponent.tsx
diff --git a/packages/provider-web-ui/src/pages/CreateViaSeed/CreateViaSeedContainer.tsx b/packages/provider-web-ui/src/pages/CreateViaSeed/CreateViaSeedContainer.tsx
diff --git a/packages/provider-web-ui/src/pages/SignTransfer/helpers.ts b/packages/provider-web-ui/src/pages/SignTransfer/helpers.ts
@@ -44,8 +44,7 @@ type GetFeeAsset = (
 
 export const getFeeAsset: GetFeeAsset = (txType, assets, txFeeAssetId) => {
     if (
-        // Mass Transfer or feeAssetId === Waves
-        txType === 11 ||
+        txFeeAssetId === 'WAVES' ||
         txFeeAssetId === null ||
         typeof txFeeAssetId === 'undefined'
     ) {

diff --git a/packages/provider-web-ui/src/router/login.tsx b/packages/provider-web-ui/src/router/login.tsx
@@ -21,15 +21,16 @@ export default function (state: IState): () => Promise<UserData> {
         } else {
             let isIncognito = false;
             let hasMultiacc = false;
+
             try {
                 localStorage.setItem('___test_storage_key___', 'test');
-                localStorage.getItem('___test_storage_key___')
+                localStorage.getItem('___test_storage_key___');
                 localStorage.removeItem('___test_storage_key___');
                 hasMultiacc = hasMultiaccount();
-            } catch(e) {
+            } catch (e) {
                 isIncognito = true;
             }
-            
+
             const Page = hasMultiacc ? Login : CreateAccount;
 
             analytics.send({

diff --git a/packages/provider-web-ui/src/services/transactionsService.ts b/packages/provider-web-ui/src/services/transactionsService.ts
@@ -11,7 +11,7 @@ import { SignerTx } from '@waves/signer';
 import { Long, Transaction, TransactionType } from '@waves/ts-types';
 import { concat, flatten, indexBy, map, pipe, prop, uniq } from 'ramda';
 import { InfoMap, ITransactionInfo, IUser } from '../interface';
-import { SPONSORED_TYPES } from '../constants';
+import { SPONSORED_TYPES, WAVES } from '../constants';
 import { IState } from '../interface';
 import { cleanAddress } from '../utils/cleanAlias';
 import { geTransactionFromParams } from '../utils/getTransactionFromParams';