Merge pull request #129 from torusresearch/develop

Release v1.2.1 [skip ci]

Author: tetratorus

examples/angular-example/package-lock.json

@@ -19,7 +19,7 @@
     "@angular/platform-browser": "~8.2.14",
     "@angular/platform-browser-dynamic": "~8.2.14",
     "@angular/router": "~8.2.14",
-    "@toruslabs/torus-embed": "^1.1.1",
+    "@toruslabs/torus-embed": "^1.2.0",
     "human-standard-token-abi": "^2.0.0",
     "rxjs": "~6.4.0",
     "tslib": "^1.10.0",

examples/angular-example/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@toruslabs/torus-embed": "^1.1.1",
+    "@toruslabs/torus-embed": "^1.2.0",
     "human-standard-token-abi": "^2.0.0",
     "react": "^16.13.0",
     "react-dom": "^16.13.0",
@@ -33,10 +33,10 @@
   },
   "devDependencies": {
     "eslint": "^6.8.0",
-    "eslint-config-airbnb": "^18.0.1",
+    "eslint-config-airbnb": "^18.1.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.18.3",
+    "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^2.5.0"
   }
 }

examples/react-basic-app/package-lock.json

@@ -8,9 +8,9 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@toruslabs/torus-embed": "^1.1.1",
+    "@toruslabs/torus-embed": "^1.2.0",
     "core-js": "^3.6.4",
-    "eth-sig-util": "^2.5.2",
+    "eth-sig-util": "^2.5.3",
     "human-standard-token-abi": "^2.0.0",
     "vue": "^2.6.11",
     "web3": "^1.2.6"
@@ -21,7 +21,7 @@
     "@vue/cli-service": "^4.2.3",
     "babel-eslint": "^10.1.0",
     "eslint": "^6.8.0",
-    "eslint-plugin-vue": "^6.2.1",
+    "eslint-plugin-vue": "^6.2.2",
     "vue-template-compiler": "^2.6.11"
   },
   "eslintConfig": {

examples/react-basic-app/package.json

@@ -3,7 +3,7 @@ const Torus = require('../dist/embed').default
 const torus = new Torus()
 const buildEnv = process.env.TORUS_BUILD_ENV
 torus
-  .init({ buildEnv })
+  .init({ buildEnv, showTorusButton: false })
   .then(() => {
     window.ethereum = torus.ethereum
     window.Web3 = torus.Web3

examples/vue-app/package-lock.json

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 URL=''
-PACKAGE_VERSION=''
+PACKAGE_VERSION=$(cat package.json \
+  | grep '"version"' \
+  | head -1 \
+  | awk -F: '{ print $2 }' \
+  | sed 's/[",]//g')
 if [ "$CIRCLE_BRANCH" == 'master' ]; then
-  PACKAGE_VERSION=$(cat ./src/embed.js | grep app.tor.us | head -1 | awk -F//app.tor.us/ '{ print $2 }' | sed "s/[']//g")
   URL=$(echo s3://app.tor.us/"$PACKAGE_VERSION" | tr -d ' ')
 elif [ "$CIRCLE_BRANCH" == 'staging' ]; then
-  PACKAGE_VERSION=$(cat ./src/embed.js | grep staging.tor.us | head -1 | awk -F//staging.tor.us/ '{ print $2 }' | sed "s/[']//g")
   URL=$(echo s3://staging.tor.us/"$PACKAGE_VERSION" | tr -d ' ')
 fi
 aws s3 cp ./public/embed.min.js $URL/embed.min.js

examples/vue-app/package.json

@@ -1011,7 +1011,7 @@ class Torus {
    */
   initiateTopup(provider, params) {
     return new Promise((resolve, reject) => {
-      if (this.isLoggedIn) {
+      if (this.isInitalized) {
         const { errors, isValid } = validatePaymentProvider(provider, params)
         if (!isValid) {
           reject(new Error(JSON.stringify(errors)))

public/index.js

@@ -21,18 +21,22 @@ export const validatePaymentProvider = (provider, params) => {
   const selectedParams = params || {}
 
   // set default values
-  if (!selectedParams.selectedCurrency) selectedParams.selectedCurrency = 'USD'
-  if (!selectedParams.fiatValue) selectedParams.fiatValue = selectedProvider.minOrderValue
-  if (!selectedParams.selectedCryptoCurrency) selectedParams.selectedCryptoCurrency = 'ETH'
+  // if (!selectedParams.selectedCurrency) [selectedParams.selectedCurrency] = selectedProvider.validCurrencies
+  // if (!selectedParams.fiatValue) selectedParams.fiatValue = selectedProvider.minOrderValue
+  // if (!selectedParams.selectedCryptoCurrency) [selectedParams.selectedCryptoCurrency] = selectedProvider.validCryptoCurrencies
 
   // validations
-  const requestedOrderAmount = +parseFloat(selectedParams.fiatValue)
-  if (requestedOrderAmount < selectedProvider.minOrderValue) errors.fiatValue = 'Requested amount is lower than supported'
-  if (requestedOrderAmount > selectedProvider.maxOrderValue) errors.fiatValue = 'Requested amount is higher than supported'
-  if (!selectedProvider.validCurrencies.includes(selectedParams.selectedCurrency)) errors.selectedCurrency = 'Unsupported currency'
-  if (!selectedProvider.validCryptoCurrencies.includes(selectedParams.selectedCryptoCurrency))
+  if (selectedParams.fiatValue) {
+    const requestedOrderAmount = +parseFloat(selectedParams.fiatValue) || 0
+    if (requestedOrderAmount < selectedProvider.minOrderValue) errors.fiatValue = 'Requested amount is lower than supported'
+    if (requestedOrderAmount > selectedProvider.maxOrderValue) errors.fiatValue = 'Requested amount is higher than supported'
+  }
+  if (selectedParams.selectedCurrency && !selectedProvider.validCurrencies.includes(selectedParams.selectedCurrency)) {
+    errors.selectedCurrency = 'Unsupported currency'
+  }
+  if (selectedParams.selectedCryptoCurrency && !selectedProvider.validCryptoCurrencies.includes(selectedParams.selectedCryptoCurrency)) {
     errors.selectedCryptoCurrency = 'Unsupported cryptoCurrency'
-
+  }
   return { errors, isValid: Object.keys(errors).length === 0 }
 }