
diff --git a/src/js/controllers/import.js b/src/js/controllers/import.js
index c1fbaf111..55fcb5645 100644
--- a/src/js/controllers/import.js
+++ b/src/js/controllers/import.js
@@ -36,7 +36,6 @@ angular.module('copayApp.controllers').controller('importController',
$scope.processWalletInfo = function(code) {
if (!code) return;
-
$scope.importErr = false;
var parsedCode = code.split('|');
@@ -407,5 +406,6 @@ angular.module('copayApp.controllers').controller('importController',
};
updateSeedSourceSelect();
- $scope.setSeedSource('new');
+ $scope.setSeedSource();
+ if ($stateParams.code) $scope.processWalletInfo($stateParams.code);
});
diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js
index f217639ad..213a28bc5 100644
--- a/src/js/controllers/onboarding/welcomeController.js
+++ b/src/js/controllers/onboarding/welcomeController.js
@@ -2,6 +2,12 @@
angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) {
+ $scope.goImport = function(code) {
+ $state.go('tabs.import', {
+ code: code
+ });
+ };
+
$scope.createProfile = function() {
$log.debug('Creating profile');
profileService.createProfile(function(err) {
diff --git a/src/js/routes.js b/src/js/routes.js
index d580f3f4d..15ed20d90 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -270,12 +270,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
})
.state('tabs.import', {
url: '/import/:fromOnboarding',
-// abstract: true,
+ // abstract: true,
views: {
'tab-home': {
templateUrl: 'views/import.html'
},
- }
+ },
+ params: {
+ code: null
+ },
})
.state('tabs.import.phrase', {
url: '/tab-import-phrase',
diff --git a/src/sass/views/onboarding/onboard-welcome.scss b/src/sass/views/onboarding/onboard-welcome.scss
index 2e9c19e01..8e40facd9 100644
--- a/src/sass/views/onboarding/onboard-welcome.scss
+++ b/src/sass/views/onboarding/onboard-welcome.scss
@@ -5,6 +5,7 @@
background-size: contain;
background-repeat-y: no-repeat;
#shopping-24 {
+ content: url("../img/onboarding-welcome-shopping24.png");
position: absolute;
top: 2%;
right: 5%;