iotaledger · cvarley100 · Jan 15, 2019 · Dec 13, 2018 · Dec 14, 2018 · Dec 14, 2018
diff --git a/src/desktop/npm-shrinkwrap.json b/src/desktop/npm-shrinkwrap.json
diff --git a/src/desktop/src/ui/Index.js b/src/desktop/src/ui/Index.js
@@ -296,7 +296,11 @@ class App extends React.Component {
                     <CSSTransition key={currentKey} classNames="fade" timeout={300}>
                         <div>
                             <Switch location={location}>
-                                <Route exact path="/settings/:setting?/:subsetting?/:accountIndex?" component={Settings} />
+                                <Route
+                                    exact
+                                    path="/settings/:setting?/:subsetting?/:accountIndex?"
+                                    component={Settings}
+                                />
                                 <Route path="/wallet" component={Wallet} />
                                 <Route path="/onboarding" component={Onboarding} />
                                 <Route exact path="/" loop={false} component={this.Init} />

diff --git a/src/desktop/src/ui/views/onboarding/AccountName.js b/src/desktop/src/ui/views/onboarding/AccountName.js
@@ -81,7 +81,7 @@ class AccountName extends React.PureComponent {
 
         this.props.setAccountInfoDuringSetup({
             name: this.state.name,
-            completed: !Electron.getOnboardingGenerated() && accountNames.length > 0
+            completed: !Electron.getOnboardingGenerated() && accountNames.length > 0,
         });
 
         if (Electron.getOnboardingGenerated()) {

diff --git a/src/desktop/src/ui/views/onboarding/AccountPassword.js b/src/desktop/src/ui/views/onboarding/AccountPassword.js
@@ -95,7 +95,7 @@ class AccountPassword extends React.PureComponent {
         setPassword(passwordHash);
 
         this.props.setAccountInfoDuringSetup({
-            completed: true
+            completed: true,
         });
 
         const seedStore = await new SeedStore[additionalAccountMeta.type](passwordHash);

diff --git a/src/desktop/src/ui/views/onboarding/Index.js b/src/desktop/src/ui/views/onboarding/Index.js
@@ -63,7 +63,7 @@ class Onboarding extends React.PureComponent {
             this.props.setAccountInfoDuringSetup({
                 name: '',
                 meta: {},
-                completed: false
+                completed: false,
             });
 
             Electron.setOnboardingSeed(null);

diff --git a/src/desktop/src/ui/views/onboarding/SeedVerify.js b/src/desktop/src/ui/views/onboarding/SeedVerify.js
@@ -160,7 +160,4 @@ const mapDispatchToProps = {
     setAccountInfoDuringSetup,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(SeedVerify));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(SeedVerify));
diff --git a/src/desktop/src/ui/views/settings/Advanced.js b/src/desktop/src/ui/views/settings/Advanced.js
@@ -304,7 +304,4 @@ const mapDispatchToProps = {
     setProxy,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(Advanced));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(Advanced));
diff --git a/src/desktop/src/ui/views/settings/Language.js b/src/desktop/src/ui/views/settings/Language.js
@@ -71,7 +71,4 @@ const mapDispatchToProps = {
     setLocale,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(LanguageSelect));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(LanguageSelect));
diff --git a/src/desktop/src/ui/views/settings/Mode.js b/src/desktop/src/ui/views/settings/Mode.js
@@ -51,7 +51,4 @@ const mapDispatchToProps = {
     setMode,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(Mode));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(Mode));
diff --git a/src/desktop/src/ui/views/settings/Password.js b/src/desktop/src/ui/views/settings/Password.js
@@ -146,7 +146,4 @@ const mapDispatchToProps = {
     setPassword,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(PasswordSettings));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(PasswordSettings));
diff --git a/src/desktop/src/ui/views/settings/Theme.js b/src/desktop/src/ui/views/settings/Theme.js
@@ -126,7 +126,4 @@ const mapDispatchToProps = {
     updateTheme,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(Theme));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(Theme));
diff --git a/src/desktop/src/ui/views/settings/TwoFA.js b/src/desktop/src/ui/views/settings/TwoFA.js
@@ -250,7 +250,4 @@ const mapDispatchToProps = {
     generateAlert,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(TwoFA));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(TwoFA));
diff --git a/src/desktop/src/ui/views/settings/account/Name.js b/src/desktop/src/ui/views/settings/account/Name.js
@@ -79,11 +79,7 @@ class AccountName extends PureComponent {
             newAccountName,
         });
 
-        const seedStore = await new SeedStore[account.meta.type](
-            password,
-            account.accountName,
-            account.meta,
-        );
+        const seedStore = await new SeedStore[account.meta.type](password, account.accountName, account.meta);
         await seedStore.renameAccount(newAccountName);
     }
 
@@ -129,7 +125,4 @@ const mapDispatchToProps = {
     generateAlert,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(AccountName));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(AccountName));
diff --git a/src/desktop/src/ui/views/settings/account/Remove.js b/src/desktop/src/ui/views/settings/account/Remove.js
@@ -124,7 +124,4 @@ const mapDispatchToProps = {
     deleteAccount,
 };
 
-export default connect(
-    null,
-    mapDispatchToProps,
-)(withI18n()(Remove));
+export default connect(null, mapDispatchToProps)(withI18n()(Remove));
diff --git a/src/desktop/src/ui/views/settings/account/Seed.js b/src/desktop/src/ui/views/settings/account/Seed.js
@@ -94,9 +94,7 @@ class Seed extends PureComponent {
                         confirm:
                             action === 'view'
                                 ? t('accountManagement:viewSeed')
-                                : action === 'export'
-                                    ? t('seedVault:exportSeedVault')
-                                    : t('paperWallet'),
+                                : action === 'export' ? t('seedVault:exportSeedVault') : t('paperWallet'),
                     }}
                 />
             );

diff --git a/src/desktop/src/ui/views/settings/account/Tools.js b/src/desktop/src/ui/views/settings/account/Tools.js
@@ -251,7 +251,4 @@ const mapDispatchToProps = {
     setBalanceCheckFlag,
 };
 
-export default connect(
-    mapStateToProps,
-    mapDispatchToProps,
-)(withI18n()(Tools));
+export default connect(mapStateToProps, mapDispatchToProps)(withI18n()(Tools));
diff --git a/src/mobile/__tests__/ui/components/CtaButton.spec.js b/src/mobile/__tests__/ui/components/CtaButton.spec.js
@@ -32,7 +32,7 @@ describe('Testing CtaButton component', () => {
         });
 
         it('should require a text string as a prop', () => {
-            expect(CtaButton.propTypes.text).toEqual(PropTypes.string.isRequired);
+            expect(CtaButton.propTypes.text).toEqual(PropTypes.string);
         });
 
         it('should accept a ctaWidth number as a prop', () => {

diff --git a/src/mobile/__tests__/ui/components/TransactionHistoryModal.spec.js b/src/mobile/__tests__/ui/components/TransactionHistoryModal.spec.js
@@ -114,7 +114,7 @@ describe('Testing TransactionHistoryModal component', () => {
             const props = getProps();
 
             const wrapper = shallow(<TransactionHistoryModal {...props} />);
-            expect(wrapper.name()).toEqual('View');
+            expect(wrapper.name()).toEqual('Connect(ModalViewComponent)');
         });
 
         it('should return a ScrollView component', () => {

diff --git a/src/mobile/__tests__/ui/views/onboarding/SetAccountName.spec.js b/src/mobile/__tests__/ui/views/onboarding/SetAccountName.spec.js
@@ -94,7 +94,7 @@ describe('Testing SetAccountName component', () => {
                     expect(props.setAccountInfoDuringSetup).toHaveBeenCalledWith({
                         name: 'foo',
                         meta: { type: 'keychain' },
-                        completed: true
+                        completed: true,
                     });
                 });
 

diff --git a/src/mobile/__tests__/ui/views/wallet/Balance.spec.js b/src/mobile/__tests__/ui/views/wallet/Balance.spec.js
@@ -45,6 +45,8 @@ const getProps = (overrides) =>
             conversionRate: 1,
             isRefreshing: false,
             onRefresh: noop,
+            animateChartOnMount: true,
+            setAnimateChartOnMount: noop,
         },
         overrides,
     );
@@ -94,6 +96,14 @@ describe('Testing Balance component', () => {
         it('should require an onRefresh function as a prop', () => {
             expect(Balance.propTypes.onRefresh).toEqual(PropTypes.func.isRequired);
         });
+
+        it('should require an setAnimateChartOnMount function as a prop', () => {
+            expect(Balance.propTypes.setAnimateChartOnMount).toEqual(PropTypes.func.isRequired);
+        });
+
+        it('should require an animateChartOnMount bool as a prop', () => {
+            expect(Balance.propTypes.animateChartOnMount).toEqual(PropTypes.bool.isRequired);
+        });
     });
 
     describe('when renders', () => {

diff --git a/src/mobile/android/app/build.gradle b/src/mobile/android/app/build.gradle
@@ -92,7 +92,7 @@ android {
     buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.iota.trinity"
-        versionCode 31
+        versionCode 36
         versionName "0.6.0"
         minSdkVersion 21
         targetSdkVersion 26

diff --git a/src/mobile/ios/iotaWallet-tvOS/Info.plist b/src/mobile/ios/iotaWallet-tvOS/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>31</string>
+	<string>36</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>

diff --git a/src/mobile/ios/iotaWallet-tvOSTests/Info.plist b/src/mobile/ios/iotaWallet-tvOSTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>31</string>
+	<string>36</string>
 </dict>
 </plist>
diff --git a/src/mobile/ios/iotaWallet.xcodeproj/project.pbxproj b/src/mobile/ios/iotaWallet.xcodeproj/project.pbxproj
@@ -2841,7 +2841,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 36;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
@@ -3231,7 +3231,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 36;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (

diff --git a/src/mobile/ios/iotaWallet/Info.plist b/src/mobile/ios/iotaWallet/Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>31</string>
+	<string>36</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/src/mobile/ios/iotaWalletTests/Info.plist b/src/mobile/ios/iotaWalletTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>31</string>
+	<string>36</string>
 </dict>
 </plist>
diff --git a/src/mobile/ios/iotaWalletUITests/Info.plist b/src/mobile/ios/iotaWalletUITests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.6.0</string>
 	<key>CFBundleVersion</key>
-	<string>31</string>
+	<string>36</string>
 </dict>
 </plist>