                 }
                 else
                 {
-                    TSMessage.showNotification(withTitle: "Success", subtitle: "You successfully added a new device to your account. Device is named \(deviceAdded.name!).", type: .success)
-                    self.photonSelectionTableView.reloadData()
-                    
+                    self.showSetupSuccessMessageAndReload()
                 }
             }
             else // Device is nil so we treat it as not claimed

    
    
    

    
    func loadDevices()
    {

                        else
                        {
                            DispatchQueue.main.async {
                                self.showSetupSuccessMessageAndReload()
                            }
                        }
                    })
