Merge branch 'dev' of github.com:chaion/Makkii into dev

makkii-dev · Nov 14, 2019 · bdb2195 · bdb2195
2 parents d13b76c + d0eb74a
commit bdb2195
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/pages/signed/discover/dapp_launcher.js b/app/pages/signed/discover/dapp_launcher.js
@@ -142,6 +142,7 @@ const dappLauncher = props => {
  ref={webViewRef}
  source={{ uri }}
  cacheEnabled={false}
+ bounces={false}
  useWebKit
  onMessage={onMessage}
  renderLoading={renderLoading}

diff --git a/ios/wallet/Info.plist b/ios/wallet/Info.plist
@@ -17,11 +17,11 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.3.0</string>
+ <string>1.4.0</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
- <string>17</string>
+ <string>18</string>
  <key>LSRequiresIPhoneOS</key>
  <true/>
  <key>NSAppTransportSecurity</key>

diff --git a/services/account_import.service.js b/services/account_import.service.js
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import TransportHid from '@ledgerhq/react-native-hid/src';
+import TransportHid from '@ledgerhq/react-native-hid';
 import BIP38 from '../utils/bip38';
 import { getKeyFromMnemonic, recoverKeyPairByPrivateKey, getKeyByLedger, recoverKeyPairByWIF, getLedgerStatus, setLedgerTransport } from '../client/keystore';
 import { SensitiveStorage } from '../utils/storage';